Author: olamy
Date: Thu Apr 12 15:24:03 2012
New Revision: 1325317
URL: http://svn.apache.org/viewvc?rev=1325317&view=rev
Log:
repackage spring-registry-commons to o.a.a namespace
Added:
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/java/org/apache/
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/java/org/apache/archiva/
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/java/org/apache/archiva/redback/
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/java/org/apache/archiva/redback/components/
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/java/org/apache/archiva/redback/components/registry/
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/java/org/apache/archiva/redback/components/registry/commons/
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/java/org/apache/archiva/redback/components/registry/commons/CommonsConfigurationRegistry.java
- copied, changed from r1325279,
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/apache/archiva/redback/components/registry/commons/ConfigurationListenerDelegate.java
- copied, changed from r1325279,
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/apache/
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/apache/archiva/
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/apache/archiva/redback/
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/apache/archiva/redback/components/
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/apache/archiva/redback/components/registry/
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/apache/archiva/redback/components/registry/AbstractRegistryTest.java
- copied, changed from r1325279,
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/apache/archiva/redback/components/registry/CommonsConfigurationRegistryTest.java
- copied, changed from r1325279,
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/codehaus/redback/components/registry/CommonsConfigurationRegistryTest.java
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/apache/archiva/redback/components/registry/Component.java
- copied, changed from r1325279,
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/codehaus/redback/components/registry/Component.java
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/apache/archiva/redback/components/registry/DefaultComponent.java
- copied, changed from r1325279,
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/codehaus/redback/components/registry/DefaultComponent.java
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/apache/archiva/redback/components/registry/Nested.java
- copied, changed from r1325279,
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/codehaus/redback/components/registry/Nested.java
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/apache/archiva/redback/components/registry/commons/
Removed:
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
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/codehaus/redback/components/registry/Component.java
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/codehaus/redback/components/registry/DefaultComponent.java
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/codehaus/redback/components/registry/Nested.java
Modified:
archiva/redback/redback-components/trunk/plexus-spring/src/test/resources/META-INF/plexus/components.xml
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/verifiers/registry-reader/RegistryReaderVerifier.java
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/verifiers/registry-writer/RegistryWriterVerifier.java
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/resources/META-INF/spring-context.xml
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/resources/spring-context.xml
Modified:
archiva/redback/redback-components/trunk/plexus-spring/src/test/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/plexus-spring/src/test/resources/META-INF/plexus/components.xml?rev=1325317&r1=1325316&r2=1325317&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/plexus-spring/src/test/resources/META-INF/plexus/components.xml
(original)
+++
archiva/redback/redback-components/trunk/plexus-spring/src/test/resources/META-INF/plexus/components.xml
Thu Apr 12 15:24:03 2012
@@ -41,7 +41,7 @@
<component>
<role>org.codehaus.plexus.registry.Registry</role>
-
<implementation>org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry</implementation>
+
<implementation>org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry</implementation>
<role-hint>commons-configuration-exists</role-hint>
<configuration>
<properties>
Modified:
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/verifiers/registry-reader/RegistryReaderVerifier.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/verifiers/registry-reader/RegistryReaderVerifier.java?rev=1325317&r1=1325316&r2=1325317&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/verifiers/registry-reader/RegistryReaderVerifier.java
(original)
+++
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/verifiers/registry-reader/RegistryReaderVerifier.java
Thu Apr 12 15:24:03 2012
@@ -19,14 +19,11 @@ package org.codehaus.modello.plugin.regi
* under the License.
*/
+import
org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry;
import org.codehaus.modello.test.model.Model;
import org.codehaus.modello.test.model.Reference;
import org.codehaus.modello.test.model.io.registry.ModelRegistryReader;
import org.codehaus.modello.verifier.Verifier;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
-import
org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry;
import org.apache.archiva.redback.components.registry.Registry;
import junit.framework.Assert;
@@ -34,6 +31,7 @@ import junit.framework.Assert;
import java.io.File;
import java.util.*;
+
/**
* @author <a href="mailto:[email protected]";>Brett Porter</a>
* @version $Id$
Modified:
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/verifiers/registry-writer/RegistryWriterVerifier.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/verifiers/registry-writer/RegistryWriterVerifier.java?rev=1325317&r1=1325316&r2=1325317&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/verifiers/registry-writer/RegistryWriterVerifier.java
(original)
+++
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/verifiers/registry-writer/RegistryWriterVerifier.java
Thu Apr 12 15:24:03 2012
@@ -19,20 +19,16 @@ package org.codehaus.modello.plugin.regi
* under the License.
*/
+import
org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry;
import org.codehaus.modello.test.model.Model;
import org.codehaus.modello.test.model.Reference;
import org.codehaus.modello.test.model.EmptyReference;
import org.codehaus.modello.test.model.io.registry.ModelRegistryWriter;
import org.codehaus.modello.verifier.Verifier;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
-import
org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry;
import org.apache.archiva.redback.components.registry.Registry;
import junit.framework.Assert;
-import java.io.File;
import java.util.*;
/**
Copied:
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/java/org/apache/archiva/redback/components/registry/commons/CommonsConfigurationRegistry.java
(from r1325279,
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/apache/archiva/redback/components/registry/commons/CommonsConfigurationRegistry.java?p2=archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/java/org/apache/archiva/redback/components/registry/commons/CommonsConfigurationRegistry.java&p1=archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/java/org/codehaus/redback/components/registry/commons/CommonsConfigurationRegistry.java&r1=1325279&r2=1325317&rev=1325317&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/apache/archiva/redback/components/registry/commons/CommonsConfigurationRegistry.java
Thu Apr 12 15:24:03 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.components.registry.commons;
+package org.apache.archiva.redback.components.registry.commons;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied:
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/java/org/apache/archiva/redback/components/registry/commons/ConfigurationListenerDelegate.java
(from r1325279,
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/apache/archiva/redback/components/registry/commons/ConfigurationListenerDelegate.java?p2=archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/java/org/apache/archiva/redback/components/registry/commons/ConfigurationListenerDelegate.java&p1=archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/java/org/codehaus/redback/components/registry/commons/ConfigurationListenerDelegate.java&r1=1325279&r2=1325317&rev=1325317&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/apache/archiva/redback/components/registry/commons/ConfigurationListenerDelegate.java
Thu Apr 12 15:24:03 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.components.registry.commons;
+package org.apache.archiva.redback.components.registry.commons;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified:
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/resources/META-INF/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/resources/META-INF/spring-context.xml?rev=1325317&r1=1325316&r2=1325317&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/resources/META-INF/spring-context.xml
(original)
+++
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/resources/META-INF/spring-context.xml
Thu Apr 12 15:24:03 2012
@@ -29,7 +29,7 @@
<context:annotation-config />
<context:component-scan
- base-package="org.codehaus.redback.components.registry.commons"/>
+ base-package="org.apache.archiva.redback.components.registry.commons"/>
</beans>
\ No newline at end of file
Copied:
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/apache/archiva/redback/components/registry/AbstractRegistryTest.java
(from r1325279,
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/apache/archiva/redback/components/registry/AbstractRegistryTest.java?p2=archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/apache/archiva/redback/components/registry/AbstractRegistryTest.java&p1=archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/codehaus/redback/components/registry/AbstractRegistryTest.java&r1=1325279&r2=1325317&rev=1325317&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/apache/archiva/redback/components/registry/AbstractRegistryTest.java
Thu Apr 12 15:24:03 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.components.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-commons/src/test/java/org/apache/archiva/redback/components/registry/CommonsConfigurationRegistryTest.java
(from r1325279,
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/apache/archiva/redback/components/registry/CommonsConfigurationRegistryTest.java?p2=archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/apache/archiva/redback/components/registry/CommonsConfigurationRegistryTest.java&p1=archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/codehaus/redback/components/registry/CommonsConfigurationRegistryTest.java&r1=1325279&r2=1325317&rev=1325317&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/apache/archiva/redback/components/registry/CommonsConfigurationRegistryTest.java
Thu Apr 12 15:24:03 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.components.registry;
+package org.apache.archiva.redback.components.registry;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,9 +19,7 @@ package org.codehaus.redback.components.
* under the License.
*/
-import org.apache.archiva.redback.components.registry.Registry;
import org.apache.commons.configuration.XMLConfiguration;
-import org.apache.archiva.redback.components.registry.RegistryException;
import org.codehaus.plexus.util.FileUtils;
import org.junit.Test;
Copied:
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/apache/archiva/redback/components/registry/Component.java
(from r1325279,
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/codehaus/redback/components/registry/Component.java)
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/apache/archiva/redback/components/registry/Component.java?p2=archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/apache/archiva/redback/components/registry/Component.java&p1=archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/codehaus/redback/components/registry/Component.java&r1=1325279&r2=1325317&rev=1325317&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/codehaus/redback/components/registry/Component.java
(original)
+++
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/apache/archiva/redback/components/registry/Component.java
Thu Apr 12 15:24:03 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.components.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-commons/src/test/java/org/apache/archiva/redback/components/registry/DefaultComponent.java
(from r1325279,
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/codehaus/redback/components/registry/DefaultComponent.java)
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/apache/archiva/redback/components/registry/DefaultComponent.java?p2=archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/apache/archiva/redback/components/registry/DefaultComponent.java&p1=archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/codehaus/redback/components/registry/DefaultComponent.java&r1=1325279&r2=1325317&rev=1325317&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/codehaus/redback/components/registry/DefaultComponent.java
(original)
+++
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/apache/archiva/redback/components/registry/DefaultComponent.java
Thu Apr 12 15:24:03 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.components.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-commons/src/test/java/org/apache/archiva/redback/components/registry/Nested.java
(from r1325279,
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/codehaus/redback/components/registry/Nested.java)
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/apache/archiva/redback/components/registry/Nested.java?p2=archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/apache/archiva/redback/components/registry/Nested.java&p1=archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/codehaus/redback/components/registry/Nested.java&r1=1325279&r2=1325317&rev=1325317&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/codehaus/redback/components/registry/Nested.java
(original)
+++
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/java/org/apache/archiva/redback/components/registry/Nested.java
Thu Apr 12 15:24:03 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.components.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/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/resources/spring-context.xml?rev=1325317&r1=1325316&r2=1325317&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/resources/spring-context.xml
(original)
+++
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/test/resources/spring-context.xml
Thu Apr 12 15:24:03 2012
@@ -20,16 +20,13 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:context="http://www.springframework.org/schema/context";
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/context
-
http://www.springframework.org/schema/context/spring-context-2.5.xsd";>
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";>
<alias name="commons-configuration" alias="default"/>
- <bean name="builder"
class="org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry">
+ <bean name="builder"
class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
<property name="properties">
<value>
<