You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2006/08/18 01:46:45 UTC

svn commit: r432435 - in /maven/maven-1/plugins/trunk/genapp: plugin.jelly xdocs/changes.xml

Author: ltheussl
Date: Thu Aug 17 16:46:45 2006
New Revision: 432435

URL: http://svn.apache.org/viewvc?rev=432435&view=rev
Log:
PR: MPGENAPP-26
Problem when maven.genapp.repackage.dir is empty.

Modified:
    maven/maven-1/plugins/trunk/genapp/plugin.jelly
    maven/maven-1/plugins/trunk/genapp/xdocs/changes.xml

Modified: maven/maven-1/plugins/trunk/genapp/plugin.jelly
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/genapp/plugin.jelly?rev=432435&r1=432434&r2=432435&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/genapp/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/genapp/plugin.jelly Thu Aug 17 16:46:45 2006
@@ -159,7 +159,12 @@
             <ant:exclude name="${res}"/>
           </j:forEach>
           <j:forEach var="res" items="${maven.genapp.repackage.split}">
-            <ant:exclude name="${maven.genapp.repackage.dir}/${res}/**"/>
+            <j:if test="${!empty(maven.genapp.repackage.dir)}">
+              <ant:exclude name="${maven.genapp.repackage.dir}/${res}/**"/>
+            </j:if>
+            <j:if test="${empty(maven.genapp.repackage.dir)}">
+              <ant:exclude name="${res}/**"/>
+            </j:if>
           </j:forEach>
         </ant:fileset>
       </ant:copy>

Modified: maven/maven-1/plugins/trunk/genapp/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/genapp/xdocs/changes.xml?rev=432435&r1=432434&r2=432435&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/genapp/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/genapp/xdocs/changes.xml Thu Aug 17 16:46:45 2006
@@ -23,6 +23,7 @@
   </properties>
   <body>
     <release version="2.3.1-SNAPSHOT" date="In SVN">
+      <action dev="ltheussl" type="fix" issue="MPGENAPP-26">Problem when maven.genapp.repackage.dir is empty.</action>
       <action dev="ltheussl" type="fix" issue="MPGENAPP-27">Generated poms contain deprecated id elements.</action>
       <action dev="aheritier" type="update">Update dependencies to unify them between plugins. The following dependencies are updated : commons-jelly-tags-interaction v1.0 to v1.1</action>
     </release>