[exo-jcr-commits] exo-jcr SVN: r4461 - in jcr/branches/1.12.x: exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/util and 2 other directories.

[do-not-reply at jboss.org]

Author: paristote
Date: 2011-05-31 05:54:35 -0400 (Tue, 31 May 2011)
New Revision: 4461

Modified:
   jcr/branches/1.12.x/exo.jcr.component.core/pom.xml
   jcr/branches/1.12.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/util/TesterConfigurationHelper.java
   jcr/branches/1.12.x/exo.jcr.component.core/src/test/resources/log4j.properties
   jcr/branches/1.12.x/exo.jcr.component.webdav/pom.xml
Log:
JCR-1632 clean build by putting all generated data in target

Modified: jcr/branches/1.12.x/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.core/pom.xml	2011-05-31 09:36:56 UTC (rev 4460)
+++ jcr/branches/1.12.x/exo.jcr.component.core/pom.xml	2011-05-31 09:54:35 UTC (rev 4461)
@@ -364,7 +364,7 @@
                            <overWrite>false</overWrite>
                         </artifactItem>
                      </artifactItems>
-                     <outputDirectory>${project.build.testSourceDirectory}</outputDirectory>
+                     <outputDirectory>${project.build.directory}/jackrabbit-jcr-tests</outputDirectory>
                   </configuration>
                </execution>
             </executions>
@@ -373,7 +373,7 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
-               <argLine>${env.MAVEN_OPTS}</argLine>
+               <argLine>${env.MAVEN_OPTS} -Dcom.arjuna.ats.arjuna.objectstore.objectStoreDir=${project.build.directory}</argLine>
                <systemProperties>
                   <property>
                      <name>jcr.test.configuration.file</name>
@@ -558,7 +558,7 @@
                   <artifactId>maven-surefire-plugin</artifactId>
                   <configuration>
                      <!-- TAKE CARE TO UPDATE ALSO run-all PROFILE -->
-                     <argLine>${env.MAVEN_OPTS}</argLine>
+                     <argLine>${env.MAVEN_OPTS} -Dcom.arjuna.ats.arjuna.objectstore.objectStoreDir=${project.build.directory}</argLine>
                      <systemProperties>
                         <property>
                            <name>jcr.test.configuration.file</name>
@@ -645,7 +645,7 @@
                   <artifactId>maven-surefire-plugin</artifactId>
                   <configuration>
                      <!-- TAKE CARE TO UPDATE ALSO run-tck PROFILE -->
-                     <argLine>${env.MAVEN_OPTS}</argLine>
+                     <argLine>${env.MAVEN_OPTS} -Dcom.arjuna.ats.arjuna.objectstore.objectStoreDir=${project.build.directory}</argLine>
                      <systemProperties>
                         <property>
                            <name>jcr.test.configuration.file</name>

Modified: jcr/branches/1.12.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/util/TesterConfigurationHelper.java
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/util/TesterConfigurationHelper.java	2011-05-31 09:36:56 UTC (rev 4460)
+++ jcr/branches/1.12.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/util/TesterConfigurationHelper.java	2011-05-31 09:54:35 UTC (rev 4461)
@@ -187,7 +187,7 @@
 
       // Indexer
       ArrayList qParams = new ArrayList();
-      qParams.add(new SimpleParameterEntry("indexDir", "../temp/index/" + IdGenerator.generate()));
+      qParams.add(new SimpleParameterEntry("indexDir", "target/temp/index/" + IdGenerator.generate()));
       QueryHandlerEntry qEntry =
          new QueryHandlerEntry("org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex", qParams);
 
@@ -211,7 +211,7 @@
       LockPersisterEntry persisterEntry = new LockPersisterEntry();
       persisterEntry.setType("org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister");
       ArrayList lpParams = new ArrayList();
-      lpParams.add(new SimpleParameterEntry("path", "../temp/lock"));
+      lpParams.add(new SimpleParameterEntry("path", "target/temp/lock"));
       persisterEntry.setParameters(lpParams);
       lockManagerEntry.setPersister(persisterEntry);
       workspaceEntry.setLockManager(lockManagerEntry);

Modified: jcr/branches/1.12.x/exo.jcr.component.core/src/test/resources/log4j.properties
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.core/src/test/resources/log4j.properties	2011-05-31 09:36:56 UTC (rev 4460)
+++ jcr/branches/1.12.x/exo.jcr.component.core/src/test/resources/log4j.properties	2011-05-31 09:54:35 UTC (rev 4461)
@@ -17,8 +17,7 @@
 
 # 'file' is set to be a FileAppender.
 log4j.appender.file=org.apache.log4j.FileAppender
-#log4j.appender.file.File=jcr.log
-log4j.appender.file.File=nul
+log4j.appender.file.File=target/jcr.log
 
 # 'file' uses PatternLayout.
 log4j.appender.file.layout=org.apache.log4j.PatternLayout

Modified: jcr/branches/1.12.x/exo.jcr.component.webdav/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.webdav/pom.xml	2011-05-31 09:36:56 UTC (rev 4460)
+++ jcr/branches/1.12.x/exo.jcr.component.webdav/pom.xml	2011-05-31 09:54:35 UTC (rev 4461)
@@ -107,6 +107,7 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
           <configuration>
+            <argLine>${env.MAVEN_OPTS} -Dcom.arjuna.ats.arjuna.objectstore.objectStoreDir=${project.build.directory}</argLine>
             <excludes>
               <exclude>**/TestUtils.java</exclude>
               <exclude>**/OrderPatchTest.java</exclude>