Index: jackrabbit/maven.xml
===================================================================
--- jackrabbit/maven.xml	(revision 453305)
+++ jackrabbit/maven.xml	(working copy)
@@ -136,7 +136,7 @@
             <attainGoal name="jackrabbit:generate-fulltext-parser"/>
         </j:if>
         <ant:path id="jackrabbit.generated.src"
-                  location="${maven.gen.src}/java"/>
+                  location="${maven.gen.src}"/>
         <maven:addPath id="maven.compile.src.set"
                        refid="jackrabbit.generated.src"/>
     </postGoal>
@@ -152,7 +152,7 @@
         <attainGoal name="javacc"/>
         <!-- Remove files that have been customized in Jackrabbit. -->
         <ant:delete>
-          <ant:fileset dir="${maven.gen.src}/java/org/apache/jackrabbit/core/query/sql">
+          <ant:fileset dir="${maven.gen.src}/org/apache/jackrabbit/core/query/sql">
             <ant:include name="ASTLiteral.java"/>
             <ant:include name="ASTContainsExpression.java"/>
             <ant:include name="ASTPredicate.java"/>
@@ -173,7 +173,7 @@
         <attainGoal name="javacc"/>
         <!-- Remove files that have been customized in Jackrabbit. -->
         <ant:delete>
-          <ant:fileset dir="${maven.gen.src}/java/org/apache/jackrabbit/core/query/xpath">
+          <ant:fileset dir="${maven.gen.src}/org/apache/jackrabbit/core/query/xpath">
             <ant:include name="SimpleNode.java"/>
           </ant:fileset>
         </ant:delete>