cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r587461 - /cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/pom.xml
Date Tue, 23 Oct 2007 11:28:13 GMT
Author: aadamchik
Date: Tue Oct 23 04:28:12 2007
New Revision: 587461

URL: http://svn.apache.org/viewvc?rev=587461&view=rev
Log:
reverting javacc plugin to v2.1 and reverting Kevin's fix as I can't make it work under windows

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/pom.xml

Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/pom.xml?rev=587461&r1=587460&r2=587461&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/pom.xml Tue Oct 23 04:28:12 2007
@@ -176,6 +176,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>javacc-maven-plugin</artifactId>
+				<version>2.1</version>
 				<executions>
 					<execution>
 						<id>jjtree-jpql</id>
@@ -185,7 +186,7 @@
 								${basedir}/src/main/jjtree/org/apache/cayenne/ejbql
 							</sourceDirectory>
 							<outputDirectory>
-								${project.build.directory}/generated-sources/jjtree
+								${project.build.directory}/generated-sources/jjtree/org/apache/cayenne/ejbql
 							</outputDirectory>
 							<buildNodeFiles>false</buildNodeFiles>
 						</configuration>
@@ -199,10 +200,10 @@
 						<phase>generate-sources</phase>
 						<configuration>
 							<sourceDirectory>
-								${project.build.directory}/generated-sources/jjtree
+								${project.build.directory}/generated-sources/jjtree/org/apache/cayenne/ejbql
 							</sourceDirectory>
 							<outputDirectory>
-								${project.build.directory}/generated-sources/javacc
+								${project.build.directory}/generated-sources/javacc/org/apache/cayenne/ejbql
 							</outputDirectory>
 						</configuration>
 						<goals>
@@ -219,7 +220,7 @@
                         <configuration>
                             <tasks>
                                 <delete
-                                    file="${project.build.directory}/generated-sources/jjtree/org/apache/cayenne/ejbql/parser/Node.java"/>
+                                    file="${project.build.directory}/generated-sources/jjtree/org/apache/cayenne/ejbql/Node.java"/>
                             </tasks>
                         </configuration>
                         <goals>



Mime
View raw message