Index: maven.xml
===================================================================
--- maven.xml	(revision 164953)
+++ maven.xml	(working copy)
@@ -19,7 +19,8 @@
     default="jar:jar"
     xmlns:deploy="deploy"
     xmlns:j="jelly:core"
-    xmlns:ant="jelly:ant">
+    xmlns:ant="jelly:ant"
+    xmlns:maven="jelly:maven">
 
     <postGoal name="ant:generate-build">
         <attainGoal name="jackrabbit:post-ant"/>
@@ -67,8 +68,8 @@
     <postGoal name="java:prepare-filesystem">
         <ant:condition property="sqlparser_stale">
             <ant:not>
-                <ant:uptodate targetfile="src/java/org/apache/jackrabbit/core/query/sql/JCRSQLParser.java">
-                    <ant:srcfiles dir="src/grammar/sql">
+                <ant:uptodate targetfile="${maven.build.dir}/generated-src/main/java/org/apache/jackrabbit/core/query/sql/JCRSQLParser.java">
+                    <ant:srcfiles dir="${maven.src.dir}/grammar/sql">
                         <ant:include name="JCRSQL.jjt"/>
                     </ant:srcfiles>
                 </ant:uptodate>
@@ -84,8 +85,8 @@
         </j:choose>
         <ant:condition property="xpathparser_stale">
             <ant:not>
-                <ant:uptodate targetfile="src/java/org/apache/jackrabbit/core/query/xpath/XPath.java">
-                    <ant:srcfiles dir="src/grammar/xpath">
+                <ant:uptodate targetfile="${maven.build.dir}/generated-src/main/java/org/apache/jackrabbit/core/query/xpath/XPath.java">
+                    <ant:srcfiles dir="${maven.src.dir}/grammar/xpath">
                         <ant:include name="javacc.xsl"/>
                         <ant:include name="jjtree.xsl"/>
                         <ant:include name="jjtree-jackrabbit.xsl"/>
@@ -103,13 +104,18 @@
                 <ant:echo>XPath Parser up-to-date</ant:echo>
             </j:otherwise>
         </j:choose>
+        <ant:path id="jackrabbit.generated.src"
+                  location="${maven.build.dir}/generated-src/main/java"/>
+        <maven:addPath id="maven.compile.src.set"
+                       refid="jackrabbit.generated.src"/>
     </postGoal>
 
     <!-- Generates the SQL Parser -->
     <goal name="jackrabbit:generate-sql-parser">
+        <ant:mkdir dir="${maven.build.dir}/generated-src/main/java/org/apache/jackrabbit/core/query/sql"/>
         <ant:java classname="jjtree" fork="true">
-            <arg value="-OUTPUT_DIRECTORY=src/java/org/apache/jackrabbit/core/query/sql"/>
-            <arg value="src/grammar/sql/JCRSQL.jjt"/>
+            <arg value="-OUTPUT_DIRECTORY=${maven.build.dir}/generated-src/main/java/org/apache/jackrabbit/core/query/sql"/>
+            <arg value="${maven.src.dir}/grammar/sql/JCRSQL.jjt"/>
             <classpath>
                 <fileset dir="${maven.repo.local}/javacc/jars">
                     <include name="javacc-3.2.jar"/>
@@ -117,34 +123,45 @@
             </classpath>
         </ant:java>
         <ant:java classname="javacc" fork="true">
-            <arg value="-OUTPUT_DIRECTORY=src/java/org/apache/jackrabbit/core/query/sql"/>
-            <arg value="src/java/org/apache/jackrabbit/core/query/sql/JCRSQL.jj"/>
+            <arg value="-OUTPUT_DIRECTORY=${maven.build.dir}/generated-src/main/java/org/apache/jackrabbit/core/query/sql"/>
+            <arg value="${maven.build.dir}/generated-src/main/java/org/apache/jackrabbit/core/query/sql/JCRSQL.jj"/>
             <classpath>
                 <fileset dir="${maven.repo.local}/javacc/jars">
                     <include name="javacc-3.2.jar"/>
                 </fileset>
             </classpath>
         </ant:java>
+        <!-- Remove files that have been customized in Jackrabbit. -->
+        <ant:delete>
+          <ant:fileset dir="${maven.build.dir}/generated-src/main/java/org/apache/jackrabbit/core/query/sql">
+            <ant:include name="ASTLiteral.java"/>
+            <ant:include name="ASTContainsExpression.java"/>
+            <ant:include name="ASTPredicate.java"/>
+            <ant:include name="ASTIdentifier.java"/>
+          </ant:fileset>
+        </ant:delete>
     </goal>
 
     <!-- Generates the XPath Parser -->
     <goal name="jackrabbit:generate-xpath-parser">
+        <ant:mkdir dir="${maven.build.dir}/generated-src/grammar"/>
+        <ant:mkdir dir="${maven.build.dir}/generated-src/main/java/org/apache/jackrabbit/core/query/xpath"/>
         <!-- The following is a hack to get xslt work with maven (See: http://maven.apache.org/faq.html#BadXSLT ) -->
         ${systemScope.setProperty('javax.xml.transform.TransformerFactory','org.apache.xalan.processor.TransformerFactoryImpl')}
-        <ant:xslt style="src/grammar/xpath/strip.xsl"
-            in="src/grammar/xpath/xpath-grammar.xml"
-            out="src/grammar/xpath/stripped-xpath-grammar.xml"
+        <ant:xslt style="${maven.src.dir}/grammar/xpath/strip.xsl"
+            in="${maven.src.dir}/grammar/xpath/xpath-grammar.xml"
+            out="${maven.build.dir}/generated-src/grammar/stripped-xpath-grammar.xml"
             force="yes">
         </ant:xslt>
-        <ant:xslt style="src/grammar/xpath/jjtree-jackrabbit.xsl"
-            in="src/grammar/xpath/stripped-xpath-grammar.xml"
-            out="src/grammar/xpath/XPath.jjt"
+        <ant:xslt style="${maven.src.dir}/grammar/xpath/jjtree-jackrabbit.xsl"
+            in="${maven.build.dir}/generated-src/grammar/stripped-xpath-grammar.xml"
+            out="${maven.build.dir}/generated-src/grammar/XPath.jjt"
             force="yes">
         </ant:xslt>
 
         <ant:java classname="jjtree" fork="true">
-            <arg value="-OUTPUT_DIRECTORY=src/java/org/apache/jackrabbit/core/query/xpath"/>
-            <arg value="src/grammar/xpath/XPath.jjt"/>
+            <arg value="-OUTPUT_DIRECTORY=${maven.build.dir}/generated-src/main/java/org/apache/jackrabbit/core/query/xpath"/>
+            <arg value="${maven.build.dir}/generated-src/grammar/XPath.jjt"/>
             <classpath>
                 <fileset dir="${maven.repo.local}/javacc/jars">
                     <include name="javacc-3.2.jar"/>
@@ -152,15 +169,21 @@
             </classpath>
         </ant:java>
         <ant:java classname="javacc" fork="true">
-            <arg value="-OUTPUT_DIRECTORY=src/java/org/apache/jackrabbit/core/query/xpath"/>
+            <arg value="-OUTPUT_DIRECTORY=${maven.build.dir}/generated-src/main/java/org/apache/jackrabbit/core/query/xpath"/>
             <arg value="-UNICODE_INPUT=true"/>
-            <arg value="src/java/org/apache/jackrabbit/core/query/xpath/XPath.jj"/>
+            <arg value="${maven.build.dir}/generated-src/main/java/org/apache/jackrabbit/core/query/xpath/XPath.jj"/>
             <classpath>
                 <fileset dir="${maven.repo.local}/javacc/jars">
                     <include name="javacc-3.2.jar"/>
                 </fileset>
             </classpath>
         </ant:java>
+        <!-- Remove files that have been customized in Jackrabbit. -->
+        <ant:delete>
+          <ant:fileset dir="${maven.build.dir}/generated-src/main/java/org/apache/jackrabbit/core/query/xpath">
+            <ant:include name="SimpleNode.java"/>
+          </ant:fileset>
+        </ant:delete>
     </goal>
 
     <!--
@@ -181,4 +204,5 @@
             basedir="target/test-classes"
             includes="org/apache/jackrabbit/core/JackrabbitRepositoryStub.class"/>
     </goal>
+
 </project>