mirror of
https://github.com/apache/maven.git
synced 2025-02-08 11:05:37 +00:00
PR: MNG-500 Not sure if anything else is touched besides the war mojo. If so, we should factor the inclusion logic into some sort of component for maintenance purposes.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191674 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
05892c489f
commit
e90ba206d3
@ -171,14 +171,23 @@ public void buildWebapp( MavenProject project )
|
|||||||
// TODO: scope handler
|
// TODO: scope handler
|
||||||
// TODO: use classpath instead
|
// TODO: use classpath instead
|
||||||
// Include runtime and compile time libraries
|
// Include runtime and compile time libraries
|
||||||
if ( "jar".equals( artifact.getType() ) && !Artifact.SCOPE_TEST.equals( artifact.getScope() ) && !Artifact.SCOPE_PROVIDED.equals( artifact.getScope() ) )
|
|
||||||
{
|
// [jc, 21-June]: handle TLDs as a special-case.
|
||||||
FileUtils.copyFileToDirectory( artifact.getFile(), libDirectory );
|
|
||||||
}
|
|
||||||
if ( "tld".equals( artifact.getType() ) )
|
if ( "tld".equals( artifact.getType() ) )
|
||||||
{
|
{
|
||||||
FileUtils.copyFileToDirectory( artifact.getFile(), tldDirectory );
|
FileUtils.copyFileToDirectory( artifact.getFile(), tldDirectory );
|
||||||
}
|
}
|
||||||
|
// [jc, 21-June]: filter POMs out of the /lib copy process.
|
||||||
|
else if ( "pom".equals( artifact.getType() ) )
|
||||||
|
{
|
||||||
|
// don't mess with these...they'd only be here for inclusion of dependencies.
|
||||||
|
}
|
||||||
|
// [jc, 21-June]: I'm removing ( "jar".equals( artifact.getType() ) ) from consideration here
|
||||||
|
// we'll handle anything that's NOT a POM or a TLD as a binary library to go in /lib
|
||||||
|
else if ( !Artifact.SCOPE_TEST.equals( artifact.getScope() ) && !Artifact.SCOPE_PROVIDED.equals( artifact.getScope() ) )
|
||||||
|
{
|
||||||
|
FileUtils.copyFileToDirectory( artifact.getFile(), libDirectory );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user