continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r683767 - in /continuum/branches/continuum-refactoring-evenisse: ./ continuum-base/continuum-configuration/ continuum-commons/ continuum-core/ continuum-purge/src/test/java/org/apache/continuum/purge/
Date Fri, 08 Aug 2008 00:04:05 GMT
Author: olamy
Date: Thu Aug  7 17:04:05 2008
New Revision: 683767

URL: http://svn.apache.org/viewvc?rev=683767&view=rev
Log:
move common surefire configuration in the parent pom
fix units in the purge module


Modified:
    continuum/branches/continuum-refactoring-evenisse/continuum-base/continuum-configuration/pom.xml
    continuum/branches/continuum-refactoring-evenisse/continuum-commons/pom.xml
    continuum/branches/continuum-refactoring-evenisse/continuum-core/pom.xml
    continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/test/java/org/apache/continuum/purge/AbstractPurgeTest.java
    continuum/branches/continuum-refactoring-evenisse/pom.xml

Modified: continuum/branches/continuum-refactoring-evenisse/continuum-base/continuum-configuration/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-base/continuum-configuration/pom.xml?rev=683767&r1=683766&r2=683767&view=diff
==============================================================================
--- continuum/branches/continuum-refactoring-evenisse/continuum-base/continuum-configuration/pom.xml
(original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-base/continuum-configuration/pom.xml
Thu Aug  7 17:04:05 2008
@@ -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>

Modified: continuum/branches/continuum-refactoring-evenisse/continuum-commons/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-commons/pom.xml?rev=683767&r1=683766&r2=683767&view=diff
==============================================================================
--- continuum/branches/continuum-refactoring-evenisse/continuum-commons/pom.xml (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-commons/pom.xml Thu Aug  7
17:04:05 2008
@@ -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>

Modified: continuum/branches/continuum-refactoring-evenisse/continuum-core/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-core/pom.xml?rev=683767&r1=683766&r2=683767&view=diff
==============================================================================
--- continuum/branches/continuum-refactoring-evenisse/continuum-core/pom.xml (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-core/pom.xml Thu Aug  7 17:04:05
2008
@@ -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>

Modified: continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/test/java/org/apache/continuum/purge/AbstractPurgeTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/test/java/org/apache/continuum/purge/AbstractPurgeTest.java?rev=683767&r1=683766&r2=683767&view=diff
==============================================================================
--- continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/test/java/org/apache/continuum/purge/AbstractPurgeTest.java
(original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/test/java/org/apache/continuum/purge/AbstractPurgeTest.java
Thu Aug  7 17:04:05 2008
@@ -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();

Modified: continuum/branches/continuum-refactoring-evenisse/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/pom.xml?rev=683767&r1=683766&r2=683767&view=diff
==============================================================================
--- continuum/branches/continuum-refactoring-evenisse/pom.xml (original)
+++ continuum/branches/continuum-refactoring-evenisse/pom.xml Thu Aug  7 17:04:05 2008
@@ -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>



Mime
View raw message