Author: olamy
Date: Thu Apr 12 14:19:23 2012
New Revision: 1325278
URL: http://svn.apache.org/viewvc?rev=1325278&view=rev
Log:
repackaging to o.a.a.
Added:
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/apache/
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/apache/archiva/
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/apache/archiva/redback/
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/apache/archiva/redback/components/
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/apache/archiva/redback/components/registry/
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/apache/archiva/redback/components/registry/modello/
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/apache/archiva/redback/components/registry/modello/AbstractRegistryGenerator.java
- copied, changed from r1325269,
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/codehaus/modello/plugin/registry/AbstractRegistryGenerator.java
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/apache/archiva/redback/components/registry/modello/RegistryReaderGenerator.java
- copied, changed from r1325269,
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/codehaus/modello/plugin/registry/RegistryReaderGenerator.java
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/apache/archiva/redback/components/registry/modello/RegistryWriterGenerator.java
- copied, changed from r1325269,
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/codehaus/modello/plugin/registry/RegistryWriterGenerator.java
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/resources/org/apache/
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/resources/org/apache/archiva/
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/resources/org/apache/archiva/redback/
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/resources/org/apache/archiva/redback/components/
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/resources/org/apache/archiva/redback/components/registry/
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/resources/org/apache/archiva/redback/components/registry/modello/
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/resources/org/apache/archiva/redback/components/registry/modello/RegistryReader.java.vm
- copied unchanged from r1325266,
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/resources/org/codehaus/modello/plugin/registry/RegistryReader.java.vm
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/resources/org/apache/archiva/redback/components/registry/modello/RegistryWriter.java.vm
- copied unchanged from r1325266,
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/resources/org/codehaus/modello/plugin/registry/RegistryWriter.java.vm
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/apache/
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/apache/archiva/
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/AbstractRegistryGeneratorTestCase.java
- copied, changed from r1325269,
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/codehaus/modello/plugin/registry/AbstractRegistryGeneratorTestCase.java
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/RegistryReaderGeneratorTest.java
- copied, changed from r1325269,
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/codehaus/modello/plugin/registry/RegistryReaderGeneratorTest.java
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/RegistryWriterGeneratorTest.java
- copied, changed from r1325269,
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/codehaus/modello/plugin/registry/RegistryWriterGeneratorTest.java
Removed:
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/codehaus/modello/plugin/registry/AbstractRegistryGenerator.java
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/codehaus/modello/plugin/registry/RegistryReaderGenerator.java
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/codehaus/modello/plugin/registry/RegistryWriterGenerator.java
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/resources/org/codehaus/modello/plugin/registry/RegistryReader.java.vm
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/resources/org/codehaus/modello/plugin/registry/RegistryWriter.java.vm
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/codehaus/modello/plugin/registry/AbstractRegistryGeneratorTestCase.java
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/codehaus/modello/plugin/registry/RegistryReaderGeneratorTest.java
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/codehaus/modello/plugin/registry/RegistryWriterGeneratorTest.java
Modified:
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/resources/META-INF/plexus/components.xml
Copied:
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/apache/archiva/redback/components/registry/modello/AbstractRegistryGenerator.java
(from r1325269,
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/codehaus/modello/plugin/registry/AbstractRegistryGenerator.java)
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/apache/archiva/redback/components/registry/modello/AbstractRegistryGenerator.java?p2=archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/apache/archiva/redback/components/registry/modello/AbstractRegistryGenerator.java&p1=archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/codehaus/modello/plugin/registry/AbstractRegistryGenerator.java&r1=1325269&r2=1325278&rev=1325278&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/codehaus/modello/plugin/registry/AbstractRegistryGenerator.java
(original)
+++
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/apache/archiva/redback/components/registry/modello/AbstractRegistryGenerator.java
Thu Apr 12 14:19:23 2012
@@ -1,4 +1,4 @@
-package org.codehaus.modello.plugin.registry;
+package org.apache.archiva.redback.components.registry.modello;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -53,7 +53,7 @@ public abstract class AbstractRegistryGe
// Generate the reader
String className = model.getName() + outputType;
- writeClass( "org/codehaus/modello/plugin/registry/" + outputType +
".java.vm", getOutputDirectory(),
- packageName, className, context );
+ writeClass( getClass().getPackage().getName().replaceAll( "\\.", "/" )
+ "/" + outputType + ".java.vm",
+ getOutputDirectory(), packageName, className, context );
}
}
Copied:
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/apache/archiva/redback/components/registry/modello/RegistryReaderGenerator.java
(from r1325269,
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/codehaus/modello/plugin/registry/RegistryReaderGenerator.java)
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/apache/archiva/redback/components/registry/modello/RegistryReaderGenerator.java?p2=archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/apache/archiva/redback/components/registry/modello/RegistryReaderGenerator.java&p1=archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/codehaus/modello/plugin/registry/RegistryReaderGenerator.java&r1=1325269&r2=1325278&rev=1325278&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/codehaus/modello/plugin/registry/RegistryReaderGenerator.java
(original)
+++
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/apache/archiva/redback/components/registry/modello/RegistryReaderGenerator.java
Thu Apr 12 14:19:23 2012
@@ -1,4 +1,4 @@
-package org.codehaus.modello.plugin.registry;
+package org.apache.archiva.redback.components.registry.modello;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied:
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/apache/archiva/redback/components/registry/modello/RegistryWriterGenerator.java
(from r1325269,
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/codehaus/modello/plugin/registry/RegistryWriterGenerator.java)
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/apache/archiva/redback/components/registry/modello/RegistryWriterGenerator.java?p2=archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/apache/archiva/redback/components/registry/modello/RegistryWriterGenerator.java&p1=archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/codehaus/modello/plugin/registry/RegistryWriterGenerator.java&r1=1325269&r2=1325278&rev=1325278&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/codehaus/modello/plugin/registry/RegistryWriterGenerator.java
(original)
+++
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/java/org/apache/archiva/redback/components/registry/modello/RegistryWriterGenerator.java
Thu Apr 12 14:19:23 2012
@@ -1,4 +1,4 @@
-package org.codehaus.modello.plugin.registry;
+package org.apache.archiva.redback.components.registry.modello;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified:
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/resources/META-INF/plexus/components.xml?rev=1325278&r1=1325277&r2=1325278&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/resources/META-INF/plexus/components.xml
(original)
+++
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/main/resources/META-INF/plexus/components.xml
Thu Apr 12 14:19:23 2012
@@ -25,7 +25,7 @@
<component>
<role>org.codehaus.modello.plugin.ModelloGenerator</role>
<role-hint>registry-reader</role-hint>
-
<implementation>org.codehaus.modello.plugin.registry.RegistryReaderGenerator</implementation>
+
<implementation>org.apache.archiva.redback.components.registry.modello.RegistryReaderGenerator</implementation>
<requirements>
<requirement>
<role>org.codehaus.plexus.velocity.VelocityComponent</role>
@@ -35,7 +35,7 @@
<component>
<role>org.codehaus.modello.plugin.ModelloGenerator</role>
<role-hint>registry-writer</role-hint>
-
<implementation>org.codehaus.modello.plugin.registry.RegistryWriterGenerator</implementation>
+
<implementation>org.apache.archiva.redback.components.registry.modello.RegistryWriterGenerator</implementation>
<requirements>
<requirement>
<role>org.codehaus.plexus.velocity.VelocityComponent</role>
Copied:
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/AbstractRegistryGeneratorTestCase.java
(from r1325269,
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/codehaus/modello/plugin/registry/AbstractRegistryGeneratorTestCase.java)
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/AbstractRegistryGeneratorTestCase.java?p2=archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/AbstractRegistryGeneratorTestCase.java&p1=archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/codehaus/modello/plugin/registry/AbstractRegistryGeneratorTestCase.java&r1=1325269&r2=1325278&rev=1325278&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/codehaus/modello/plugin/registry/AbstractRegistryGeneratorTestCase.java
(original)
+++
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/AbstractRegistryGeneratorTestCase.java
Thu Apr 12 14:19:23 2012
@@ -1,4 +1,4 @@
-package org.codehaus.modello.plugin.registry;
+package org.apache.archiva.redback.components.registry.modello;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied:
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/RegistryReaderGeneratorTest.java
(from r1325269,
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/codehaus/modello/plugin/registry/RegistryReaderGeneratorTest.java)
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/RegistryReaderGeneratorTest.java?p2=archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/RegistryReaderGeneratorTest.java&p1=archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/codehaus/modello/plugin/registry/RegistryReaderGeneratorTest.java&r1=1325269&r2=1325278&rev=1325278&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/codehaus/modello/plugin/registry/RegistryReaderGeneratorTest.java
(original)
+++
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/RegistryReaderGeneratorTest.java
Thu Apr 12 14:19:23 2012
@@ -1,4 +1,4 @@
-package org.codehaus.modello.plugin.registry;
+package org.apache.archiva.redback.components.registry.modello;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied:
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/RegistryWriterGeneratorTest.java
(from r1325269,
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/codehaus/modello/plugin/registry/RegistryWriterGeneratorTest.java)
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/RegistryWriterGeneratorTest.java?p2=archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/RegistryWriterGeneratorTest.java&p1=archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/codehaus/modello/plugin/registry/RegistryWriterGeneratorTest.java&r1=1325269&r2=1325278&rev=1325278&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/codehaus/modello/plugin/registry/RegistryWriterGeneratorTest.java
(original)
+++
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/RegistryWriterGeneratorTest.java
Thu Apr 12 14:19:23 2012
@@ -1,4 +1,4 @@
-package org.codehaus.modello.plugin.registry;
+package org.apache.archiva.redback.components.registry.modello;
/*
* Licensed to the Apache Software Foundation (ASF) under one
