From 63e9988bb537635051fa1b16083205a2c5d0d13a Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Wed, 14 Sep 2011 14:02:57 +0000 Subject: [PATCH] [MRM-1003] get RID of org.apache.maven package : artifact-converter module git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1170632 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva/converter/RepositoryConversionException.java | 2 +- .../converter/legacy/DefaultLegacyRepositoryConverter.java | 5 ++--- .../converter/legacy/LegacyConverterArtifactConsumer.java | 2 +- .../archiva/converter/legacy/LegacyRepositoryConverter.java | 4 ++-- .../archiva/converter/DefaultRepositoryConverter.properties | 0 5 files changed, 6 insertions(+), 7 deletions(-) rename archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/{maven => }/archiva/converter/RepositoryConversionException.java (96%) rename archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/{maven => }/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java (95%) rename archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/{maven => }/archiva/converter/legacy/LegacyConverterArtifactConsumer.java (99%) rename archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/{maven => }/archiva/converter/legacy/LegacyRepositoryConverter.java (93%) rename archiva-modules/archiva-base/archiva-converter/src/main/resources/org/apache/{maven => }/archiva/converter/DefaultRepositoryConverter.properties (100%) diff --git a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/RepositoryConversionException.java b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/RepositoryConversionException.java similarity index 96% rename from archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/RepositoryConversionException.java rename to archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/RepositoryConversionException.java index 31f9dc853..a5edc27d3 100644 --- a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/RepositoryConversionException.java +++ b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/RepositoryConversionException.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.converter; +package org.apache.archiva.converter; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java similarity index 95% rename from archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java rename to archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java index dd45dce71..01b0fd78d 100644 --- a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java +++ b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.converter.legacy; +package org.apache.archiva.converter.legacy; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,13 +22,12 @@ package org.apache.maven.archiva.converter.legacy; import org.apache.archiva.admin.model.managed.ManagedRepository; import org.apache.archiva.common.plexusbridge.PlexusSisuBridge; import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException; +import org.apache.archiva.converter.RepositoryConversionException; import org.apache.archiva.repository.scanner.RepositoryScanner; import org.apache.archiva.repository.scanner.RepositoryScannerException; import org.apache.maven.archiva.common.utils.PathUtil; -import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.consumers.InvalidRepositoryContentConsumer; import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer; -import org.apache.maven.archiva.converter.RepositoryConversionException; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepositoryFactory; import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; diff --git a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java similarity index 99% rename from archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java rename to archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java index 44218a056..6f06acc33 100644 --- a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java +++ b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.converter.legacy; +package org.apache.archiva.converter.legacy; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyRepositoryConverter.java b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyRepositoryConverter.java similarity index 93% rename from archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyRepositoryConverter.java rename to archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyRepositoryConverter.java index 53db2980f..bb1c51b60 100644 --- a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyRepositoryConverter.java +++ b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyRepositoryConverter.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.converter.legacy; +package org.apache.archiva.converter.legacy; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ package org.apache.maven.archiva.converter.legacy; * under the License. */ -import org.apache.maven.archiva.converter.RepositoryConversionException; +import org.apache.archiva.converter.RepositoryConversionException; import java.io.File; import java.util.List; diff --git a/archiva-modules/archiva-base/archiva-converter/src/main/resources/org/apache/maven/archiva/converter/DefaultRepositoryConverter.properties b/archiva-modules/archiva-base/archiva-converter/src/main/resources/org/apache/archiva/converter/DefaultRepositoryConverter.properties similarity index 100% rename from archiva-modules/archiva-base/archiva-converter/src/main/resources/org/apache/maven/archiva/converter/DefaultRepositoryConverter.properties rename to archiva-modules/archiva-base/archiva-converter/src/main/resources/org/apache/archiva/converter/DefaultRepositoryConverter.properties