move common surefire configuration in the parent pom
fix units in the purge module
git-svn-id: https://svn.apache.org/repos/asf/continuum/branches/continuum-refactoring-evenisse@683767 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/continuum-base/continuum-configuration/pom.xml b/continuum-base/continuum-configuration/pom.xml
index 221ff62..04f4798 100644
--- a/continuum-base/continuum-configuration/pom.xml
+++ b/continuum-base/continuum-configuration/pom.xml
@@ -26,31 +26,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>continuum-configuration</artifactId>
<name>Continuum Configuration</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>appserver.base</name>
- <value>${basedir}/target/test-classes/</value>
- </property>
- <property>
- <name>user.home</name>
- <value>${basedir}/target/test-classes/</value>
- </property>
- <property>
- <!-- java.io.tmpdir is a shared directory on solaris and cause permission issues -->
- <name>java.io.tmpdir</name>
- <value>./target</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
<dependencies>
<dependency>
<groupId>org.apache.continuum</groupId>
diff --git a/continuum-commons/pom.xml b/continuum-commons/pom.xml
index c308fa4..3a3b4d7 100644
--- a/continuum-commons/pom.xml
+++ b/continuum-commons/pom.xml
@@ -64,27 +64,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>appserver.base</name>
- <value>${basedir}/target/test-classes/</value>
- </property>
- <property>
- <name>user.home</name>
- <value>${basedir}/target/test-classes/</value>
- </property>
- <property>
- <!-- java.io.tmpdir is a shared directory on solaris and cause permission issues -->
- <name>java.io.tmpdir</name>
- <value>./target</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-maven-plugin</artifactId>
<executions>
diff --git a/continuum-core/pom.xml b/continuum-core/pom.xml
index 77bfd9a..8ce1787 100644
--- a/continuum-core/pom.xml
+++ b/continuum-core/pom.xml
@@ -296,48 +296,6 @@
</build>
<profiles>
<profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>-Xmx512m</argLine>
- <childDelegation>true</childDelegation>
- <excludes>
- <exclude>**/BuildProjectTaskExecutorTest.java</exclude>
- </excludes>
- <systemProperties>
- <property>
- <name>JAVA_HOME</name>
- <value>${java.home}</value>
- </property>
- <property>
- <name>M2_HOME</name>
- <value>${maven.home}</value>
- </property>
- <property>
- <name>plexus.home</name>
- <!-- ${project.build.directory} is not evaluated see surefire documentation -->
- <!--value>${project.build.directory}</value-->
- <value>./target</value>
- </property>
- <property>
- <!-- java.io.tmpdir is a shared directory on solaris and cause permission issues -->
- <name>java.io.tmpdir</name>
- <value>./target</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>it</id>
<build>
<plugins>
diff --git a/continuum-purge/src/test/java/org/apache/continuum/purge/AbstractPurgeTest.java b/continuum-purge/src/test/java/org/apache/continuum/purge/AbstractPurgeTest.java
index 01b316d..036709c 100644
--- a/continuum-purge/src/test/java/org/apache/continuum/purge/AbstractPurgeTest.java
+++ b/continuum-purge/src/test/java/org/apache/continuum/purge/AbstractPurgeTest.java
@@ -83,6 +83,10 @@
localRepositoryDao = (LocalRepositoryDao) lookup( LocalRepositoryDao.class.getName() );
+ repositoryPurgeConfigurationDao = (RepositoryPurgeConfigurationDao) lookup( RepositoryPurgeConfigurationDao.class );
+
+ directoryPurgeConfigurationDao = (DirectoryPurgeConfigurationDao) lookup( DirectoryPurgeConfigurationDao.class );
+
if ( localRepositoryDao.getAllLocalRepositories().size() == 0 )
{
createDefaultRepository();
diff --git a/pom.xml b/pom.xml
index f812618..ddb6de3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -186,6 +186,20 @@
<configuration>
<systemProperties>
<property>
+ <name>JAVA_HOME</name>
+ <value>${java.home}</value>
+ </property>
+ <property>
+ <name>M2_HOME</name>
+ <value>${maven.home}</value>
+ </property>
+ <property>
+ <name>plexus.home</name>
+ <!-- ${project.build.directory} is not evaluated see surefire documentation -->
+ <!--value>${project.build.directory}</value-->
+ <value>./target</value>
+ </property>
+ <property>
<name>appserver.base</name>
<value>${basedir}/target/test-classes/</value>
</property>
