Author: olamy
Date: Fri Sep 16 08:55:09 2011
New Revision: 1171454
URL: http://svn.apache.org/viewvc?rev=1171454&view=rev
Log:
[MRM-1003] Repackage sources from org.apache.maven.archiva.. to
org.apache.archiva.. : archiva-consumer-api module
Modified:
archiva/sandbox/archiva-consumer-plugin-archetype/src/main/resources/archetype-resources/src/main/java/consumer/SimpleArtifactConsumer.java
archiva/sandbox/archiva-consumer-plugin-archetype/src/main/resources/archetype-resources/src/test/java/consumer/SimpleArtifactConsumerTest.java
archiva/sandbox/archiva-consumer-plugin/ReadMe.txt
archiva/sandbox/archiva-consumer-plugin/src/main/java/org/apache/maven/archiva/consumer/plugin/DiscoverNewArtifactConsumer.java
archiva/sandbox/archiva-consumer-plugin/src/test/java/org/apache/maven/archiva/consumer/plugin/DiscoverNewArtifactConsumerTest.java
archiva/sandbox/archiva-consumer-plugin/src/test/resources/org/apache/maven/archiva/consumer/plugin/DiscoverNewArtifactConsumerTest.xml
archiva/sandbox/archiva-dependency-tree-consumer/src/main/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumer.java
archiva/sandbox/archiva-dependency-tree-consumer/src/test/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumerTest.java
archiva/sandbox/archiva-project-reports/src/main/java/org/apache/maven/archiva/reporting/project/ProjectDependenciesConsumer.java
archiva/sandbox/archiva-repository-assembler/src/main/java/org/apache/maven/archiva/repository/assembly/DefaultRepositoryAssembler.java
archiva/sandbox/archiva-repository-assembler/src/main/java/org/apache/maven/archiva/repository/assembly/RepositoryAssembler.java
archiva/sandbox/archiva-repository-assembler/src/main/java/org/apache/maven/archiva/repository/assembly/RepositoryAssemblyException.java
archiva/sandbox/archiva-scanner-performance/src/main/java/org/apache/archiva/App.java
Modified:
archiva/sandbox/archiva-consumer-plugin-archetype/src/main/resources/archetype-resources/src/main/java/consumer/SimpleArtifactConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/sandbox/archiva-consumer-plugin-archetype/src/main/resources/archetype-resources/src/main/java/consumer/SimpleArtifactConsumer.java?rev=1171454&r1=1171453&r2=1171454&view=diff
==============================================================================
---
archiva/sandbox/archiva-consumer-plugin-archetype/src/main/resources/archetype-resources/src/main/java/consumer/SimpleArtifactConsumer.java
(original)
+++
archiva/sandbox/archiva-consumer-plugin-archetype/src/main/resources/archetype-resources/src/main/java/consumer/SimpleArtifactConsumer.java
Fri Sep 16 08:55:09 2011
@@ -6,9 +6,9 @@ import java.util.List;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.FileTypes;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
-import org.apache.maven.archiva.consumers.AbstractMonitoredConsumer;
-import org.apache.maven.archiva.consumers.ConsumerException;
-import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
+import org.apache.archiva.consumers.AbstractMonitoredConsumer;
+import org.apache.archiva.consumers.ConsumerException;
+import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import
org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
import org.codehaus.plexus.registry.Registry;
@@ -17,7 +17,7 @@ import org.codehaus.plexus.registry.Regi
/**
* <code>SimpleArtifactConsumer</code>
*
- * @plexus.component
role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
+ * @plexus.component
role="org.apache.archiva.consumers.KnownRepositoryContentConsumer"
* role-hint="simple-artifact-consumer"
instantiation-strategy="per-lookup"
*/
public class SimpleArtifactConsumer
Modified:
archiva/sandbox/archiva-consumer-plugin-archetype/src/main/resources/archetype-resources/src/test/java/consumer/SimpleArtifactConsumerTest.java
URL:
http://svn.apache.org/viewvc/archiva/sandbox/archiva-consumer-plugin-archetype/src/main/resources/archetype-resources/src/test/java/consumer/SimpleArtifactConsumerTest.java?rev=1171454&r1=1171453&r2=1171454&view=diff
==============================================================================
---
archiva/sandbox/archiva-consumer-plugin-archetype/src/main/resources/archetype-resources/src/test/java/consumer/SimpleArtifactConsumerTest.java
(original)
+++
archiva/sandbox/archiva-consumer-plugin-archetype/src/main/resources/archetype-resources/src/test/java/consumer/SimpleArtifactConsumerTest.java
Fri Sep 16 08:55:09 2011
@@ -22,7 +22,7 @@ package org.example.consumer;
import java.io.File;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
-import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
+import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.logging.Logger;
import org.easymock.EasyMock;
Modified: archiva/sandbox/archiva-consumer-plugin/ReadMe.txt
URL:
http://svn.apache.org/viewvc/archiva/sandbox/archiva-consumer-plugin/ReadMe.txt?rev=1171454&r1=1171453&r2=1171454&view=diff
==============================================================================
--- archiva/sandbox/archiva-consumer-plugin/ReadMe.txt (original)
+++ archiva/sandbox/archiva-consumer-plugin/ReadMe.txt Fri Sep 16 08:55:09 2011
@@ -8,7 +8,7 @@ How To Add A New Component in Archiva:
should be put at the class level.
Ex.
- @plexus.component
role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
+ @plexus.component
role="org.apache.archiva.consumers.KnownRepositoryContentConsumer"
role-hint="discover-new-artifact"
instantiation-strategy="per-lookup"
Modified:
archiva/sandbox/archiva-consumer-plugin/src/main/java/org/apache/maven/archiva/consumer/plugin/DiscoverNewArtifactConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/sandbox/archiva-consumer-plugin/src/main/java/org/apache/maven/archiva/consumer/plugin/DiscoverNewArtifactConsumer.java?rev=1171454&r1=1171453&r2=1171454&view=diff
==============================================================================
---
archiva/sandbox/archiva-consumer-plugin/src/main/java/org/apache/maven/archiva/consumer/plugin/DiscoverNewArtifactConsumer.java
(original)
+++
archiva/sandbox/archiva-consumer-plugin/src/main/java/org/apache/maven/archiva/consumer/plugin/DiscoverNewArtifactConsumer.java
Fri Sep 16 08:55:09 2011
@@ -31,9 +31,9 @@ import org.apache.commons.io.IOUtils;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.FileTypes;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
-import org.apache.maven.archiva.consumers.AbstractMonitoredConsumer;
-import org.apache.maven.archiva.consumers.ConsumerException;
-import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
+import org.apache.archiva.consumers.AbstractMonitoredConsumer;
+import org.apache.archiva.consumers.ConsumerException;
+import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
import org.apache.maven.archiva.indexer.search.CrossRepositorySearch;
import org.apache.maven.archiva.indexer.search.SearchResultHit;
import org.apache.maven.archiva.indexer.search.SearchResultLimits;
@@ -45,7 +45,7 @@ import org.codehaus.plexus.registry.Regi
/**
* @author <a href="mailto:[email protected]";>Maria Odea Ching</a>
- * @plexus.component
role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
+ * @plexus.component
role="org.apache.archiva.consumers.KnownRepositoryContentConsumer"
* role-hint="discover-new-artifact"
instantiation-strategy="per-lookup"
*/
public class DiscoverNewArtifactConsumer
Modified:
archiva/sandbox/archiva-consumer-plugin/src/test/java/org/apache/maven/archiva/consumer/plugin/DiscoverNewArtifactConsumerTest.java
URL:
http://svn.apache.org/viewvc/archiva/sandbox/archiva-consumer-plugin/src/test/java/org/apache/maven/archiva/consumer/plugin/DiscoverNewArtifactConsumerTest.java?rev=1171454&r1=1171453&r2=1171454&view=diff
==============================================================================
---
archiva/sandbox/archiva-consumer-plugin/src/test/java/org/apache/maven/archiva/consumer/plugin/DiscoverNewArtifactConsumerTest.java
(original)
+++
archiva/sandbox/archiva-consumer-plugin/src/test/java/org/apache/maven/archiva/consumer/plugin/DiscoverNewArtifactConsumerTest.java
Fri Sep 16 08:55:09 2011
@@ -26,8 +26,8 @@ import java.util.List;
import org.apache.commons.io.IOUtils;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
-import org.apache.maven.archiva.consumers.ConsumerException;
-import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
+import org.apache.archiva.consumers.ConsumerException;
+import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
import org.apache.maven.archiva.indexer.filecontent.FileContentRecord;
import org.apache.maven.archiva.indexer.search.CrossRepositorySearch;
import org.apache.maven.archiva.indexer.search.SearchResults;
Modified:
archiva/sandbox/archiva-consumer-plugin/src/test/resources/org/apache/maven/archiva/consumer/plugin/DiscoverNewArtifactConsumerTest.xml
URL:
http://svn.apache.org/viewvc/archiva/sandbox/archiva-consumer-plugin/src/test/resources/org/apache/maven/archiva/consumer/plugin/DiscoverNewArtifactConsumerTest.xml?rev=1171454&r1=1171453&r2=1171454&view=diff
==============================================================================
---
archiva/sandbox/archiva-consumer-plugin/src/test/resources/org/apache/maven/archiva/consumer/plugin/DiscoverNewArtifactConsumerTest.xml
(original)
+++
archiva/sandbox/archiva-consumer-plugin/src/test/resources/org/apache/maven/archiva/consumer/plugin/DiscoverNewArtifactConsumerTest.xml
Fri Sep 16 08:55:09 2011
@@ -1,7 +1,7 @@
<component-set>
<components>
<component>
-
<role>org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer</role>
+ <role>org.apache.archiva.consumers.KnownRepositoryContentConsumer</role>
<role-hint>discover-new-artifact</role-hint>
<implementation>org.apache.maven.archiva.consumer.plugin.DiscoverNewArtifactConsumer</implementation>
<instantiation-strategy>per-lookup</instantiation-strategy>
Modified:
archiva/sandbox/archiva-dependency-tree-consumer/src/main/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/sandbox/archiva-dependency-tree-consumer/src/main/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumer.java?rev=1171454&r1=1171453&r2=1171454&view=diff
==============================================================================
---
archiva/sandbox/archiva-dependency-tree-consumer/src/main/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumer.java
(original)
+++
archiva/sandbox/archiva-dependency-tree-consumer/src/main/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumer.java
Fri Sep 16 08:55:09 2011
@@ -31,9 +31,9 @@ import java.util.List;
import org.apache.commons.io.IOUtils;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
-import org.apache.maven.archiva.consumers.AbstractMonitoredConsumer;
-import org.apache.maven.archiva.consumers.ConsumerException;
-import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
+import org.apache.archiva.consumers.AbstractMonitoredConsumer;
+import org.apache.archiva.consumers.ConsumerException;
+import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
@@ -63,7 +63,7 @@ import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
/**
- * @plexus.component
role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
+ * @plexus.component
role="org.apache.archiva.consumers.KnownRepositoryContentConsumer"
* role-hint="dependency-tree-generator"
instantiation-strategy="per-lookup"
*/
public class DependencyTreeGeneratorConsumer
Modified:
archiva/sandbox/archiva-dependency-tree-consumer/src/test/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumerTest.java
URL:
http://svn.apache.org/viewvc/archiva/sandbox/archiva-dependency-tree-consumer/src/test/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumerTest.java?rev=1171454&r1=1171453&r2=1171454&view=diff
==============================================================================
---
archiva/sandbox/archiva-dependency-tree-consumer/src/test/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumerTest.java
(original)
+++
archiva/sandbox/archiva-dependency-tree-consumer/src/test/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumerTest.java
Fri Sep 16 08:55:09 2011
@@ -27,8 +27,8 @@ import javax.xml.parsers.ParserConfigura
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
-import org.apache.maven.archiva.consumers.ConsumerException;
-import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
+import org.apache.archiva.consumers.ConsumerException;
+import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
import org.codehaus.plexus.spring.PlexusContainerAdapter;
import org.codehaus.plexus.spring.PlexusInSpringTestCase;
import org.custommonkey.xmlunit.XMLAssert;
Modified:
archiva/sandbox/archiva-project-reports/src/main/java/org/apache/maven/archiva/reporting/project/ProjectDependenciesConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/sandbox/archiva-project-reports/src/main/java/org/apache/maven/archiva/reporting/project/ProjectDependenciesConsumer.java?rev=1171454&r1=1171453&r2=1171454&view=diff
==============================================================================
---
archiva/sandbox/archiva-project-reports/src/main/java/org/apache/maven/archiva/reporting/project/ProjectDependenciesConsumer.java
(original)
+++
archiva/sandbox/archiva-project-reports/src/main/java/org/apache/maven/archiva/reporting/project/ProjectDependenciesConsumer.java
Fri Sep 16 08:55:09 2011
@@ -19,8 +19,8 @@ package org.apache.maven.archiva.reporti
* under the License.
*/
-import org.apache.maven.archiva.consumers.AbstractMonitoredConsumer;
-import org.apache.maven.archiva.consumers.ConsumerException;
+import org.apache.archiva.consumers.AbstractMonitoredConsumer;
+import org.apache.archiva.consumers.ConsumerException;
import org.apache.maven.archiva.database.updater.ArchivaArtifactConsumer;
import org.apache.maven.archiva.model.ArchivaArtifact;
Modified:
archiva/sandbox/archiva-repository-assembler/src/main/java/org/apache/maven/archiva/repository/assembly/DefaultRepositoryAssembler.java
URL:
http://svn.apache.org/viewvc/archiva/sandbox/archiva-repository-assembler/src/main/java/org/apache/maven/archiva/repository/assembly/DefaultRepositoryAssembler.java?rev=1171454&r1=1171453&r2=1171454&view=diff
==============================================================================
---
archiva/sandbox/archiva-repository-assembler/src/main/java/org/apache/maven/archiva/repository/assembly/DefaultRepositoryAssembler.java
(original)
+++
archiva/sandbox/archiva-repository-assembler/src/main/java/org/apache/maven/archiva/repository/assembly/DefaultRepositoryAssembler.java
Fri Sep 16 08:55:09 2011
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.repository.assembly;
+package org.apache.archiva.repository.assembly;
/*
* Copyright 2001-2005 The Apache Software Foundation.
@@ -38,16 +38,13 @@ import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.Writer;
-import java.lang.reflect.Field;
import java.security.NoSuchAlgorithmException;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import java.util.TimeZone;
Modified:
archiva/sandbox/archiva-repository-assembler/src/main/java/org/apache/maven/archiva/repository/assembly/RepositoryAssembler.java
URL:
http://svn.apache.org/viewvc/archiva/sandbox/archiva-repository-assembler/src/main/java/org/apache/maven/archiva/repository/assembly/RepositoryAssembler.java?rev=1171454&r1=1171453&r2=1171454&view=diff
==============================================================================
---
archiva/sandbox/archiva-repository-assembler/src/main/java/org/apache/maven/archiva/repository/assembly/RepositoryAssembler.java
(original)
+++
archiva/sandbox/archiva-repository-assembler/src/main/java/org/apache/maven/archiva/repository/assembly/RepositoryAssembler.java
Fri Sep 16 08:55:09 2011
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.repository.assembly;
+package org.apache.archiva.repository.assembly;
/*
* Copyright 2001-2005 The Apache Software Foundation.
Modified:
archiva/sandbox/archiva-repository-assembler/src/main/java/org/apache/maven/archiva/repository/assembly/RepositoryAssemblyException.java
URL:
http://svn.apache.org/viewvc/archiva/sandbox/archiva-repository-assembler/src/main/java/org/apache/maven/archiva/repository/assembly/RepositoryAssemblyException.java?rev=1171454&r1=1171453&r2=1171454&view=diff
==============================================================================
---
archiva/sandbox/archiva-repository-assembler/src/main/java/org/apache/maven/archiva/repository/assembly/RepositoryAssemblyException.java
(original)
+++
archiva/sandbox/archiva-repository-assembler/src/main/java/org/apache/maven/archiva/repository/assembly/RepositoryAssemblyException.java
Fri Sep 16 08:55:09 2011
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.repository.assembly;
+package org.apache.archiva.repository.assembly;
/*
* Copyright 2001-2005 The Apache Software Foundation.
Modified:
archiva/sandbox/archiva-scanner-performance/src/main/java/org/apache/archiva/App.java
URL:
http://svn.apache.org/viewvc/archiva/sandbox/archiva-scanner-performance/src/main/java/org/apache/archiva/App.java?rev=1171454&r1=1171453&r2=1171454&view=diff
==============================================================================
---
archiva/sandbox/archiva-scanner-performance/src/main/java/org/apache/archiva/App.java
(original)
+++
archiva/sandbox/archiva-scanner-performance/src/main/java/org/apache/archiva/App.java
Fri Sep 16 08:55:09 2011
@@ -5,8 +5,8 @@ import org.apache.archiva.repository.sca
import org.apache.archiva.repository.scanner.RepositoryScanner;
import org.apache.archiva.repository.scanner.RepositoryScannerException;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
-import org.apache.maven.archiva.consumers.InvalidRepositoryContentConsumer;
-import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
+import org.apache.archiva.consumers.InvalidRepositoryContentConsumer;
+import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
import org.apache.tools.ant.DirectoryScanner;
import java.io.File;
