svn commit: r327000 - in /maven/maven-1/plugins/trunk/javacc: plugin.jelly plugin.properties xdocs/changes.xml xdocs/properties.xml

[fg...@apache.org]

Author: fgiust
Date: Thu Oct 20 13:52:47 2005
New Revision: 327000

URL: http://svn.apache.org/viewcvs?rev=327000&view=rev
Log:
MPJAVACC-3 Target properties are ignored
removed the harcoded ${maven.build.dir}/generated-src/main/java path and introduced the "maven.gen.src" for consistency with the eclipse plugin.
Fixed documentation and removed unused properties.

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

Modified: maven/maven-1/plugins/trunk/javacc/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/javacc/plugin.jelly?rev=327000&r1=326999&r2=327000&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/javacc/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/javacc/plugin.jelly Thu Oct 20 13:52:47 2005
@@ -33,7 +33,7 @@
             <j:set var="packageName" value="${pom.package}"/>
         </j:if>
         <j:useBean var="javacc"
-            generatedSourceDirectory="${maven.build.dir}/generated-src/main/java"
+            generatedSourceDirectory="${maven.gen.src}"
             class="org.apache.maven.javacc.JavaccBean"
             javaccPackageName="${packageName}"
             grammar="${maven.javacc.javacc.grammar}"
@@ -57,7 +57,7 @@
         <echo>javaccPackageName:${javaccPackageName}</echo>
         <echo>jjtreePackageName:${jjtreePackageName}</echo>
         <j:useBean var="jjtree"
-            generatedSourceDirectory="${maven.build.dir}/generated-src/main/java"
+            generatedSourceDirectory="${maven.gen.src}"
             class="org.apache.maven.javacc.JJTreeBean"
             javaccPackageName="${javaccPackageName}"
             jjtreePackageName="${jjtreePackageName}"
@@ -81,7 +81,7 @@
         <attainGoal name="javacc:javacc-generate"/>
 
         <ant:path id="maven.javacc.compile.src.set"
-            location="${maven.build.dir}/generated-src/main/java"/>
+            location="${maven.gen.src}"/>
         <maven:addPath id="maven.compile.src.set"
             refid="maven.javacc.compile.src.set"/>
     </goal>

Modified: maven/maven-1/plugins/trunk/javacc/plugin.properties
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/javacc/plugin.properties?rev=327000&r1=326999&r2=327000&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/javacc/plugin.properties (original)
+++ maven/maven-1/plugins/trunk/javacc/plugin.properties Thu Oct 20 13:52:47 2005
@@ -20,3 +20,4 @@
 maven.javacc.jjtree.packageName=
 maven.javacc.jjtree.header=src/main/javacc/jjtree_header
 maven.javacc.javacc.header=src/main/javacc/javacc_header
+maven.gen.src=${maven.build.dir}/generated-src/main/java
\ No newline at end of file

Modified: maven/maven-1/plugins/trunk/javacc/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/javacc/xdocs/changes.xml?rev=327000&r1=326999&r2=327000&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/javacc/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/javacc/xdocs/changes.xml Thu Oct 20 13:52:47 2005
@@ -30,6 +30,7 @@
           <li>plexus-utils v1.0-beta-1 -> v1.0.3</li>
         </ul>
       </action>
+      <action dev="fgiust" type="fix" issue="MPJAVACC-3">Output directory for generated files can be configured</action>
     </release>
     <release version="1.1" date="2004-05-15">
       <action dev="dion" type="fix">Fix issues with DOM classes and jdk1.3</action>

Modified: maven/maven-1/plugins/trunk/javacc/xdocs/properties.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/javacc/xdocs/properties.xml?rev=327000&r1=326999&r2=327000&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/javacc/xdocs/properties.xml (original)
+++ maven/maven-1/plugins/trunk/javacc/xdocs/properties.xml Thu Oct 20 13:52:47 2005
@@ -47,17 +47,11 @@
           </td>
         </tr>
         <tr>
-          <td>maven.javacc.javacc.target.dir</td>
-          <td>No</td>
+          <td>maven.gen.src</td>
+          <td>Yes</td>
           <td>
-            Defines where javacc will process .jj files to.
-          </td>
-        </tr>
-        <tr>
-          <td>maven.javacc.jtree.target.dir</td>
-          <td>No</td>
-          <td>
-            Defines where jtree will process .jjt files to.
+            The directory where files will be generated.
+            Defaults to <code>${maven.build.dir}/generated-src/main/java</code>
           </td>
         </tr>
       </table>