jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r330540 - in /incubator/jackrabbit/trunk/jackrabbit: maven.xml project.properties project.xml src/conf/ src/grammar/ src/java/ src/main/ src/main/config/ src/main/java/ src/main/javacc/ src/test/java/ src/test/java/org/ src/test/org/
Date Thu, 03 Nov 2005 12:54:58 GMT
Author: jukka
Date: Thu Nov  3 04:54:47 2005
New Revision: 330540

URL: http://svn.apache.org/viewcvs?rev=330540&view=rev
Log:
Migrate to the Maven 2 standard directory layout

Added:
    incubator/jackrabbit/trunk/jackrabbit/src/main/
    incubator/jackrabbit/trunk/jackrabbit/src/main/config/
      - copied from r330536, incubator/jackrabbit/trunk/jackrabbit/src/conf/
    incubator/jackrabbit/trunk/jackrabbit/src/main/java/
      - copied from r330536, incubator/jackrabbit/trunk/jackrabbit/src/java/
    incubator/jackrabbit/trunk/jackrabbit/src/main/javacc/
      - copied from r330536, incubator/jackrabbit/trunk/jackrabbit/src/grammar/
    incubator/jackrabbit/trunk/jackrabbit/src/test/java/
    incubator/jackrabbit/trunk/jackrabbit/src/test/java/org/
      - copied from r330536, incubator/jackrabbit/trunk/jackrabbit/src/test/org/
Removed:
    incubator/jackrabbit/trunk/jackrabbit/src/conf/
    incubator/jackrabbit/trunk/jackrabbit/src/grammar/
    incubator/jackrabbit/trunk/jackrabbit/src/java/
    incubator/jackrabbit/trunk/jackrabbit/src/test/org/
Modified:
    incubator/jackrabbit/trunk/jackrabbit/maven.xml
    incubator/jackrabbit/trunk/jackrabbit/project.properties
    incubator/jackrabbit/trunk/jackrabbit/project.xml

Modified: incubator/jackrabbit/trunk/jackrabbit/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/maven.xml?rev=330540&r1=330539&r2=330540&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/maven.xml (original)
+++ incubator/jackrabbit/trunk/jackrabbit/maven.xml Thu Nov  3 04:54:47 2005
@@ -67,7 +67,7 @@
         <ant:condition property="sqlparser_stale">
             <ant:not>
                 <ant:uptodate targetfile="${maven.gen.src}/java/org/apache/jackrabbit/core/query/sql/JCRSQLParser.java">
-                    <ant:srcfiles dir="${maven.src.dir}/grammar/sql">
+                    <ant:srcfiles dir="${maven.src.dir}/main/javacc/sql">
                         <ant:include name="JCRSQL.jjt"/>
                     </ant:srcfiles>
                 </ant:uptodate>
@@ -79,7 +79,7 @@
         <ant:condition property="xpathparser_stale">
             <ant:not>
                 <ant:uptodate targetfile="${maven.gen.src}/java/org/apache/jackrabbit/core/query/xpath/XPath.java">
-                    <ant:srcfiles dir="${maven.src.dir}/grammar/xpath">
+                    <ant:srcfiles dir="${maven.src.dir}/main/javacc/xpath">
                         <ant:include name="javacc.xsl"/>
                         <ant:include name="jjtree.xsl"/>
                         <ant:include name="jjtree-jackrabbit.xsl"/>
@@ -95,7 +95,7 @@
         <ant:condition property="fulltextparser_stale">
             <ant:not>
                 <ant:uptodate targetfile="${maven.gen.src}/java/org/apache/jackrabbit/core/query/lucene/fulltext/QueryParser.java">
-                    <ant:srcfiles dir="${maven.src.dir}/grammar/fulltext">
+                    <ant:srcfiles dir="${maven.src.dir}/main/javacc/fulltext">
                         <ant:include name="QueryParser.jjt"/>
                     </ant:srcfiles>
                 </ant:uptodate>
@@ -117,7 +117,7 @@
         <j:set var="maven.javacc.javacc.package"
                value="${maven.javacc.jjtree.package}"/>
         <j:set var="maven.javacc.jjtree.grammar"
-               value="${maven.src.dir}/grammar/sql/JCRSQL.jjt"/>
+               value="${maven.src.dir}/main/javacc/sql/JCRSQL.jjt"/>
         <attainGoal name="javacc"/>
         <!-- Remove files that have been customized in Jackrabbit. -->
         <ant:delete>
@@ -136,12 +136,12 @@
         <ant:mkdir dir="${maven.gen.src}/javacc"/>
         <!-- 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="${maven.src.dir}/grammar/xpath/strip.xsl"
-            in="${maven.src.dir}/grammar/xpath/xpath-grammar.xml"
+        <ant:xslt style="${maven.src.dir}/main/javacc/xpath/strip.xsl"
+            in="${maven.src.dir}/main/javacc/xpath/xpath-grammar.xml"
             out="${maven.gen.src}/javacc/stripped-xpath-grammar.xml"
             force="yes">
         </ant:xslt>
-        <ant:xslt style="${maven.src.dir}/grammar/xpath/jjtree-jackrabbit.xsl"
+        <ant:xslt style="${maven.src.dir}/main/javacc/xpath/jjtree-jackrabbit.xsl"
             in="${maven.gen.src}/javacc/stripped-xpath-grammar.xml"
             out="${maven.gen.src}/javacc/XPath.jjt"
             force="yes">
@@ -169,7 +169,7 @@
         <j:set var="maven.javacc.javacc.package"
                value="${maven.javacc.jjtree.package}"/>
         <j:set var="maven.javacc.jjtree.grammar"
-               value="${maven.src.dir}/grammar/fulltext/QueryParser.jjt"/>
+               value="${maven.src.dir}/main/javacc/fulltext/QueryParser.jjt"/>
         <attainGoal name="javacc"/>
     </goal>
 

Modified: incubator/jackrabbit/trunk/jackrabbit/project.properties
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/project.properties?rev=330540&r1=330539&r2=330540&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/project.properties (original)
+++ incubator/jackrabbit/trunk/jackrabbit/project.properties Thu Nov  3 04:54:47 2005
@@ -67,7 +67,7 @@
 maven.compile.source=1.4
 maven.compile.target=1.4
 
-maven.jarResources.basedir=src/java
+maven.jarResources.basedir=src/main/java
 maven.jar.excludes=**/package.html
 
 # Location of the generated query language parsers. Needed for

Modified: incubator/jackrabbit/trunk/jackrabbit/project.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/project.xml?rev=330540&r1=330539&r2=330540&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/project.xml (original)
+++ incubator/jackrabbit/trunk/jackrabbit/project.xml Thu Nov  3 04:54:47 2005
@@ -412,8 +412,8 @@
     <!-- B U I L D  D E S C R I P T I O N                                       -->
     <!-- ====================================================================== -->
     <build>
-        <sourceDirectory>src/java</sourceDirectory>
-        <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+        <sourceDirectory>src/main/java</sourceDirectory>
+        <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
         <unitTest>
             <includes>
                 <include>**/*TestAll.java</include>
@@ -430,7 +430,7 @@
                     </includes>
                 </resource>
                 <resource>
-                    <directory>src/test</directory>
+                    <directory>src/test/java</directory>
                     <includes>
                         <include>**/*.xml</include>
                         <include>**/*.txt</include>
@@ -443,7 +443,7 @@
         <!-- Resources that are packaged up inside the JAR file -->
         <resources>
             <resource>
-                <directory>src/java</directory>
+                <directory>src/main/java</directory>
                 <includes>
                     <include>**/*.xml</include>
                     <include>**/*.properties</include>



Mime
View raw message