jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r591252 - in /jackrabbit/trunk/jackrabbit-core: applications/ build.xml pom.xml src/test/repository/ src/test/resources/repositoryStubImpl.properties
Date Fri, 02 Nov 2007 07:48:33 GMT
Author: jukka
Date: Fri Nov  2 00:48:32 2007
New Revision: 591252

URL: http://svn.apache.org/viewvc?rev=591252&view=rev
Log:
JCR-1203: Reorganize core test suite
    - Moved applications/test to src/test/repository
    - Updated build rules and stub properties accordingly

Added:
    jackrabbit/trunk/jackrabbit-core/src/test/repository/
      - copied from r591240, jackrabbit/trunk/jackrabbit-core/applications/test/
Removed:
    jackrabbit/trunk/jackrabbit-core/applications/
Modified:
    jackrabbit/trunk/jackrabbit-core/build.xml
    jackrabbit/trunk/jackrabbit-core/pom.xml
    jackrabbit/trunk/jackrabbit-core/src/test/resources/repositoryStubImpl.properties

Modified: jackrabbit/trunk/jackrabbit-core/build.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/build.xml?rev=591252&r1=591251&r2=591252&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/build.xml (original)
+++ jackrabbit/trunk/jackrabbit-core/build.xml Fri Nov  2 00:48:32 2007
@@ -19,39 +19,6 @@
 				<include name="SimpleNode.java" />
 			</fileset>
 		</delete>
-		<delete includeEmptyDirs="true">
-			<fileset dir="applications/test/workspaces">
-				<include name="**/*" />
-				<exclude name="**/workspace.xml" />
-			</fileset>
-		</delete>
-		<delete dir="applications/test/tx" />
-		<delete dir="applications/test/version" />
-		<delete file="applications/test/.lock" />
-	</target>
-
-	<target name="prepareTestRepository">
-		<copy file="applications/test/repository/namespaces/ns_reg.properties.install" tofile="applications/test/repository/namespaces/ns_reg.properties"
overwrite="true" />
-		<copy file="applications/test/repository/nodetypes/custom_nodetypes.xml.install" tofile="applications/test/repository/nodetypes/custom_nodetypes.xml"
overwrite="true" />
-	</target>
-
-	<target name="cleanTestData">
-		<delete includeEmptyDirs="true">
-			<fileset dir="applications/test/repository">
-				<include name="**/*" />
-				<exclude name="**/custom_nodetypes.xml.install" />
-				<exclude name="**/ns_reg.properties.install" />
-			</fileset>
-		</delete>
-		<delete includeEmptyDirs="true">
-			<fileset dir="applications/test/workspaces">
-				<include name="**/*" />
-				<exclude name="**/workspace.xml" />
-			</fileset>
-		</delete>
-		<delete dir="applications/test/tx" />
-		<delete dir="applications/test/version" />
-		<delete file="applications/test/.lock" />
 	</target>
 </project>
 

Modified: jackrabbit/trunk/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/pom.xml?rev=591252&r1=591251&r2=591252&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-core/pom.xml Fri Nov  2 00:48:32 2007
@@ -62,27 +62,15 @@
             <phase>process-test-resources</phase>
             <configuration>
               <tasks>
-                <ant
-                  antfile="${basedir}/build.xml"
-                  inheritRefs="true">
-                  <target name="prepareTestRepository" />
-                </ant>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>clean</id>
-            <phase>clean</phase>
-            <configuration>
-              <tasks>
-                <ant
-                  antfile="${basedir}/build.xml"
-                  inheritRefs="true">
-                  <target name="cleanTestData" />
-                </ant>
+                <copy todir="${project.build.directory}/repository">
+                  <fileset dir="${basedir}/src/test/repository"/>
+                </copy>
+                <copy file="${basedir}/src/test/repository/repository/namespaces/ns_reg.properties.install"
+                      tofile="${project.build.directory}/repository/repository/namespaces/ns_reg.properties"
+                      overwrite="true" />
+                <copy file="${basedir}/src/test/repository/repository/nodetypes/custom_nodetypes.xml.install"
+                      tofile="${project.build.directory}/repository/repository/nodetypes/custom_nodetypes.xml"
+                      overwrite="true" />
               </tasks>
             </configuration>
             <goals>

Modified: jackrabbit/trunk/jackrabbit-core/src/test/resources/repositoryStubImpl.properties
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/resources/repositoryStubImpl.properties?rev=591252&r1=591251&r2=591252&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/resources/repositoryStubImpl.properties (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/resources/repositoryStubImpl.properties Fri
Nov  2 00:48:32 2007
@@ -21,10 +21,10 @@
 javax.jcr.tck.repository_stub_impl=org.apache.jackrabbit.core.JackrabbitRepositoryStub
 
 # repository specific configuration
-org.apache.jackrabbit.repository.config=applications/test/repository.xml
+org.apache.jackrabbit.repository.config=src/test/repository/repository.xml
 org.apache.jackrabbit.repository.name=repo
-org.apache.jackrabbit.repository.home=applications/test
-org.apache.jackrabbit.repository.jaas.config=applications/test/jaas.config
+org.apache.jackrabbit.repository.home=target/repository
+org.apache.jackrabbit.repository.jaas.config=src/test/repository/jaas.config
 
 # credential configuration
 javax.jcr.tck.superuser.name=superuser



Mime
View raw message