Author: olamy
Date: Tue Oct 18 17:37:42 2011
New Revision: 1185769
URL: http://svn.apache.org/viewvc?rev=1185769&view=rev
Log:
fix compilation due to package change in trunk
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/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-scanner-performance/src/main/java/org/apache/archiva/App.java
archiva/sandbox/populate-jcr-repo/pom.xml
archiva/sandbox/populate-jcr-repo/src/main/java/org/apache/archiva/metadata/repository/jcr/PopulateRepoApp.java
archiva/sandbox/populate-jcr-repo/src/main/java/org/apache/archiva/metadata/repository/jcr/PopulateRepoAppConfig.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=1185769&r1=1185768&r2=1185769&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
Tue Oct 18 17:37:42 2011
@@ -3,9 +3,9 @@ package org.example.consumer;
import java.util.ArrayList;
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.archiva.configuration.ArchivaConfiguration;
+import org.apache.archiva.configuration.FileTypes;
+import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.archiva.consumers.AbstractMonitoredConsumer;
import org.apache.archiva.consumers.ConsumerException;
import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
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=1185769&r1=1185768&r2=1185769&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
Tue Oct 18 17:37:42 2011
@@ -21,7 +21,7 @@ package org.example.consumer;
import java.io.File;
-import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.logging.Logger;
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=1185769&r1=1185768&r2=1185769&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
Tue Oct 18 17:37:42 2011
@@ -28,9 +28,9 @@ import java.util.Iterator;
import java.util.List;
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.archiva.configuration.ArchivaConfiguration;
+import org.apache.archiva.configuration.FileTypes;
+import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.archiva.consumers.AbstractMonitoredConsumer;
import org.apache.archiva.consumers.ConsumerException;
import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
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=1185769&r1=1185768&r2=1185769&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
Tue Oct 18 17:37:42 2011
@@ -25,7 +25,7 @@ import java.util.Collections;
import java.util.List;
import org.apache.commons.io.IOUtils;
-import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.archiva.consumers.ConsumerException;
import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
import org.apache.maven.archiva.indexer.filecontent.FileContentRecord;
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=1185769&r1=1185768&r2=1185769&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
Tue Oct 18 17:37:42 2011
@@ -8,7 +8,7 @@
<description></description>
<requirements>
<requirement>
- <role>org.apache.maven.archiva.configuration.FileTypes</role>
+ <role>org.apache.archiva.configuration.FileTypes</role>
<field-name>filetypes</field-name>
</requirement>
<requirement>
@@ -17,7 +17,7 @@
<field-name>repoSearch</field-name>
</requirement>
<requirement>
-
<role>org.apache.maven.archiva.configuration.ArchivaConfiguration</role>
+ <role>org.apache.archiva.configuration.ArchivaConfiguration</role>
<field-name>configuration</field-name>
</requirement>
</requirements>
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=1185769&r1=1185768&r2=1185769&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
Tue Oct 18 17:37:42 2011
@@ -30,7 +30,7 @@ import java.util.HashMap;
import java.util.List;
import org.apache.commons.io.IOUtils;
-import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.archiva.consumers.AbstractMonitoredConsumer;
import org.apache.archiva.consumers.ConsumerException;
import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
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=1185769&r1=1185768&r2=1185769&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
Tue Oct 18 17:37:42 2011
@@ -26,7 +26,7 @@ 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.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.archiva.consumers.ConsumerException;
import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
import org.codehaus.plexus.spring.PlexusContainerAdapter;
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=1185769&r1=1185768&r2=1185769&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
Tue Oct 18 17:37:42 2011
@@ -4,7 +4,7 @@ import org.apache.archiva.repository.sca
import org.apache.archiva.repository.scanner.RepositoryScanStatistics;
import org.apache.archiva.repository.scanner.RepositoryScanner;
import org.apache.archiva.repository.scanner.RepositoryScannerException;
-import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.archiva.consumers.InvalidRepositoryContentConsumer;
import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
import org.apache.tools.ant.DirectoryScanner;
Modified: archiva/sandbox/populate-jcr-repo/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/sandbox/populate-jcr-repo/pom.xml?rev=1185769&r1=1185768&r2=1185769&view=diff
==============================================================================
--- archiva/sandbox/populate-jcr-repo/pom.xml (original)
+++ archiva/sandbox/populate-jcr-repo/pom.xml Tue Oct 18 17:37:42 2011
@@ -21,17 +21,17 @@
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>metadata-store-jcr</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.4-M1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>metadata-repository-file</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.4-M1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>maven2-repository</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.4-M1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>npanday-support</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.4-M1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
Modified:
archiva/sandbox/populate-jcr-repo/src/main/java/org/apache/archiva/metadata/repository/jcr/PopulateRepoApp.java
URL:
http://svn.apache.org/viewvc/archiva/sandbox/populate-jcr-repo/src/main/java/org/apache/archiva/metadata/repository/jcr/PopulateRepoApp.java?rev=1185769&r1=1185768&r2=1185769&view=diff
==============================================================================
---
archiva/sandbox/populate-jcr-repo/src/main/java/org/apache/archiva/metadata/repository/jcr/PopulateRepoApp.java
(original)
+++
archiva/sandbox/populate-jcr-repo/src/main/java/org/apache/archiva/metadata/repository/jcr/PopulateRepoApp.java
Tue Oct 18 17:37:42 2011
@@ -18,7 +18,7 @@ import org.apache.commons.io.filefilter.
import org.apache.commons.io.filefilter.WildcardFileFilter;
import org.apache.jackrabbit.core.TransientRepository;
import org.apache.jackrabbit.core.config.RepositoryConfig;
-import org.apache.maven.archiva.configuration.ArchivaConfiguration;
+import org.apache.archiva.configuration.ArchivaConfiguration;
import org.codehaus.plexus.spring.PlexusClassPathXmlApplicationContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
archiva/sandbox/populate-jcr-repo/src/main/java/org/apache/archiva/metadata/repository/jcr/PopulateRepoAppConfig.java
URL:
http://svn.apache.org/viewvc/archiva/sandbox/populate-jcr-repo/src/main/java/org/apache/archiva/metadata/repository/jcr/PopulateRepoAppConfig.java?rev=1185769&r1=1185768&r2=1185769&view=diff
==============================================================================
---
archiva/sandbox/populate-jcr-repo/src/main/java/org/apache/archiva/metadata/repository/jcr/PopulateRepoAppConfig.java
(original)
+++
archiva/sandbox/populate-jcr-repo/src/main/java/org/apache/archiva/metadata/repository/jcr/PopulateRepoAppConfig.java
Tue Oct 18 17:37:42 2011
@@ -19,11 +19,11 @@ package org.apache.archiva.metadata.repo
* under the License.
*/
-import org.apache.maven.archiva.configuration.ArchivaConfiguration;
-import org.apache.maven.archiva.configuration.Configuration;
-import org.apache.maven.archiva.configuration.ConfigurationListener;
-import
org.apache.maven.archiva.configuration.IndeterminateConfigurationException;
-import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.archiva.configuration.ArchivaConfiguration;
+import org.apache.archiva.configuration.Configuration;
+import org.apache.archiva.configuration.ConfigurationListener;
+import org.apache.archiva.configuration.IndeterminateConfigurationException;
+import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
import org.codehaus.plexus.registry.RegistryException;
import org.codehaus.plexus.registry.RegistryListener;
