jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r280348 - in /incubator/jackrabbit/trunk: ./ api/ applications/ commons/ core/ src/ src/java/org/apache/jackrabbit/ src/java/org/apache/jackrabbit/name/ src/java/org/apache/jackrabbit/util/ src/java/org/apache/jackrabbit/uuid/ src/java/org/...
Date Mon, 12 Sep 2005 14:51:58 GMT
Author: jukka
Date: Mon Sep 12 07:50:30 2005
New Revision: 280348

URL: http://svn.apache.org/viewcvs?rev=280348&view=rev
Log:
Reverted the JCR-157 changes ("the great split"). See the related vote at http://thread.gmane.org/gmane.comp.apache.jackrabbit.devel/3441.

Added:
    incubator/jackrabbit/trunk/applications/
      - copied from r280338, incubator/jackrabbit/trunk/core/applications/
    incubator/jackrabbit/trunk/checkstyle-suppressions.xml
      - copied unchanged from r280338, incubator/jackrabbit/trunk/core/checkstyle-suppressions.xml
    incubator/jackrabbit/trunk/checkstyle.xml
      - copied unchanged from r280338, incubator/jackrabbit/trunk/core/checkstyle.xml
    incubator/jackrabbit/trunk/src/
      - copied from r280338, incubator/jackrabbit/trunk/core/src/
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/BaseException.java
      - copied unchanged from r280338, incubator/jackrabbit/trunk/commons/src/java/org/apache/jackrabbit/BaseException.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/Constants.java
      - copied unchanged from r280338, incubator/jackrabbit/trunk/commons/src/java/org/apache/jackrabbit/Constants.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/JcrConstants.java
      - copied unchanged from r280338, incubator/jackrabbit/trunk/commons/src/java/org/apache/jackrabbit/JcrConstants.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/name/
      - copied from r280338, incubator/jackrabbit/trunk/commons/src/java/org/apache/jackrabbit/name/
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/util/
      - copied from r280338, incubator/jackrabbit/trunk/commons/src/java/org/apache/jackrabbit/util/
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/uuid/
      - copied from r280338, incubator/jackrabbit/trunk/commons/src/java/org/apache/jackrabbit/uuid/
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/value/
      - copied from r280338, incubator/jackrabbit/trunk/commons/src/java/org/apache/jackrabbit/value/
    incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/name/
      - copied from r280338, incubator/jackrabbit/trunk/commons/src/test/org/apache/jackrabbit/name/
Removed:
    incubator/jackrabbit/trunk/api/
    incubator/jackrabbit/trunk/commons/
    incubator/jackrabbit/trunk/core/
Modified:
    incubator/jackrabbit/trunk/maven.xml
    incubator/jackrabbit/trunk/project.properties
    incubator/jackrabbit/trunk/project.xml

Modified: incubator/jackrabbit/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/maven.xml?rev=280348&r1=280347&r2=280348&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/maven.xml (original)
+++ incubator/jackrabbit/trunk/maven.xml Mon Sep 12 07:50:30 2005
@@ -15,5 +15,179 @@
    limitations under the License.
 -->
 
-<project default="multiproject:install">
+<project
+    default="jar:jar"
+    xmlns:deploy="deploy"
+    xmlns:j="jelly:core"
+    xmlns:ant="jelly:ant"
+    xmlns:maven="jelly:maven">
+
+    <postGoal name="ant:generate-build">
+        <attainGoal name="jackrabbit:post-ant"/>
+    </postGoal>
+
+    <postGoal name="maven-javadoc-plugin:report">
+        <attainGoal name="jackrabbit:post-javadoc"/>
+    </postGoal>
+
+    <!-- Goal strips the javadov generated datestamp -->
+    <goal name="jackrabbit:post-javadoc">
+        <ant:replaceregexp
+            match="-- Generated by javadoc .*--"
+            replace="-- Generated by javadoc --" flags="g" byline="true">
+            <ant:fileset dir="${maven.javadoc.destdir}" includes="**/*.html">
+                <ant:depth max="20"/>
+            </ant:fileset>
+        </ant:replaceregexp>
+    </goal>
+
+    <!-- Additionally cleans the test data created -->
+    <postGoal name="clean">
+        <attainGoal name="test:clean"/>
+    </postGoal>
+
+    <!-- deletes the test data -->
+    <goal name="test:clean">
+        <ant:delete includeEmptyDirs="true">
+            <ant:fileset dir="applications/test/repository">
+                <ant:include name="**/*"/>
+                <ant:exclude name="**/custom_nodetypes.xml"/>
+            </ant:fileset>
+        </ant:delete>
+        <ant:delete includeEmptyDirs="true">
+            <ant:fileset dir="applications/test/workspaces">
+                <ant:include name="**/*"/>
+                <ant:exclude name="**/workspace.xml"/>
+            </ant:fileset>
+        </ant:delete>
+        <ant:delete dir="applications/test/tx"/>
+        <ant:delete dir="applications/test/version"/>
+        <ant:delete file="applications/test/.lock"/>
+    </goal>
+
+    <!-- Generates the SQL / XPath parsers if necessary -->
+    <postGoal name="java:prepare-filesystem">
+        <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:include name="JCRSQL.jjt"/>
+                    </ant:srcfiles>
+                </ant:uptodate>
+            </ant:not>
+        </ant:condition>
+        <j:if test="${sqlparser_stale == 'true'}">
+            <attainGoal name="jackrabbit:generate-sql-parser"/>
+        </j:if>
+        <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:include name="javacc.xsl"/>
+                        <ant:include name="jjtree.xsl"/>
+                        <ant:include name="jjtree-jackrabbit.xsl"/>
+                        <ant:include name="strip.xsl"/>
+                        <ant:include name="xpath-grammar.xml"/>
+                    </ant:srcfiles>
+                </ant:uptodate>
+            </ant:not>
+        </ant:condition>
+        <j:if test="${xpathparser_stale == 'true'}">
+            <attainGoal name="jackrabbit:generate-xpath-parser"/>
+        </j:if>
+        <ant:path id="jackrabbit.generated.src"
+                  location="${maven.gen.src}/java"/>
+        <maven:addPath id="maven.compile.src.set"
+                       refid="jackrabbit.generated.src"/>
+    </postGoal>
+
+    <!-- Generates the SQL Parser -->
+    <goal name="jackrabbit:generate-sql-parser">
+        <j:set var="maven.javacc.jjtree.package"
+               value="org.apache.jackrabbit.core.query.sql"/>
+        <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"/>
+        <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: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">
+        <!-- Generate the JavaCC grammar file using XSLT -->
+        <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"
+            out="${maven.gen.src}/javacc/stripped-xpath-grammar.xml"
+            force="yes">
+        </ant:xslt>
+        <ant:xslt style="${maven.src.dir}/grammar/xpath/jjtree-jackrabbit.xsl"
+            in="${maven.gen.src}/javacc/stripped-xpath-grammar.xml"
+            out="${maven.gen.src}/javacc/XPath.jjt"
+            force="yes">
+        </ant:xslt>
+        <!-- Generate the XPath parser using JavaCC -->
+        <j:set var="maven.javacc.jjtree.package"
+               value="org.apache.jackrabbit.core.query.xpath"/>
+        <j:set var="maven.javacc.javacc.package"
+               value="${maven.javacc.jjtree.package}"/>
+        <j:set var="maven.javacc.jjtree.grammar"
+               value="${maven.gen.src}/javacc/XPath.jjt"/>
+        <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:include name="SimpleNode.java"/>
+          </ant:fileset>
+        </ant:delete>
+    </goal>
+
+    <!--
+        Copies all dependencies to ./target/lib
+        (except the optional runtime dependencies cqfs and cqfs-jackrabbit)
+    -->
+    <goal name="copy-deps">
+        <deploy:copy-deps todir="./target/lib" excludes="cqfs,cqfs-jackrabbit"/>
+    </goal>
+
+    <!--
+        Creates a jar file with the JackrabbitRepositoryStub class which is
+        needed for running test cases
+    -->
+    <goal name="jackrabbit:test-stub">
+        <attainGoal name="test:compile"/>
+        <ant:jar destfile="./target/jackrabbit-test-stub-${pom.currentVersion}.jar"
+            basedir="target/test-classes"
+            includes="org/apache/jackrabbit/core/JackrabbitRepositoryStub.class"/>
+    </goal>
+
+    <!--
+        Run Jackrabbit init tests first.
+    -->
+    <preGoal name="test:test">
+        <j:if test="${context.getVariable('maven.test.skip') != 'true'}">
+            <attainGoal name="jackrabbit:test-init"/>
+        </j:if>
+    </preGoal>
+
+    <!--
+        Runs the init test cases to fill the repository with data for
+        read-only tests.
+    -->
+    <goal name="jackrabbit:test-init">
+        <j:set var="testcase" value="org.apache.jackrabbit.init.TestAll"/>
+        <attainGoal name="test:single"/>
+    </goal>
+
 </project>

Modified: incubator/jackrabbit/trunk/project.properties
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/project.properties?rev=280348&r1=280347&r2=280348&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/project.properties (original)
+++ incubator/jackrabbit/trunk/project.properties Mon Sep 12 07:50:30 2005
@@ -30,7 +30,7 @@
 maven.junit.sysproperties=org.xml.sax.driver
 org.xml.sax.driver=org.apache.xerces.parsers.SAXParser
 #java.security.auth.login.config=applications/test/jaas.config
-
+maven.junit.jvmargs=-Xmx128m
 
 #If you wish to skip tests when doing builds, uncomment
 #maven.test.skip = true
@@ -88,7 +88,6 @@
 maven.xdoc.developmentProcessUrl=http://incubator.apache.org/projects/jackrabbit.html
 maven.changelog.range=60
 maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
-maven.multiproject.overviewPage.title=Jackrabbit components
 
 ######################################################################
 # Site Deploy (into ../jackrabbit-site for checkout on incubator.apache.org)

Modified: incubator/jackrabbit/trunk/project.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/project.xml?rev=280348&r1=280347&r2=280348&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/project.xml (original)
+++ incubator/jackrabbit/trunk/project.xml Mon Sep 12 07:50:30 2005
@@ -19,7 +19,7 @@
 
 <project>
     <!-- ====================================================================== -->
-    <!-- M A S T E R  P R O J E C T  D E S C R I P T I O N                      -->
+    <!-- P R O J E C T  D E S C R I P T I O N                                   -->
     <!-- ====================================================================== -->
     <pomVersion>3</pomVersion>
     <groupId>jackrabbit</groupId>
@@ -302,7 +302,143 @@
         </contributor>
     </contributors>
 
+    <!-- ====================================================================== -->
+    <!-- D E P E N D E N C I E S                                                -->
+    <!-- ====================================================================== -->
+
+    <dependencies>
+        <dependency>
+            <id>concurrent</id>
+            <version>1.3.4</version>
+        </dependency>
+        <dependency>
+            <id>junit</id>
+            <version>3.8.1</version>
+        </dependency>
+        <dependency>
+            <id>commons-collections</id>
+            <version>3.1</version>
+        </dependency>
+        <dependency>
+            <id>javacc</id>
+            <version>3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-jta</artifactId>
+            <version>1.0-M1</version>
+        </dependency>
+        <dependency>
+            <groupId>jsr170</groupId>
+            <artifactId>jcr</artifactId>
+            <version>1.0</version>
+            <url>http://jcp.org/en/jsr/detail?id=170</url>
+        </dependency>
+        <dependency>
+            <id>log4j</id>
+            <version>1.2.8</version>
+        </dependency>
+        <dependency>
+            <groupId>lucene</groupId>
+            <artifactId>lucene</artifactId>
+            <version>1.4.3</version>
+        </dependency>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>2.6.2</version>
+        </dependency>
+        <dependency>
+            <groupId>xml-apis</groupId>
+            <artifactId>xmlParserAPIs</artifactId>
+            <version>2.0.2</version>
+        </dependency>
+        <!--
+          cqfs-jackrabbit and cqfs are optional runtime dependencies 
+          (an alternative FileSystem implementation); 
+          commons-logging is a dependency of cqfs
+        -->
+        <dependency>
+            <groupId>cqfs</groupId>
+            <artifactId>cqfs-jackrabbit</artifactId>
+            <version>3.5.6-SNAPSHOT</version>
+            <url>http://www.day.com/maven/cqfs/jars/cqfs-jackrabbit-3.5.6-SNAPSHOT.jar</url>
+        </dependency>
+        <dependency>
+            <groupId>cqfs</groupId>
+            <artifactId>cqfs</artifactId>
+            <version>3.5.6-SNAPSHOT</version>
+            <url>http://www.day.com/maven/cqfs/jars/cqfs-3.5.6-SNAPSHOT.jar</url>
+        </dependency>
+        <dependency>
+            <id>commons-logging</id>
+            <version>1.0</version>
+        </dependency>
+    </dependencies>
+
+    <!-- ====================================================================== -->
+    <!-- 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>
+        <unitTest>
+            <includes>
+                <include>**/*TestAll.java</include>
+            </includes>
+            <excludes>
+                <exclude>**/init/*</exclude>
+            </excludes>
+            <resources>
+                <resource>
+                    <directory>applications/test</directory>
+                    <includes>
+                        <include>*.properties</include>
+                        <include>*.xml</include>
+                    </includes>
+                </resource>
+                <resource>
+                    <directory>src/test</directory>
+                    <includes>
+                        <include>**/*.xml</include>
+                        <include>**/*.txt</include>
+                    </includes>
+                </resource>
+            </resources>
+        </unitTest>
+        
+        <!-- J A R  R E S O U R C E S -->
+        <!-- Resources that are packaged up inside the JAR file -->
+        <resources>
+            <resource>
+                <directory>src/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                    <include>**/*.properties</include>
+                    <include>**/*.TextFilterService</include>
+                </includes>
+            </resource>
+        </resources>
+    </build>
+
+    <!-- ====================================================================== -->
+    <!-- R E P O R T S                                                          -->
+    <!-- ====================================================================== -->
     <reports>
+        <report>maven-changelog-plugin</report>
+        <report>maven-changes-plugin</report>
+        <!-- <report>maven-checkstyle-plugin</report> -->
+        <!-- <report>maven-clover-plugin</report> -->
+        <!-- <report>maven-developer-activity-plugin</report> -->
+        <!-- <report>maven-file-activity-plugin</report> -->
+        <report>maven-javadoc-plugin</report>
+        <!-- <report>maven-jellydoc-plugin</report> -->
+        <report>maven-junit-report-plugin</report>
+        <report>maven-jxr-plugin</report>
+        <report>maven-license-plugin</report>
+        <!-- <report>maven-linkcheck-plugin</report> -->
+        <!-- <report>maven-statcvs-plugin</report> -->
+        <report>maven-tasklist-plugin</report>
         <report>maven-faq-plugin</report>
     </reports>
 



Mime
View raw message