[jboss-cvs] JBossAS SVN: r80948 - in trunk: server and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: pgier
Date: 2008-11-13 15:12:26 -0500 (Thu, 13 Nov 2008)
New Revision: 80948

Modified:
   trunk/component-matrix/pom.xml
   trunk/server/pom.xml
Log:
Update javacc maven plugin.

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2008-11-13 19:56:02 UTC (rev 80947)
+++ trunk/component-matrix/pom.xml	2008-11-13 20:12:26 UTC (rev 80948)
@@ -157,7 +157,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>javacc-maven-plugin</artifactId>
-          <version>2.3</version>
+          <version>2.4.1</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>

Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml	2008-11-13 19:56:02 UTC (rev 80947)
+++ trunk/server/pom.xml	2008-11-13 20:12:26 UTC (rev 80948)
@@ -29,13 +29,11 @@
             <goals>
               <goal>jjtree</goal>
             </goals>
-            <phase>generate-sources</phase>
             <configuration>
               <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
-              <nodePackage>org.jboss.ejb.plugins.cmp.ejbql</nodePackage>
-              <excludes>
-                <exclude>**/EJBQLParser.jjt</exclude>
-              </excludes>
+              <includes>
+                <include>org/jboss/ejb/plugins/cmp/ejbql/JBossQLParser.jjt</include>
+              </includes>
             </configuration>
           </execution>
           <execution>
@@ -43,13 +41,11 @@
             <goals>
               <goal>jjtree</goal>
             </goals>
-            <phase>generate-sources</phase>
             <configuration>
-              <sourceDirectory>src/main</sourceDirectory>
-              <nodePackage>org.jboss.ejb.plugins.cmp.ejbql</nodePackage>
-              <excludes>
-                <exclude>**/JBossQLParser.jjt</exclude>
-              </excludes>
+              <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+              <includes>
+                <include>org/jboss/ejb/plugins/cmp/ejbql/EJBQLParser.jjt</include>
+              </includes>
             </configuration>
           </execution>
           <execution>
@@ -57,11 +53,8 @@
             <goals>
               <goal>javacc</goal>
             </goals>
-            <phase>generate-sources</phase>
             <configuration>
               <sourceDirectory>${project.build.directory}/generated-sources/jjtree/</sourceDirectory>
-              <packageName>org.jboss.ejb.plugins.cmp.ejbql</packageName>
-              <staleMillis>0</staleMillis>
             </configuration>
           </execution>
         </executions>
@@ -270,6 +263,11 @@
       <groupId>org.jboss.naming</groupId>
       <artifactId>jnpserver</artifactId>     
     </dependency>
+    
+    <dependency>
+      <groupId>gnu-getopt</groupId>
+      <artifactId>getopt</artifactId>
+    </dependency>
 
   </dependencies>