MPJALOPY-6. Allows multiple includes/excludes patterns.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115997 13f79535-47bb-0310-9956-ffa450edef68

jalopy/plugin.jelly

@@ -63,16 +63,14 @@
             threads="${maven.jalopy.nbThread}"
             classpathref="project.classpath">
       <j:if test="${sourcesPresent == 'true'}">
-        <ant:fileset dir="${pom.build.sourceDirectory}" >
-          <ant:include name="${maven.jalopy.src.filesetInclude}" />
-          <ant:exclude name="${maven.jalopy.src.filesetExclude}" />
-        </ant:fileset>
+        <ant:fileset dir="${pom.build.sourceDirectory}" 
+            includes="${maven.jalopy.src.filesetInclude}" 
+            excludes="${maven.jalopy.src.filesetExclude}"/>
       </j:if>
       <j:if test="${unitTestSourcesPresent == 'true'}">
-        <ant:fileset dir="${pom.build.unitTestSourceDirectory}" >
-          <ant:include name="${maven.jalopy.test.filesetInclude}" />
-          <ant:exclude name="${maven.jalopy.test.filesetExclude}" />
-        </ant:fileset>
+        <ant:fileset dir="${pom.build.unitTestSourceDirectory}" 
+            includes="${maven.jalopy.test.filesetInclude}" 
+            excludes="${maven.jalopy.test.filesetExclude}"/>
       </j:if>
     </ant:jalopy>
   </goal>

jalopy/project.xml

@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-jalopy-plugin</id>
   <name>Maven Jalopy Plugin</name>
-  <currentVersion>1.3</currentVersion>
+  <currentVersion>1.4-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>Reformat java source</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jalopy/</url>

jalopy/xdocs/changes.xml

@@ -24,6 +24,9 @@
     <author email="evenisse@ifrance.com">Emmanuel Venisse</author>
   </properties>
   <body>
+    <release version="1.4" date="In CVS">
+      <action dev="evenisse" type="update" issue="MPJALOPY-6">Allows multiple includes/excludes patterns.</action>
+    </release>
     <release version="1.3" date="2004-07-08">
       <action dev="evenisse" type="update" issue="MPJALOPY-5">Add some exclude properties.</action>
       <action dev="evenisse" type="update">Move to jalopy 1.0b11</action>

jalopy/xdocs/properties.xml

@@ -100,6 +100,7 @@
           <td>Yes</td>
           <td>
             For <code>src/java</code> directory. Specifies a fileset source file to format. 
+            This is a comma- or space-separated list of patterns of files.
 			Defaults to <code>${maven.jalopy.filesetInclude}</code>.
           </td>
         </tr>
@@ -107,7 +108,8 @@
           <td>maven.jalopy.src.filesetExclude</td>
           <td>Yes</td>
           <td>
-            For <code>src/java</code> direcotry. Source files excluded from format. 
+            For <code>src/java</code> direcotry. Source files excluded from format.
+            This is a comma- or space-separated list of patterns of files.
 			Defaults to <code>${maven.jalopy.filesetExclude}</code>.
           </td>
         </tr>
@@ -116,6 +118,7 @@
           <td>Yes</td>
           <td>
             For <code>src/test</code> directory. Specifies a fileset source file to format. 
+            This is a comma- or space-separated list of patterns of files.
 			Defaults to <code>${maven.jalopy.filesetInclude}</code>.
           </td>
         </tr>
@@ -124,10 +127,10 @@
           <td>Yes</td>
           <td>
             For <code>src/test</code> direcotry. Source files excluded from format. 
+            This is a comma- or space-separated list of patterns of files.
 			Defaults to <code>${maven.jalopy.filesetExclude}</code>.
           </td>
         </tr>
-		
       </table>
     </section>
   </body>