svn commit: r1325219 - in /archiva/redback/redback-components/trunk/spring-registry: spring-registry-api/src/main/java/org/apache/ spring-registry-api/src/main/java/org/apache/archiva/ spring-registry-api/src/main/java/org/apache/archiva/redback/ sprin...

[ol...@apache.org]

Author: olamy
Date: Thu Apr 12 12:27:06 2012
New Revision: 1325219

URL: http://svn.apache.org/viewvc?rev=1325219&view=rev
Log:
use o.a.a package namespace for spring-registry-api component

Added:
    archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/apache/
    archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/apache/archiva/
    archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/apache/archiva/redback/
    archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/apache/archiva/redback/components/
    archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/apache/archiva/redback/components/registry/
    archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/apache/archiva/redback/components/registry/Registry.java
      - copied, changed from r1325044, archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/codehaus/plexus/registry/Registry.java
    archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/apache/archiva/redback/components/registry/RegistryException.java
      - copied, changed from r1325044, archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/codehaus/plexus/registry/RegistryException.java
    archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/apache/archiva/redback/components/registry/RegistryListener.java
      - copied, changed from r1325044, archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/codehaus/plexus/registry/RegistryListener.java
Removed:
    archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/codehaus/plexus/registry/Registry.java
    archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/codehaus/plexus/registry/RegistryException.java
    archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/codehaus/plexus/registry/RegistryListener.java
Modified:
    archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/java/org/codehaus/redback/components/registry/commons/CommonsConfigurationRegistry.java
    archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/java/org/codehaus/redback/components/registry/commons/ConfigurationListenerDelegate.java
    archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/codehaus/redback/components/registry/AbstractRegistryTest.java
    archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/codehaus/redback/components/registry/CommonsConfigurationRegistryTest.java

Copied: archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/apache/archiva/redback/components/registry/Registry.java (from r1325044, archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/codehaus/plexus/registry/Registry.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/apache/archiva/redback/components/registry/Registry.java?p2=archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/apache/archiva/redback/components/registry/Registry.java&p1=archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/codehaus/plexus/registry/Registry.java&r1=1325044&r2=1325219&rev=1325219&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/codehaus/plexus/registry/Registry.java (original)
+++ archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/apache/archiva/redback/components/registry/Registry.java Thu Apr 12 12:27:06 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.registry;
+package org.apache.archiva.redback.components.registry;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/apache/archiva/redback/components/registry/RegistryException.java (from r1325044, archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/codehaus/plexus/registry/RegistryException.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/apache/archiva/redback/components/registry/RegistryException.java?p2=archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/apache/archiva/redback/components/registry/RegistryException.java&p1=archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/codehaus/plexus/registry/RegistryException.java&r1=1325044&r2=1325219&rev=1325219&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/codehaus/plexus/registry/RegistryException.java (original)
+++ archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/apache/archiva/redback/components/registry/RegistryException.java Thu Apr 12 12:27:06 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.registry;
+package org.apache.archiva.redback.components.registry;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/apache/archiva/redback/components/registry/RegistryListener.java (from r1325044, archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/codehaus/plexus/registry/RegistryListener.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/apache/archiva/redback/components/registry/RegistryListener.java?p2=archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/apache/archiva/redback/components/registry/RegistryListener.java&p1=archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/codehaus/plexus/registry/RegistryListener.java&r1=1325044&r2=1325219&rev=1325219&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/codehaus/plexus/registry/RegistryListener.java (original)
+++ archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/src/main/java/org/apache/archiva/redback/components/registry/RegistryListener.java Thu Apr 12 12:27:06 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.registry;
+package org.apache.archiva.redback.components.registry;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Modified: archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/java/org/codehaus/redback/components/registry/commons/CommonsConfigurationRegistry.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/java/org/codehaus/redback/components/registry/commons/CommonsConfigurationRegistry.java?rev=1325219&r1=1325218&r2=1325219&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/java/org/codehaus/redback/components/registry/commons/CommonsConfigurationRegistry.java (original)
+++ archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/java/org/codehaus/redback/components/registry/commons/CommonsConfigurationRegistry.java Thu Apr 12 12:27:06 2012
@@ -19,6 +19,9 @@ package org.codehaus.redback.components.
  * under the License.
  */
 
+import org.apache.archiva.redback.components.registry.Registry;
+import org.apache.archiva.redback.components.registry.RegistryException;
+import org.apache.archiva.redback.components.registry.RegistryListener;
 import org.apache.commons.configuration.CombinedConfiguration;
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.ConfigurationException;
@@ -32,9 +35,6 @@ import org.apache.commons.lang.StringUti
 import org.codehaus.plexus.interpolation.InterpolationException;
 import org.codehaus.plexus.interpolation.PropertiesBasedValueSource;
 import org.codehaus.plexus.interpolation.StringSearchInterpolator;
-import org.codehaus.plexus.registry.Registry;
-import org.codehaus.plexus.registry.RegistryException;
-import org.codehaus.plexus.registry.RegistryListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

Modified: archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/java/org/codehaus/redback/components/registry/commons/ConfigurationListenerDelegate.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/java/org/codehaus/redback/components/registry/commons/ConfigurationListenerDelegate.java?rev=1325219&r1=1325218&r2=1325219&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/java/org/codehaus/redback/components/registry/commons/ConfigurationListenerDelegate.java (original)
+++ archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/java/org/codehaus/redback/components/registry/commons/ConfigurationListenerDelegate.java Thu Apr 12 12:27:06 2012
@@ -19,10 +19,10 @@ package org.codehaus.redback.components.
  * under the License.
  */
 
+import org.apache.archiva.redback.components.registry.Registry;
+import org.apache.archiva.redback.components.registry.RegistryListener;
 import org.apache.commons.configuration.event.ConfigurationEvent;
 import org.apache.commons.configuration.event.ConfigurationListener;
-import org.codehaus.plexus.registry.Registry;
-import org.codehaus.plexus.registry.RegistryListener;
 
 /**
  * Commons configuration listener that delegates to the given registry listener.

Modified: archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/codehaus/redback/components/registry/AbstractRegistryTest.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/codehaus/redback/components/registry/AbstractRegistryTest.java?rev=1325219&r1=1325218&r2=1325219&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/codehaus/redback/components/registry/AbstractRegistryTest.java (original)
+++ archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/codehaus/redback/components/registry/AbstractRegistryTest.java Thu Apr 12 12:27:06 2012
@@ -20,7 +20,7 @@ package org.codehaus.redback.components.
  */
 
 import junit.framework.TestCase;
-import org.codehaus.plexus.registry.Registry;
+import org.apache.archiva.redback.components.registry.Registry;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.context.ApplicationContext;

Modified: archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/codehaus/redback/components/registry/CommonsConfigurationRegistryTest.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/codehaus/redback/components/registry/CommonsConfigurationRegistryTest.java?rev=1325219&r1=1325218&r2=1325219&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/codehaus/redback/components/registry/CommonsConfigurationRegistryTest.java (original)
+++ archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/codehaus/redback/components/registry/CommonsConfigurationRegistryTest.java Thu Apr 12 12:27:06 2012
@@ -19,9 +19,9 @@ package org.codehaus.redback.components.
  * under the License.
  */
 
+import org.apache.archiva.redback.components.registry.Registry;
 import org.apache.commons.configuration.XMLConfiguration;
-import org.codehaus.plexus.registry.Registry;
-import org.codehaus.plexus.registry.RegistryException;
+import org.apache.archiva.redback.components.registry.RegistryException;
 import org.codehaus.plexus.util.FileUtils;
 import org.junit.Test;