Author: tolusha Date: 2011-05-20 07:07:34 -0400 (Fri, 20 May 2011) New Revision: 4399 Modified: jcr/trunk/exo.jcr.component.core/pom.xml jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/util/TesterConfigurationHelper.java jcr/trunk/exo.jcr.component.core/src/test/resources/log4j.properties Log: EXOJCR-945: Cleanup build Modified: jcr/trunk/exo.jcr.component.core/pom.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/pom.xml 2011-05-19 17:04:04 UTC (rev 4398) +++ jcr/trunk/exo.jcr.component.core/pom.xml 2011-05-20 11:07:34 UTC (rev 4399) @@ -355,34 +355,9 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack</id> - <phase>generate-test-sources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-jcr-tests</artifactId> - <classifier>sources</classifier> - <type>jar</type> - <overWrite>false</overWrite> - </artifactItem> - </artifactItems> - <outputDirectory>${project.build.testSourceDirectory}</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine> + <argLine>${env.MAVEN_OPTS} -Dcom.arjuna.ats.arjuna.objectstore.objectStoreDir=${project.build.directory} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine> <systemProperties> <property> <name>jcr.test.configuration.file</name> @@ -584,7 +559,7 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <!-- TAKE CARE TO UPDATE ALSO run-all PROFILE --> - <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine> + <argLine>${env.MAVEN_OPTS} -Dcom.arjuna.ats.arjuna.objectstore.objectStoreDir=${project.build.directory} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine> <systemProperties> <property> <name>jcr.test.configuration.file</name> @@ -676,7 +651,7 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <!-- TAKE CARE TO UPDATE ALSO run-tck PROFILE --> - <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine> + <argLine>${env.MAVEN_OPTS} -Dcom.arjuna.ats.arjuna.objectstore.objectStoreDir=${project.build.directory} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine> <systemProperties> <property> <name>jcr.test.configuration.file</name> Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/util/TesterConfigurationHelper.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/util/TesterConfigurationHelper.java 2011-05-19 17:04:04 UTC (rev 4398) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/util/TesterConfigurationHelper.java 2011-05-20 11:07:34 UTC (rev 4399) @@ -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/trunk/exo.jcr.component.core/src/test/resources/log4j.properties =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/log4j.properties 2011-05-19 17:04:04 UTC (rev 4398) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/log4j.properties 2011-05-20 11:07:34 UTC (rev 4399) @@ -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