continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r672932 - in /continuum/trunk: ./ continuum-api/src/main/java/org/apache/maven/continuum/configuration/ continuum-base/ continuum-base/continuum-configuration/ continuum-base/continuum-configuration/src/ continuum-base/continuum-configurati...
Date Mon, 30 Jun 2008 21:26:07 GMT
Author: olamy
Date: Mon Jun 30 14:26:07 2008
New Revision: 672932

URL: http://svn.apache.org/viewvc?rev=672932&view=rev
Log:
[CONTINUUM-1252] move the continuum-configuration module to continuum-base


Added:
    continuum/trunk/continuum-base/continuum-configuration/
      - copied from r672022, continuum/trunk/continuum-configuration/
    continuum/trunk/continuum-base/continuum-configuration/pom.xml
      - copied, changed from r672928, continuum/trunk/continuum-configuration/pom.xml
    continuum/trunk/continuum-base/continuum-configuration/src/
      - copied from r672928, continuum/trunk/continuum-configuration/src/
    continuum/trunk/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/ContinuumConfiguration.java
      - copied, changed from r672050, continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ContinuumConfiguration.java
    continuum/trunk/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/ContinuumConfigurationException.java
      - copied, changed from r672022, continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationException.java
    continuum/trunk/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/GeneralConfiguration.java
      - copied, changed from r672050, continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/GeneralConfiguration.java
    continuum/trunk/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/ProxyConfiguration.java
      - copied, changed from r672050, continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ProxyConfiguration.java
Removed:
    continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ContinuumConfiguration.java
    continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/GeneralConfiguration.java
    continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ProxyConfiguration.java
    continuum/trunk/continuum-configuration/
Modified:
    continuum/trunk/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/DefaultContinuumConfiguration.java
    continuum/trunk/continuum-base/continuum-configuration/src/test/java/org/apache/continuum/configuration/TestDefaultContinuumConfiguration.java
    continuum/trunk/continuum-base/pom.xml
    continuum/trunk/pom.xml

Copied: continuum/trunk/continuum-base/continuum-configuration/pom.xml (from r672928, continuum/trunk/continuum-configuration/pom.xml)
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-base/continuum-configuration/pom.xml?p2=continuum/trunk/continuum-base/continuum-configuration/pom.xml&p1=continuum/trunk/continuum-configuration/pom.xml&r1=672928&r2=672932&rev=672932&view=diff
==============================================================================
--- continuum/trunk/continuum-configuration/pom.xml (original)
+++ continuum/trunk/continuum-base/continuum-configuration/pom.xml Mon Jun 30 14:26:07 2008
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>continuum</artifactId>
+    <artifactId>continuum-base</artifactId>
     <groupId>org.apache.continuum</groupId>
     <version>1.2-SNAPSHOT</version>
   </parent>
@@ -29,23 +29,6 @@
   <name>Continuum Configuration</name>
   <build>
     <plugins>
-      <!--plugin>
-        <groupId>org.codehaus.modello</groupId>
-        <artifactId>modello-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>xpp3-writer</goal>
-              <goal>java</goal>
-              <goal>xpp3-reader</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <version>1.2.0</version>
-          <model>src/main/mdo/configuration.mdo</model>
-        </configuration>
-      </plugin-->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -62,10 +45,6 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>org.apache.continuum</groupId>
-      <artifactId>continuum-api</artifactId>
-    </dependency>
-    <dependency>
       <groupId>commons-configuration</groupId>
       <artifactId>commons-configuration</artifactId>
     </dependency>

Copied: continuum/trunk/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/ContinuumConfiguration.java
(from r672050, continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ContinuumConfiguration.java)
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/ContinuumConfiguration.java?p2=continuum/trunk/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/ContinuumConfiguration.java&p1=continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ContinuumConfiguration.java&r1=672050&r2=672932&rev=672932&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ContinuumConfiguration.java
(original)
+++ continuum/trunk/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/ContinuumConfiguration.java
Mon Jun 30 14:26:07 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.continuum.configuration;
+package org.apache.continuum.configuration;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -27,14 +27,14 @@
 public interface ContinuumConfiguration
 {
     GeneralConfiguration getGeneralConfiguration()
-        throws ConfigurationException;
+        throws ContinuumConfigurationException;
 
      void setGeneralConfiguration( GeneralConfiguration generalConfiguration )
-        throws ConfigurationException;
+        throws ContinuumConfigurationException;
     
     void save()
-        throws ConfigurationException;
+        throws ContinuumConfigurationException;
 
     void reload()
-        throws ConfigurationException;
+        throws ContinuumConfigurationException;
 }

Copied: continuum/trunk/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/ContinuumConfigurationException.java
(from r672022, continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationException.java)
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/ContinuumConfigurationException.java?p2=continuum/trunk/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/ContinuumConfigurationException.java&p1=continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationException.java&r1=672022&r2=672932&rev=672932&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationException.java
(original)
+++ continuum/trunk/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/ContinuumConfigurationException.java
Mon Jun 30 14:26:07 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.continuum.configuration;
+package org.apache.continuum.configuration;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,25 +20,25 @@
  */
 
 /**
- * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
+ * @author <a href="mailto:olamy@apache.org">olamy</a>
+ * @since 30 Jun 08
  * @version $Id$
  */
-public class ConfigurationException
+public class ContinuumConfigurationException
     extends Exception
 {
-	private static final long serialVersionUID = 5598659641431851660L;
 
-	public ConfigurationException( String message )
+    public ContinuumConfigurationException( String message )
     {
         super( message );
     }
 
-    public ConfigurationException( Throwable cause )
+    public ContinuumConfigurationException( Throwable cause )
     {
         super( cause );
     }
 
-    public ConfigurationException( String message, Throwable cause )
+    public ContinuumConfigurationException( String message, Throwable cause )
     {
         super( message, cause );
     }

Modified: continuum/trunk/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/DefaultContinuumConfiguration.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/DefaultContinuumConfiguration.java?rev=672932&r1=672928&r2=672932&view=diff
==============================================================================
--- continuum/trunk/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/DefaultContinuumConfiguration.java
(original)
+++ continuum/trunk/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/DefaultContinuumConfiguration.java
Mon Jun 30 14:26:07 2008
@@ -26,10 +26,6 @@
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.DefaultConfigurationBuilder;
 import org.apache.commons.configuration.FileConfiguration;
-import org.apache.maven.continuum.configuration.ConfigurationException;
-import org.apache.maven.continuum.configuration.ContinuumConfiguration;
-import org.apache.maven.continuum.configuration.GeneralConfiguration;
-import org.apache.maven.continuum.configuration.ProxyConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.io.ClassPathResource;
@@ -129,13 +125,13 @@
 
 
     public void reload()
-        throws ConfigurationException
+        throws ContinuumConfigurationException
     {
         this.initialize();
     }
 
     public void save()
-        throws ConfigurationException
+        throws ContinuumConfigurationException
     {
         FileConfiguration fileConfiguration = (FileConfiguration) configuration;
         try
@@ -144,7 +140,7 @@
         }
         catch ( org.apache.commons.configuration.ConfigurationException e )
         {
-            throw new ConfigurationException( e.getMessage(), e );
+            throw new ContinuumConfigurationException( e.getMessage(), e );
         }
     }
 
@@ -155,13 +151,13 @@
      * @see org.apache.maven.continuum.configuration.ContinuumConfiguration#getGeneralConfiguration()
      */
     public GeneralConfiguration getGeneralConfiguration()
-        throws ConfigurationException
+        throws ContinuumConfigurationException
     {
         return this.generalConfiguration;
     }
     
     public void setGeneralConfiguration( GeneralConfiguration generalConfiguration )
-        throws ConfigurationException
+        throws ContinuumConfigurationException
     {
         this.generalConfiguration = generalConfiguration;
         this.configuration.setProperty( BASE_URL_KEY, generalConfiguration.getBaseUrl() );

Copied: continuum/trunk/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/GeneralConfiguration.java
(from r672050, continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/GeneralConfiguration.java)
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/GeneralConfiguration.java?p2=continuum/trunk/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/GeneralConfiguration.java&p1=continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/GeneralConfiguration.java&r1=672050&r2=672932&rev=672932&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/GeneralConfiguration.java
(original)
+++ continuum/trunk/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/GeneralConfiguration.java
Mon Jun 30 14:26:07 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.continuum.configuration;
+package org.apache.continuum.configuration;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: continuum/trunk/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/ProxyConfiguration.java
(from r672050, continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ProxyConfiguration.java)
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/ProxyConfiguration.java?p2=continuum/trunk/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/ProxyConfiguration.java&p1=continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ProxyConfiguration.java&r1=672050&r2=672932&rev=672932&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ProxyConfiguration.java
(original)
+++ continuum/trunk/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/ProxyConfiguration.java
Mon Jun 30 14:26:07 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.continuum.configuration;
+package org.apache.continuum.configuration;
 
 import org.apache.commons.lang.builder.ReflectionToStringBuilder;
 

Modified: continuum/trunk/continuum-base/continuum-configuration/src/test/java/org/apache/continuum/configuration/TestDefaultContinuumConfiguration.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-base/continuum-configuration/src/test/java/org/apache/continuum/configuration/TestDefaultContinuumConfiguration.java?rev=672932&r1=672928&r2=672932&view=diff
==============================================================================
--- continuum/trunk/continuum-base/continuum-configuration/src/test/java/org/apache/continuum/configuration/TestDefaultContinuumConfiguration.java
(original)
+++ continuum/trunk/continuum-base/continuum-configuration/src/test/java/org/apache/continuum/configuration/TestDefaultContinuumConfiguration.java
Mon Jun 30 14:26:07 2008
@@ -21,9 +21,9 @@
 
 import java.io.File;
 
-import org.apache.maven.continuum.configuration.ContinuumConfiguration;
-import org.apache.maven.continuum.configuration.GeneralConfiguration;
-import org.apache.maven.continuum.configuration.ProxyConfiguration;
+import org.apache.continuum.configuration.ContinuumConfiguration;
+import org.apache.continuum.configuration.GeneralConfiguration;
+import org.apache.continuum.configuration.ProxyConfiguration;
 import org.codehaus.plexus.spring.PlexusInSpringTestCase;
 import org.codehaus.plexus.util.FileUtils;
 import org.slf4j.Logger;
@@ -58,10 +58,6 @@
     public void testLoad()
         throws Exception
     {
-
-        
-        
-        
         ContinuumConfiguration configuration = (ContinuumConfiguration) lookup( ContinuumConfiguration.class,
"default" );
         assertNotNull( configuration );
         GeneralConfiguration generalConfiguration = configuration.getGeneralConfiguration();

Modified: continuum/trunk/continuum-base/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-base/pom.xml?rev=672932&r1=672931&r2=672932&view=diff
==============================================================================
--- continuum/trunk/continuum-base/pom.xml (original)
+++ continuum/trunk/continuum-base/pom.xml Mon Jun 30 14:26:07 2008
@@ -11,5 +11,6 @@
   <packaging>pom</packaging>
   <modules>
     <module>continuum-scm</module>
+    <module>continuum-configuration</module>
   </modules>
 </project>

Modified: continuum/trunk/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/pom.xml?rev=672932&r1=672931&r2=672932&view=diff
==============================================================================
--- continuum/trunk/pom.xml (original)
+++ continuum/trunk/pom.xml Mon Jun 30 14:26:07 2008
@@ -153,6 +153,7 @@
   </build>
   <modules>
     <module>continuum-api</module>
+    <module>continuum-base</module>    
     <module>continuum-commons</module>
     <module>continuum-security</module>
     <!-- module>continuum-core-it</module -->    <!-- TODO RE-ADD it when
continuum-plexus-application will be back -->
@@ -166,11 +167,9 @@
     <module>continuum-xmlrpc</module>
     <module>continuum-release</module>
     <module>continuum-data-management</module>
-    <module>continuum-configuration</module>
     <module>maven-continuum-plugin</module>
     <module>continuum-docs</module>
     <module>continuum-jetty</module>
-    <module>continuum-base</module>
   </modules>
   <repositories>
     <repository>



Mime
View raw message