evenisse    2004/08/24 04:24:13

  Modified:    jalopy   plugin.jelly project.xml
               jalopy/xdocs changes.xml properties.xml
  Log:
  MPJALOPY-6. Allows multiple includes/excludes patterns.
  
  Revision  Changes    Path
  1.8       +6 -8      maven-plugins/jalopy/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven-plugins/jalopy/plugin.jelly,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- plugin.jelly      7 Jul 2004 15:59:27 -0000       1.7
  +++ plugin.jelly      24 Aug 2004 11:24:12 -0000      1.8
  @@ -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>
  
  
  
  1.38      +1 -1      maven-plugins/jalopy/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/jalopy/project.xml,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- project.xml       8 Jul 2004 13:47:53 -0000       1.37
  +++ project.xml       24 Aug 2004 11:24:12 -0000      1.38
  @@ -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>
  
  
  
  1.14      +3 -0      maven-plugins/jalopy/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/jalopy/xdocs/changes.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- changes.xml       8 Jul 2004 13:47:53 -0000       1.13
  +++ changes.xml       24 Aug 2004 11:24:12 -0000      1.14
  @@ -24,6 +24,9 @@
       <author email="[EMAIL PROTECTED]">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>
  
  
  
  1.4       +5 -2      maven-plugins/jalopy/xdocs/properties.xml
  
  Index: properties.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/jalopy/xdocs/properties.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- properties.xml    7 Jul 2004 15:59:27 -0000       1.3
  +++ properties.xml    24 Aug 2004 11:24:13 -0000      1.4
  @@ -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>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to