Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PR: MPWAR-36

Browse Source 
Only create tld and lib folders if corresponding dependencies are present.


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@432339 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
ltheussl 2006-08-17 19:00:49 +00:00
parent 703e8b6c34
commit f7d086b5bd
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
war/plugin.jelly
View File

@ -190,22 +190,19 @@
<ant:echo>Assembling webapp ${pom.artifactId}</ant:echo> <ant:echo>Assembling webapp ${pom.artifactId}</ant:echo>
<j:set var="webapp.build.lib" value="${webapp.build.webinf}/lib"/> <j:set var="webapp.build.lib" value="${webapp.build.webinf}/lib"/>
<ant:mkdir dir="${webapp.build.lib}"/>
<j:set var="webapp.build.tlds" value="${maven.war.webapp.dir}/${maven.war.tld.dir}"/> <j:set var="webapp.build.tlds" value="${maven.war.webapp.dir}/${maven.war.tld.dir}"/>
<ant:mkdir dir="${webapp.build.tlds}"/>
<j:set var="webapp.build.classes" value="${webapp.build.webinf}/classes"/> <j:set var="webapp.build.classes" value="${webapp.build.webinf}/classes"/>
<ant:mkdir dir="${webapp.build.classes}"/>
<j:forEach var="lib" items="${pom.artifacts}"> <j:forEach var="lib" items="${pom.artifacts}">
<j:set var="dep" value="${lib.dependency}"/> <j:set var="dep" value="${lib.dependency}"/>
<j:if test="${dep.getProperty('war.bundle')=='true'}"> <j:if test="${dep.getProperty('war.bundle')=='true'}">
<j:choose> <j:choose>
<j:when test="${dep.type =='jar' or dep.type =='ejb' or dep.type == 'ejb-client'}"> <j:when test="${dep.type =='jar' or dep.type =='ejb' or dep.type == 'ejb-client'}">
<ant:mkdir dir="${webapp.build.lib}"/>
<ant:copy todir="${webapp.build.lib}" file="${lib.path}"/> <ant:copy todir="${webapp.build.lib}" file="${lib.path}"/>
</j:when> </j:when>
<j:when test="${dep.type =='tld'}"> <j:when test="${dep.type =='tld'}">
<ant:mkdir dir="${webapp.build.tlds}"/>
<ant:copy todir="${webapp.build.tlds}" file="${lib.path}"/> <ant:copy todir="${webapp.build.tlds}" file="${lib.path}"/>
</j:when> </j:when>
</j:choose> </j:choose>
@ -216,6 +213,7 @@
DEPRECATION WARNING: DEPRECATION WARNING:
Use : war.bundle instead of war.bundle.jar Use : war.bundle instead of war.bundle.jar
</ant:echo> </ant:echo>
<ant:mkdir dir="${webapp.build.lib}"/>
<ant:copy todir="${webapp.build.lib}" file="${lib.path}"/> <ant:copy todir="${webapp.build.lib}" file="${lib.path}"/>
</j:if> </j:if>
<!-- END OF TO BE REMOVED --> <!-- END OF TO BE REMOVED -->
@ -227,6 +225,7 @@
</j:forEach> </j:forEach>
<util:available file="${maven.build.dest}"> <util:available file="${maven.build.dest}">
<ant:mkdir dir="${webapp.build.classes}"/>
<ant:copy todir="${webapp.build.classes}"> <ant:copy todir="${webapp.build.classes}">
<ant:fileset dir="${maven.build.dest}" <ant:fileset dir="${maven.build.dest}"
includes="${maven.war.classes.includes}" includes="${maven.war.classes.includes}"

1
war/xdocs/changes.xml
View File

@ -24,6 +24,7 @@
</properties> </properties>
<body> <body>
<release version="1.6.3-SNAPSHOT" date="in SVN"> <release version="1.6.3-SNAPSHOT" date="in SVN">
<action dev="ltheussl" type="fix" issue="MPWAR-36">Only create tld and lib folders if corresponding dependencies are present.</action>
<action dev="ltheussl" type="fix" issue="MPWAR-45" due-to="Kim Dykeman">war:inplace should check for maven.war.src.</action> <action dev="ltheussl" type="fix" issue="MPWAR-45" due-to="Kim Dykeman">war:inplace should check for maven.war.src.</action>
<action dev="ltheussl" type="fix"> <action dev="ltheussl" type="fix">
<description>Java sources are not compiled when used with maven-test-plugin-1.8 and maven.test.skip=true.</description> <description>Java sources are not compiled when used with maven-test-plugin-1.8 and maven.test.skip=true.</description>