diff --git a/maven-repository-artifact-applet/pom.xml b/archiva-applet/pom.xml similarity index 91% rename from maven-repository-artifact-applet/pom.xml rename to archiva-applet/pom.xml index c18b795a9..a581215ae 100644 --- a/maven-repository-artifact-applet/pom.xml +++ b/archiva-applet/pom.xml @@ -18,12 +18,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.apache.maven.repository - maven-repository-manager + org.apache.maven.archiva + archiva 1.0-SNAPSHOT - maven-repository-artifact-applet - Maven Repository Manager Artifact Applet + archiva-applet + Archiva Applet Applet for performing local operations on files such as creating a checksum of an artifact before uploading it. diff --git a/maven-repository-artifact-applet/src/keystore/keystore b/archiva-applet/src/keystore/keystore similarity index 100% rename from maven-repository-artifact-applet/src/keystore/keystore rename to archiva-applet/src/keystore/keystore diff --git a/maven-repository-artifact-applet/src/main/java/org/apache/maven/repository/applet/ChecksumApplet.java b/archiva-applet/src/main/java/org/apache/maven/repository/applet/ChecksumApplet.java similarity index 100% rename from maven-repository-artifact-applet/src/main/java/org/apache/maven/repository/applet/ChecksumApplet.java rename to archiva-applet/src/main/java/org/apache/maven/repository/applet/ChecksumApplet.java diff --git a/maven-repository-configuration/pom.xml b/archiva-configuration/pom.xml similarity index 89% rename from maven-repository-configuration/pom.xml rename to archiva-configuration/pom.xml index 1b3fcbd8a..25c939a50 100644 --- a/maven-repository-configuration/pom.xml +++ b/archiva-configuration/pom.xml @@ -1,13 +1,13 @@ - maven-repository-manager - org.apache.maven.repository + archiva + org.apache.maven.archiva 1.0-SNAPSHOT 4.0.0 - maven-repository-configuration - Maven Repository Manager Configuration + archiva-configuration + Archiva Configuration org.codehaus.plexus diff --git a/maven-repository-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationChangeException.java b/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationChangeException.java similarity index 100% rename from maven-repository-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationChangeException.java rename to archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationChangeException.java diff --git a/maven-repository-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationChangeListener.java b/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationChangeListener.java similarity index 100% rename from maven-repository-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationChangeListener.java rename to archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationChangeListener.java diff --git a/maven-repository-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationStore.java b/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationStore.java similarity index 100% rename from maven-repository-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationStore.java rename to archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationStore.java diff --git a/maven-repository-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationStoreException.java b/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationStoreException.java similarity index 100% rename from maven-repository-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationStoreException.java rename to archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationStoreException.java diff --git a/maven-repository-configuration/src/main/java/org/apache/maven/repository/configuration/DefaultConfigurationStore.java b/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/DefaultConfigurationStore.java similarity index 100% rename from maven-repository-configuration/src/main/java/org/apache/maven/repository/configuration/DefaultConfigurationStore.java rename to archiva-configuration/src/main/java/org/apache/maven/repository/configuration/DefaultConfigurationStore.java diff --git a/maven-repository-configuration/src/main/java/org/apache/maven/repository/configuration/InvalidConfigurationException.java b/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/InvalidConfigurationException.java similarity index 100% rename from maven-repository-configuration/src/main/java/org/apache/maven/repository/configuration/InvalidConfigurationException.java rename to archiva-configuration/src/main/java/org/apache/maven/repository/configuration/InvalidConfigurationException.java diff --git a/maven-repository-configuration/src/main/java/org/apache/maven/repository/configuration/MavenProxyPropertyLoader.java b/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/MavenProxyPropertyLoader.java similarity index 100% rename from maven-repository-configuration/src/main/java/org/apache/maven/repository/configuration/MavenProxyPropertyLoader.java rename to archiva-configuration/src/main/java/org/apache/maven/repository/configuration/MavenProxyPropertyLoader.java diff --git a/maven-repository-configuration/src/main/mdo/configuration.mdo b/archiva-configuration/src/main/mdo/configuration.mdo similarity index 100% rename from maven-repository-configuration/src/main/mdo/configuration.mdo rename to archiva-configuration/src/main/mdo/configuration.mdo diff --git a/maven-repository-configuration/src/main/resources/org/apache/maven/repository/configuration/SyncedRepositoryConfiguration-conversion.properties b/archiva-configuration/src/main/resources/org/apache/maven/repository/configuration/SyncedRepositoryConfiguration-conversion.properties similarity index 100% rename from maven-repository-configuration/src/main/resources/org/apache/maven/repository/configuration/SyncedRepositoryConfiguration-conversion.properties rename to archiva-configuration/src/main/resources/org/apache/maven/repository/configuration/SyncedRepositoryConfiguration-conversion.properties diff --git a/maven-repository-configuration/src/test/conf/corrupt.xml b/archiva-configuration/src/test/conf/corrupt.xml similarity index 100% rename from maven-repository-configuration/src/test/conf/corrupt.xml rename to archiva-configuration/src/test/conf/corrupt.xml diff --git a/maven-repository-configuration/src/test/conf/maven-proxy-complete.conf b/archiva-configuration/src/test/conf/maven-proxy-complete.conf similarity index 100% rename from maven-repository-configuration/src/test/conf/maven-proxy-complete.conf rename to archiva-configuration/src/test/conf/maven-proxy-complete.conf diff --git a/maven-repository-configuration/src/test/conf/repository-manager.xml b/archiva-configuration/src/test/conf/repository-manager.xml similarity index 100% rename from maven-repository-configuration/src/test/conf/repository-manager.xml rename to archiva-configuration/src/test/conf/repository-manager.xml diff --git a/maven-repository-configuration/src/test/java/org/apache/maven/repository/configuration/ConfigurationStoreTest.java b/archiva-configuration/src/test/java/org/apache/maven/repository/configuration/ConfigurationStoreTest.java similarity index 100% rename from maven-repository-configuration/src/test/java/org/apache/maven/repository/configuration/ConfigurationStoreTest.java rename to archiva-configuration/src/test/java/org/apache/maven/repository/configuration/ConfigurationStoreTest.java diff --git a/maven-repository-configuration/src/test/java/org/apache/maven/repository/configuration/MavenProxyPropertyLoaderTest.java b/archiva-configuration/src/test/java/org/apache/maven/repository/configuration/MavenProxyPropertyLoaderTest.java similarity index 100% rename from maven-repository-configuration/src/test/java/org/apache/maven/repository/configuration/MavenProxyPropertyLoaderTest.java rename to archiva-configuration/src/test/java/org/apache/maven/repository/configuration/MavenProxyPropertyLoaderTest.java diff --git a/maven-repository-configuration/src/test/resources/org/apache/maven/repository/configuration/ConfigurationStoreTest.xml b/archiva-configuration/src/test/resources/org/apache/maven/repository/configuration/ConfigurationStoreTest.xml similarity index 100% rename from maven-repository-configuration/src/test/resources/org/apache/maven/repository/configuration/ConfigurationStoreTest.xml rename to archiva-configuration/src/test/resources/org/apache/maven/repository/configuration/ConfigurationStoreTest.xml diff --git a/maven-repository-converter/pom.xml b/archiva-converter/pom.xml similarity index 83% rename from maven-repository-converter/pom.xml rename to archiva-converter/pom.xml index e72b0846b..5de65c928 100644 --- a/maven-repository-converter/pom.xml +++ b/archiva-converter/pom.xml @@ -17,13 +17,13 @@ - org.apache.maven.repository - maven-repository-manager + org.apache.maven.archiva + archiva 1.0-SNAPSHOT 4.0.0 - maven-repository-converter - Maven Repository Converter + archiva-converter + Archiva Repository Converter org.codehaus.plexus @@ -38,8 +38,8 @@ maven-model-converter - org.apache.maven.repository - maven-repository-reports-standard + org.apache.maven.archiva + archiva-reports-standard org.codehaus.plexus diff --git a/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/DefaultRepositoryConverter.java b/archiva-converter/src/main/java/org/apache/maven/repository/converter/DefaultRepositoryConverter.java similarity index 100% rename from maven-repository-converter/src/main/java/org/apache/maven/repository/converter/DefaultRepositoryConverter.java rename to archiva-converter/src/main/java/org/apache/maven/repository/converter/DefaultRepositoryConverter.java diff --git a/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/RepositoryConversionException.java b/archiva-converter/src/main/java/org/apache/maven/repository/converter/RepositoryConversionException.java similarity index 100% rename from maven-repository-converter/src/main/java/org/apache/maven/repository/converter/RepositoryConversionException.java rename to archiva-converter/src/main/java/org/apache/maven/repository/converter/RepositoryConversionException.java diff --git a/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/RepositoryConverter.java b/archiva-converter/src/main/java/org/apache/maven/repository/converter/RepositoryConverter.java similarity index 100% rename from maven-repository-converter/src/main/java/org/apache/maven/repository/converter/RepositoryConverter.java rename to archiva-converter/src/main/java/org/apache/maven/repository/converter/RepositoryConverter.java diff --git a/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/transaction/AbstractTransactionEvent.java b/archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/AbstractTransactionEvent.java similarity index 100% rename from maven-repository-converter/src/main/java/org/apache/maven/repository/converter/transaction/AbstractTransactionEvent.java rename to archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/AbstractTransactionEvent.java diff --git a/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/transaction/CopyFileEvent.java b/archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/CopyFileEvent.java similarity index 100% rename from maven-repository-converter/src/main/java/org/apache/maven/repository/converter/transaction/CopyFileEvent.java rename to archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/CopyFileEvent.java diff --git a/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/transaction/CreateFileEvent.java b/archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/CreateFileEvent.java similarity index 100% rename from maven-repository-converter/src/main/java/org/apache/maven/repository/converter/transaction/CreateFileEvent.java rename to archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/CreateFileEvent.java diff --git a/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/transaction/FileTransaction.java b/archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/FileTransaction.java similarity index 100% rename from maven-repository-converter/src/main/java/org/apache/maven/repository/converter/transaction/FileTransaction.java rename to archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/FileTransaction.java diff --git a/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/transaction/TransactionEvent.java b/archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/TransactionEvent.java similarity index 100% rename from maven-repository-converter/src/main/java/org/apache/maven/repository/converter/transaction/TransactionEvent.java rename to archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/TransactionEvent.java diff --git a/maven-repository-converter/src/main/resources/org/apache/maven/repository/converter/DefaultRepositoryConverter.properties b/archiva-converter/src/main/resources/org/apache/maven/repository/converter/DefaultRepositoryConverter.properties similarity index 100% rename from maven-repository-converter/src/main/resources/org/apache/maven/repository/converter/DefaultRepositoryConverter.properties rename to archiva-converter/src/main/resources/org/apache/maven/repository/converter/DefaultRepositoryConverter.properties diff --git a/maven-repository-converter/src/test/expected-files/converted-artifact-one.pom b/archiva-converter/src/test/expected-files/converted-artifact-one.pom similarity index 100% rename from maven-repository-converter/src/test/expected-files/converted-artifact-one.pom rename to archiva-converter/src/test/expected-files/converted-artifact-one.pom diff --git a/maven-repository-converter/src/test/expected-files/converted-artifact-three.pom b/archiva-converter/src/test/expected-files/converted-artifact-three.pom similarity index 100% rename from maven-repository-converter/src/test/expected-files/converted-artifact-three.pom rename to archiva-converter/src/test/expected-files/converted-artifact-three.pom diff --git a/maven-repository-converter/src/test/expected-files/converted-artifact-two.pom b/archiva-converter/src/test/expected-files/converted-artifact-two.pom similarity index 100% rename from maven-repository-converter/src/test/expected-files/converted-artifact-two.pom rename to archiva-converter/src/test/expected-files/converted-artifact-two.pom diff --git a/maven-repository-converter/src/test/expected-files/converted-v3-snapshot.pom b/archiva-converter/src/test/expected-files/converted-v3-snapshot.pom similarity index 100% rename from maven-repository-converter/src/test/expected-files/converted-v3-snapshot.pom rename to archiva-converter/src/test/expected-files/converted-v3-snapshot.pom diff --git a/maven-repository-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom b/archiva-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom similarity index 100% rename from maven-repository-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom rename to archiva-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom diff --git a/maven-repository-converter/src/test/expected-files/converted-v3-warnings.pom b/archiva-converter/src/test/expected-files/converted-v3-warnings.pom similarity index 100% rename from maven-repository-converter/src/test/expected-files/converted-v3-warnings.pom rename to archiva-converter/src/test/expected-files/converted-v3-warnings.pom diff --git a/maven-repository-converter/src/test/expected-files/converted-v3.pom b/archiva-converter/src/test/expected-files/converted-v3.pom similarity index 100% rename from maven-repository-converter/src/test/expected-files/converted-v3.pom rename to archiva-converter/src/test/expected-files/converted-v3.pom diff --git a/maven-repository-converter/src/test/expected-files/newversion-artifact-metadata.xml b/archiva-converter/src/test/expected-files/newversion-artifact-metadata.xml similarity index 100% rename from maven-repository-converter/src/test/expected-files/newversion-artifact-metadata.xml rename to archiva-converter/src/test/expected-files/newversion-artifact-metadata.xml diff --git a/maven-repository-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/maven-metadata.xml b/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/maven-metadata.xml similarity index 100% rename from maven-repository-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/maven-metadata.xml rename to archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/maven-metadata.xml diff --git a/maven-repository-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.jar b/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.jar similarity index 100% rename from maven-repository-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.jar rename to archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.jar diff --git a/maven-repository-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom b/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom similarity index 100% rename from maven-repository-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom rename to archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom diff --git a/maven-repository-converter/src/test/expected-files/relocated-test/relocated-v3artifact/maven-metadata.xml b/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/maven-metadata.xml similarity index 100% rename from maven-repository-converter/src/test/expected-files/relocated-test/relocated-v3artifact/maven-metadata.xml rename to archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/maven-metadata.xml diff --git a/maven-repository-converter/src/test/expected-files/test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom b/archiva-converter/src/test/expected-files/test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom similarity index 100% rename from maven-repository-converter/src/test/expected-files/test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom rename to archiva-converter/src/test/expected-files/test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom diff --git a/maven-repository-converter/src/test/expected-files/v3-artifact-metadata.xml b/archiva-converter/src/test/expected-files/v3-artifact-metadata.xml similarity index 100% rename from maven-repository-converter/src/test/expected-files/v3-artifact-metadata.xml rename to archiva-converter/src/test/expected-files/v3-artifact-metadata.xml diff --git a/maven-repository-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml b/archiva-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml similarity index 100% rename from maven-repository-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml rename to archiva-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml diff --git a/maven-repository-converter/src/test/expected-files/v3-snapshot-metadata.xml b/archiva-converter/src/test/expected-files/v3-snapshot-metadata.xml similarity index 100% rename from maven-repository-converter/src/test/expected-files/v3-snapshot-metadata.xml rename to archiva-converter/src/test/expected-files/v3-snapshot-metadata.xml diff --git a/maven-repository-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml b/archiva-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml similarity index 100% rename from maven-repository-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml rename to archiva-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml diff --git a/maven-repository-converter/src/test/expected-files/v3-version-metadata.xml b/archiva-converter/src/test/expected-files/v3-version-metadata.xml similarity index 100% rename from maven-repository-converter/src/test/expected-files/v3-version-metadata.xml rename to archiva-converter/src/test/expected-files/v3-version-metadata.xml diff --git a/maven-repository-converter/src/test/expected-files/v4-artifact-metadata.xml b/archiva-converter/src/test/expected-files/v4-artifact-metadata.xml similarity index 100% rename from maven-repository-converter/src/test/expected-files/v4-artifact-metadata.xml rename to archiva-converter/src/test/expected-files/v4-artifact-metadata.xml diff --git a/maven-repository-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml b/archiva-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml similarity index 100% rename from maven-repository-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml rename to archiva-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml diff --git a/maven-repository-converter/src/test/expected-files/v4-snapshot-metadata.xml b/archiva-converter/src/test/expected-files/v4-snapshot-metadata.xml similarity index 100% rename from maven-repository-converter/src/test/expected-files/v4-snapshot-metadata.xml rename to archiva-converter/src/test/expected-files/v4-snapshot-metadata.xml diff --git a/maven-repository-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml b/archiva-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml similarity index 100% rename from maven-repository-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml rename to archiva-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml diff --git a/maven-repository-converter/src/test/expected-files/v4-version-metadata.xml b/archiva-converter/src/test/expected-files/v4-version-metadata.xml similarity index 100% rename from maven-repository-converter/src/test/expected-files/v4-version-metadata.xml rename to archiva-converter/src/test/expected-files/v4-version-metadata.xml diff --git a/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java b/archiva-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java similarity index 100% rename from maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java rename to archiva-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java diff --git a/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/transaction/CopyFileEventTest.java b/archiva-converter/src/test/java/org/apache/maven/repository/converter/transaction/CopyFileEventTest.java similarity index 100% rename from maven-repository-converter/src/test/java/org/apache/maven/repository/converter/transaction/CopyFileEventTest.java rename to archiva-converter/src/test/java/org/apache/maven/repository/converter/transaction/CopyFileEventTest.java diff --git a/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/transaction/CreateFileEventTest.java b/archiva-converter/src/test/java/org/apache/maven/repository/converter/transaction/CreateFileEventTest.java similarity index 100% rename from maven-repository-converter/src/test/java/org/apache/maven/repository/converter/transaction/CreateFileEventTest.java rename to archiva-converter/src/test/java/org/apache/maven/repository/converter/transaction/CreateFileEventTest.java diff --git a/maven-repository-converter/src/test/resources/org/apache/maven/repository/converter/RepositoryConverterTest.xml b/archiva-converter/src/test/resources/org/apache/maven/repository/converter/RepositoryConverterTest.xml similarity index 100% rename from maven-repository-converter/src/test/resources/org/apache/maven/repository/converter/RepositoryConverterTest.xml rename to archiva-converter/src/test/resources/org/apache/maven/repository/converter/RepositoryConverterTest.xml diff --git a/maven-repository-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.jar b/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.jar similarity index 100% rename from maven-repository-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.jar rename to archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.jar diff --git a/maven-repository-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.pom b/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.pom similarity index 100% rename from maven-repository-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.pom rename to archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.pom diff --git a/maven-repository-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml b/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml similarity index 100% rename from maven-repository-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml rename to archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml diff --git a/maven-repository-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.jar b/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.jar similarity index 100% rename from maven-repository-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.jar rename to archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.jar diff --git a/maven-repository-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.pom b/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.pom similarity index 100% rename from maven-repository-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.pom rename to archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.pom diff --git a/maven-repository-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml b/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml similarity index 100% rename from maven-repository-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml rename to archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml diff --git a/maven-repository-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml b/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml similarity index 100% rename from maven-repository-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml rename to archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml diff --git a/maven-repository-converter/src/test/source-repository/test/jars/artifact-one-1.0.0.jar b/archiva-converter/src/test/source-repository/test/jars/artifact-one-1.0.0.jar similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/jars/artifact-one-1.0.0.jar rename to archiva-converter/src/test/source-repository/test/jars/artifact-one-1.0.0.jar diff --git a/maven-repository-converter/src/test/source-repository/test/jars/artifact-three-1.0.0.jar b/archiva-converter/src/test/source-repository/test/jars/artifact-three-1.0.0.jar similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/jars/artifact-three-1.0.0.jar rename to archiva-converter/src/test/source-repository/test/jars/artifact-three-1.0.0.jar diff --git a/maven-repository-converter/src/test/source-repository/test/jars/artifact-two-1.0.0.jar b/archiva-converter/src/test/source-repository/test/jars/artifact-two-1.0.0.jar similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/jars/artifact-two-1.0.0.jar rename to archiva-converter/src/test/source-repository/test/jars/artifact-two-1.0.0.jar diff --git a/maven-repository-converter/src/test/source-repository/test/jars/dryrun-artifact-1.0.0.jar b/archiva-converter/src/test/source-repository/test/jars/dryrun-artifact-1.0.0.jar similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/jars/dryrun-artifact-1.0.0.jar rename to archiva-converter/src/test/source-repository/test/jars/dryrun-artifact-1.0.0.jar diff --git a/maven-repository-converter/src/test/source-repository/test/jars/existing-artifact-1.0.0.jar b/archiva-converter/src/test/source-repository/test/jars/existing-artifact-1.0.0.jar similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/jars/existing-artifact-1.0.0.jar rename to archiva-converter/src/test/source-repository/test/jars/existing-artifact-1.0.0.jar diff --git a/maven-repository-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar b/archiva-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar rename to archiva-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar diff --git a/maven-repository-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5 b/archiva-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5 similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5 rename to archiva-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5 diff --git a/maven-repository-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar b/archiva-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar rename to archiva-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar diff --git a/maven-repository-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1 b/archiva-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1 similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1 rename to archiva-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1 diff --git a/maven-repository-converter/src/test/source-repository/test/jars/modified-artifact-1.0.0.jar b/archiva-converter/src/test/source-repository/test/jars/modified-artifact-1.0.0.jar similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/jars/modified-artifact-1.0.0.jar rename to archiva-converter/src/test/source-repository/test/jars/modified-artifact-1.0.0.jar diff --git a/maven-repository-converter/src/test/source-repository/test/jars/newversion-artifact-1.0.1.jar b/archiva-converter/src/test/source-repository/test/jars/newversion-artifact-1.0.1.jar similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/jars/newversion-artifact-1.0.1.jar rename to archiva-converter/src/test/source-repository/test/jars/newversion-artifact-1.0.1.jar diff --git a/maven-repository-converter/src/test/source-repository/test/jars/noPomArtifact-1.0.0.jar b/archiva-converter/src/test/source-repository/test/jars/noPomArtifact-1.0.0.jar similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/jars/noPomArtifact-1.0.0.jar rename to archiva-converter/src/test/source-repository/test/jars/noPomArtifact-1.0.0.jar diff --git a/maven-repository-converter/src/test/source-repository/test/jars/relocated-v3artifact-1.0.0.jar b/archiva-converter/src/test/source-repository/test/jars/relocated-v3artifact-1.0.0.jar similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/jars/relocated-v3artifact-1.0.0.jar rename to archiva-converter/src/test/source-repository/test/jars/relocated-v3artifact-1.0.0.jar diff --git a/maven-repository-converter/src/test/source-repository/test/jars/rollback-created-artifact-1.0.0.jar b/archiva-converter/src/test/source-repository/test/jars/rollback-created-artifact-1.0.0.jar similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/jars/rollback-created-artifact-1.0.0.jar rename to archiva-converter/src/test/source-repository/test/jars/rollback-created-artifact-1.0.0.jar diff --git a/maven-repository-converter/src/test/source-repository/test/jars/unmodified-artifact-1.0.0.jar b/archiva-converter/src/test/source-repository/test/jars/unmodified-artifact-1.0.0.jar similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/jars/unmodified-artifact-1.0.0.jar rename to archiva-converter/src/test/source-repository/test/jars/unmodified-artifact-1.0.0.jar diff --git a/maven-repository-converter/src/test/source-repository/test/jars/v3-warnings-artifact-1.0.0.jar b/archiva-converter/src/test/source-repository/test/jars/v3-warnings-artifact-1.0.0.jar similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/jars/v3-warnings-artifact-1.0.0.jar rename to archiva-converter/src/test/source-repository/test/jars/v3-warnings-artifact-1.0.0.jar diff --git a/maven-repository-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar b/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar rename to archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar diff --git a/maven-repository-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar b/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar rename to archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar diff --git a/maven-repository-converter/src/test/source-repository/test/jars/v3artifact-1.0.0.jar b/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0.jar similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/jars/v3artifact-1.0.0.jar rename to archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0.jar diff --git a/maven-repository-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar b/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar rename to archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar diff --git a/maven-repository-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar b/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar rename to archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar diff --git a/maven-repository-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar b/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar rename to archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar diff --git a/maven-repository-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.md5 b/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.md5 similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.md5 rename to archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.md5 diff --git a/maven-repository-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.sha1 b/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.sha1 similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.sha1 rename to archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.sha1 diff --git a/maven-repository-converter/src/test/source-repository/test/poms/artifact-one-1.0.0.pom b/archiva-converter/src/test/source-repository/test/poms/artifact-one-1.0.0.pom similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/poms/artifact-one-1.0.0.pom rename to archiva-converter/src/test/source-repository/test/poms/artifact-one-1.0.0.pom diff --git a/maven-repository-converter/src/test/source-repository/test/poms/artifact-three-1.0.0.pom b/archiva-converter/src/test/source-repository/test/poms/artifact-three-1.0.0.pom similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/poms/artifact-three-1.0.0.pom rename to archiva-converter/src/test/source-repository/test/poms/artifact-three-1.0.0.pom diff --git a/maven-repository-converter/src/test/source-repository/test/poms/artifact-two-1.0.0.pom b/archiva-converter/src/test/source-repository/test/poms/artifact-two-1.0.0.pom similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/poms/artifact-two-1.0.0.pom rename to archiva-converter/src/test/source-repository/test/poms/artifact-two-1.0.0.pom diff --git a/maven-repository-converter/src/test/source-repository/test/poms/dryrun-artifact-1.0.0.pom b/archiva-converter/src/test/source-repository/test/poms/dryrun-artifact-1.0.0.pom similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/poms/dryrun-artifact-1.0.0.pom rename to archiva-converter/src/test/source-repository/test/poms/dryrun-artifact-1.0.0.pom diff --git a/maven-repository-converter/src/test/source-repository/test/poms/incorrectMd5Artifact-1.0.0.pom b/archiva-converter/src/test/source-repository/test/poms/incorrectMd5Artifact-1.0.0.pom similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/poms/incorrectMd5Artifact-1.0.0.pom rename to archiva-converter/src/test/source-repository/test/poms/incorrectMd5Artifact-1.0.0.pom diff --git a/maven-repository-converter/src/test/source-repository/test/poms/incorrectSha1Artifact-1.0.0.pom b/archiva-converter/src/test/source-repository/test/poms/incorrectSha1Artifact-1.0.0.pom similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/poms/incorrectSha1Artifact-1.0.0.pom rename to archiva-converter/src/test/source-repository/test/poms/incorrectSha1Artifact-1.0.0.pom diff --git a/maven-repository-converter/src/test/source-repository/test/poms/modified-artifact-1.0.0.pom b/archiva-converter/src/test/source-repository/test/poms/modified-artifact-1.0.0.pom similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/poms/modified-artifact-1.0.0.pom rename to archiva-converter/src/test/source-repository/test/poms/modified-artifact-1.0.0.pom diff --git a/maven-repository-converter/src/test/source-repository/test/poms/newversion-artifact-1.0.1.pom b/archiva-converter/src/test/source-repository/test/poms/newversion-artifact-1.0.1.pom similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/poms/newversion-artifact-1.0.1.pom rename to archiva-converter/src/test/source-repository/test/poms/newversion-artifact-1.0.1.pom diff --git a/maven-repository-converter/src/test/source-repository/test/poms/relocated-v3artifact-1.0.0.pom b/archiva-converter/src/test/source-repository/test/poms/relocated-v3artifact-1.0.0.pom similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/poms/relocated-v3artifact-1.0.0.pom rename to archiva-converter/src/test/source-repository/test/poms/relocated-v3artifact-1.0.0.pom diff --git a/maven-repository-converter/src/test/source-repository/test/poms/rollback-created-artifact-1.0.0.pom b/archiva-converter/src/test/source-repository/test/poms/rollback-created-artifact-1.0.0.pom similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/poms/rollback-created-artifact-1.0.0.pom rename to archiva-converter/src/test/source-repository/test/poms/rollback-created-artifact-1.0.0.pom diff --git a/maven-repository-converter/src/test/source-repository/test/poms/unmodified-artifact-1.0.0.pom b/archiva-converter/src/test/source-repository/test/poms/unmodified-artifact-1.0.0.pom similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/poms/unmodified-artifact-1.0.0.pom rename to archiva-converter/src/test/source-repository/test/poms/unmodified-artifact-1.0.0.pom diff --git a/maven-repository-converter/src/test/source-repository/test/poms/v3-warnings-artifact-1.0.0.pom b/archiva-converter/src/test/source-repository/test/poms/v3-warnings-artifact-1.0.0.pom similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/poms/v3-warnings-artifact-1.0.0.pom rename to archiva-converter/src/test/source-repository/test/poms/v3-warnings-artifact-1.0.0.pom diff --git a/maven-repository-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom b/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom rename to archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom diff --git a/maven-repository-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom b/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom rename to archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom diff --git a/maven-repository-converter/src/test/source-repository/test/poms/v3artifact-1.0.0.pom b/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0.pom similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/poms/v3artifact-1.0.0.pom rename to archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0.pom diff --git a/maven-repository-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom b/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom rename to archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom diff --git a/maven-repository-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom b/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom rename to archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom diff --git a/maven-repository-converter/src/test/source-repository/test/poms/v4artifact-1.0.0.pom b/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0.pom similarity index 100% rename from maven-repository-converter/src/test/source-repository/test/poms/v4artifact-1.0.0.pom rename to archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0.pom diff --git a/maven-repository-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.jar b/archiva-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.jar similarity index 100% rename from maven-repository-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.jar rename to archiva-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.jar diff --git a/maven-repository-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.pom b/archiva-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.pom similarity index 100% rename from maven-repository-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.pom rename to archiva-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.pom diff --git a/maven-repository-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.jar b/archiva-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.jar similarity index 100% rename from maven-repository-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.jar rename to archiva-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.jar diff --git a/maven-repository-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.pom b/archiva-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.pom similarity index 100% rename from maven-repository-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.pom rename to archiva-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.pom diff --git a/maven-repository-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml b/archiva-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml similarity index 100% rename from maven-repository-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml rename to archiva-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml diff --git a/maven-repository-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.jar b/archiva-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.jar similarity index 100% rename from maven-repository-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.jar rename to archiva-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.jar diff --git a/maven-repository-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.pom b/archiva-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.pom similarity index 100% rename from maven-repository-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.pom rename to archiva-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.pom diff --git a/maven-repository-core/pom.xml b/archiva-core/pom.xml similarity index 54% rename from maven-repository-core/pom.xml rename to archiva-core/pom.xml index 19c9874f5..8862ab6b3 100644 --- a/maven-repository-core/pom.xml +++ b/archiva-core/pom.xml @@ -1,33 +1,33 @@ - maven-repository-manager - org.apache.maven.repository + archiva + org.apache.maven.archiva 1.0-SNAPSHOT 4.0.0 - maven-repository-core - Maven Repository Manager Core + archiva-core + Archiva Core - org.apache.maven.repository - maven-repository-configuration + org.apache.maven.archiva + archiva-configuration - org.apache.maven.repository - maven-repository-converter + org.apache.maven.archiva + archiva-converter - org.apache.maven.repository - maven-repository-discovery + org.apache.maven.archiva + archiva-discoverer - org.apache.maven.repository - maven-repository-proxy + org.apache.maven.archiva + archiva-proxy - org.apache.maven.repository - maven-repository-reports-standard + org.apache.maven.archiva + archiva-reports-standard org.codehaus.plexus diff --git a/maven-repository-core/src/main/java/org/apache/maven/repository/DefaultRepositoryManager.java b/archiva-core/src/main/java/org/apache/maven/repository/DefaultRepositoryManager.java similarity index 100% rename from maven-repository-core/src/main/java/org/apache/maven/repository/DefaultRepositoryManager.java rename to archiva-core/src/main/java/org/apache/maven/repository/DefaultRepositoryManager.java diff --git a/maven-repository-core/src/main/java/org/apache/maven/repository/RepositoryManager.java b/archiva-core/src/main/java/org/apache/maven/repository/RepositoryManager.java similarity index 100% rename from maven-repository-core/src/main/java/org/apache/maven/repository/RepositoryManager.java rename to archiva-core/src/main/java/org/apache/maven/repository/RepositoryManager.java diff --git a/maven-repository-core/src/main/java/org/apache/maven/repository/configuration/ConfiguredRepositoryFactory.java b/archiva-core/src/main/java/org/apache/maven/repository/configuration/ConfiguredRepositoryFactory.java similarity index 100% rename from maven-repository-core/src/main/java/org/apache/maven/repository/configuration/ConfiguredRepositoryFactory.java rename to archiva-core/src/main/java/org/apache/maven/repository/configuration/ConfiguredRepositoryFactory.java diff --git a/maven-repository-core/src/main/java/org/apache/maven/repository/configuration/DefaultConfiguredRepositoryFactory.java b/archiva-core/src/main/java/org/apache/maven/repository/configuration/DefaultConfiguredRepositoryFactory.java similarity index 100% rename from maven-repository-core/src/main/java/org/apache/maven/repository/configuration/DefaultConfiguredRepositoryFactory.java rename to archiva-core/src/main/java/org/apache/maven/repository/configuration/DefaultConfiguredRepositoryFactory.java diff --git a/maven-repository-core/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java b/archiva-core/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java similarity index 100% rename from maven-repository-core/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java rename to archiva-core/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java diff --git a/maven-repository-core/src/main/java/org/apache/maven/repository/proxy/ProxiedRepositoryGroup.java b/archiva-core/src/main/java/org/apache/maven/repository/proxy/ProxiedRepositoryGroup.java similarity index 100% rename from maven-repository-core/src/main/java/org/apache/maven/repository/proxy/ProxiedRepositoryGroup.java rename to archiva-core/src/main/java/org/apache/maven/repository/proxy/ProxiedRepositoryGroup.java diff --git a/maven-repository-core/src/main/java/org/apache/maven/repository/proxy/ProxyManager.java b/archiva-core/src/main/java/org/apache/maven/repository/proxy/ProxyManager.java similarity index 100% rename from maven-repository-core/src/main/java/org/apache/maven/repository/proxy/ProxyManager.java rename to archiva-core/src/main/java/org/apache/maven/repository/proxy/ProxyManager.java diff --git a/maven-repository-core/src/main/java/org/apache/maven/repository/scheduler/DefaultRepositoryTaskScheduler.java b/archiva-core/src/main/java/org/apache/maven/repository/scheduler/DefaultRepositoryTaskScheduler.java similarity index 100% rename from maven-repository-core/src/main/java/org/apache/maven/repository/scheduler/DefaultRepositoryTaskScheduler.java rename to archiva-core/src/main/java/org/apache/maven/repository/scheduler/DefaultRepositoryTaskScheduler.java diff --git a/maven-repository-core/src/main/java/org/apache/maven/repository/scheduler/IndexerTask.java b/archiva-core/src/main/java/org/apache/maven/repository/scheduler/IndexerTask.java similarity index 100% rename from maven-repository-core/src/main/java/org/apache/maven/repository/scheduler/IndexerTask.java rename to archiva-core/src/main/java/org/apache/maven/repository/scheduler/IndexerTask.java diff --git a/maven-repository-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTask.java b/archiva-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTask.java similarity index 100% rename from maven-repository-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTask.java rename to archiva-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTask.java diff --git a/maven-repository-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTaskJob.java b/archiva-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTaskJob.java similarity index 100% rename from maven-repository-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTaskJob.java rename to archiva-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTaskJob.java diff --git a/maven-repository-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTaskScheduler.java b/archiva-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTaskScheduler.java similarity index 100% rename from maven-repository-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTaskScheduler.java rename to archiva-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTaskScheduler.java diff --git a/maven-repository-core/src/main/java/org/apache/maven/repository/scheduler/TaskExecutionException.java b/archiva-core/src/main/java/org/apache/maven/repository/scheduler/TaskExecutionException.java similarity index 100% rename from maven-repository-core/src/main/java/org/apache/maven/repository/scheduler/TaskExecutionException.java rename to archiva-core/src/main/java/org/apache/maven/repository/scheduler/TaskExecutionException.java diff --git a/maven-repository-core/src/test/java/org/apache/maven/repository/RepositoryManagerTest.java b/archiva-core/src/test/java/org/apache/maven/repository/RepositoryManagerTest.java similarity index 100% rename from maven-repository-core/src/test/java/org/apache/maven/repository/RepositoryManagerTest.java rename to archiva-core/src/test/java/org/apache/maven/repository/RepositoryManagerTest.java diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/artifact-one-1.0.0.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/artifact-one-1.0.0.jar similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/jars/artifact-one-1.0.0.jar rename to archiva-core/src/test/maven-1.x-repository/test/jars/artifact-one-1.0.0.jar diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/artifact-three-1.0.0.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/artifact-three-1.0.0.jar similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/jars/artifact-three-1.0.0.jar rename to archiva-core/src/test/maven-1.x-repository/test/jars/artifact-three-1.0.0.jar diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/artifact-two-1.0.0.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/artifact-two-1.0.0.jar similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/jars/artifact-two-1.0.0.jar rename to archiva-core/src/test/maven-1.x-repository/test/jars/artifact-two-1.0.0.jar diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/dryrun-artifact-1.0.0.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/dryrun-artifact-1.0.0.jar similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/jars/dryrun-artifact-1.0.0.jar rename to archiva-core/src/test/maven-1.x-repository/test/jars/dryrun-artifact-1.0.0.jar diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/existing-artifact-1.0.0.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/existing-artifact-1.0.0.jar similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/jars/existing-artifact-1.0.0.jar rename to archiva-core/src/test/maven-1.x-repository/test/jars/existing-artifact-1.0.0.jar diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/incorrectMd5Artifact-1.0.0.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/incorrectMd5Artifact-1.0.0.jar similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/jars/incorrectMd5Artifact-1.0.0.jar rename to archiva-core/src/test/maven-1.x-repository/test/jars/incorrectMd5Artifact-1.0.0.jar diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5 b/archiva-core/src/test/maven-1.x-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5 similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5 rename to archiva-core/src/test/maven-1.x-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5 diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/incorrectSha1Artifact-1.0.0.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/incorrectSha1Artifact-1.0.0.jar similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/jars/incorrectSha1Artifact-1.0.0.jar rename to archiva-core/src/test/maven-1.x-repository/test/jars/incorrectSha1Artifact-1.0.0.jar diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1 b/archiva-core/src/test/maven-1.x-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1 similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1 rename to archiva-core/src/test/maven-1.x-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1 diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/modified-artifact-1.0.0.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/modified-artifact-1.0.0.jar similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/jars/modified-artifact-1.0.0.jar rename to archiva-core/src/test/maven-1.x-repository/test/jars/modified-artifact-1.0.0.jar diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/newversion-artifact-1.0.1.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/newversion-artifact-1.0.1.jar similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/jars/newversion-artifact-1.0.1.jar rename to archiva-core/src/test/maven-1.x-repository/test/jars/newversion-artifact-1.0.1.jar diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/noPomArtifact-1.0.0.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/noPomArtifact-1.0.0.jar similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/jars/noPomArtifact-1.0.0.jar rename to archiva-core/src/test/maven-1.x-repository/test/jars/noPomArtifact-1.0.0.jar diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/relocated-v3artifact-1.0.0.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/relocated-v3artifact-1.0.0.jar similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/jars/relocated-v3artifact-1.0.0.jar rename to archiva-core/src/test/maven-1.x-repository/test/jars/relocated-v3artifact-1.0.0.jar diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/rollback-created-artifact-1.0.0.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/rollback-created-artifact-1.0.0.jar similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/jars/rollback-created-artifact-1.0.0.jar rename to archiva-core/src/test/maven-1.x-repository/test/jars/rollback-created-artifact-1.0.0.jar diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/unmodified-artifact-1.0.0.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/unmodified-artifact-1.0.0.jar similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/jars/unmodified-artifact-1.0.0.jar rename to archiva-core/src/test/maven-1.x-repository/test/jars/unmodified-artifact-1.0.0.jar diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/v3-warnings-artifact-1.0.0.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/v3-warnings-artifact-1.0.0.jar similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/jars/v3-warnings-artifact-1.0.0.jar rename to archiva-core/src/test/maven-1.x-repository/test/jars/v3-warnings-artifact-1.0.0.jar diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar rename to archiva-core/src/test/maven-1.x-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar rename to archiva-core/src/test/maven-1.x-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/v3artifact-1.0.0.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/v3artifact-1.0.0.jar similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/jars/v3artifact-1.0.0.jar rename to archiva-core/src/test/maven-1.x-repository/test/jars/v3artifact-1.0.0.jar diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar rename to archiva-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar rename to archiva-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0.jar similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0.jar rename to archiva-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0.jar diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0.jar.md5 b/archiva-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0.jar.md5 similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0.jar.md5 rename to archiva-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0.jar.md5 diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0.jar.sha1 b/archiva-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0.jar.sha1 similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0.jar.sha1 rename to archiva-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0.jar.sha1 diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/artifact-one-1.0.0.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/artifact-one-1.0.0.pom similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/poms/artifact-one-1.0.0.pom rename to archiva-core/src/test/maven-1.x-repository/test/poms/artifact-one-1.0.0.pom diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/artifact-three-1.0.0.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/artifact-three-1.0.0.pom similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/poms/artifact-three-1.0.0.pom rename to archiva-core/src/test/maven-1.x-repository/test/poms/artifact-three-1.0.0.pom diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/artifact-two-1.0.0.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/artifact-two-1.0.0.pom similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/poms/artifact-two-1.0.0.pom rename to archiva-core/src/test/maven-1.x-repository/test/poms/artifact-two-1.0.0.pom diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/dryrun-artifact-1.0.0.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/dryrun-artifact-1.0.0.pom similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/poms/dryrun-artifact-1.0.0.pom rename to archiva-core/src/test/maven-1.x-repository/test/poms/dryrun-artifact-1.0.0.pom diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/incorrectMd5Artifact-1.0.0.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/incorrectMd5Artifact-1.0.0.pom similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/poms/incorrectMd5Artifact-1.0.0.pom rename to archiva-core/src/test/maven-1.x-repository/test/poms/incorrectMd5Artifact-1.0.0.pom diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/incorrectSha1Artifact-1.0.0.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/incorrectSha1Artifact-1.0.0.pom similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/poms/incorrectSha1Artifact-1.0.0.pom rename to archiva-core/src/test/maven-1.x-repository/test/poms/incorrectSha1Artifact-1.0.0.pom diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/modified-artifact-1.0.0.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/modified-artifact-1.0.0.pom similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/poms/modified-artifact-1.0.0.pom rename to archiva-core/src/test/maven-1.x-repository/test/poms/modified-artifact-1.0.0.pom diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/newversion-artifact-1.0.1.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/newversion-artifact-1.0.1.pom similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/poms/newversion-artifact-1.0.1.pom rename to archiva-core/src/test/maven-1.x-repository/test/poms/newversion-artifact-1.0.1.pom diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/relocated-v3artifact-1.0.0.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/relocated-v3artifact-1.0.0.pom similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/poms/relocated-v3artifact-1.0.0.pom rename to archiva-core/src/test/maven-1.x-repository/test/poms/relocated-v3artifact-1.0.0.pom diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/rollback-created-artifact-1.0.0.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/rollback-created-artifact-1.0.0.pom similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/poms/rollback-created-artifact-1.0.0.pom rename to archiva-core/src/test/maven-1.x-repository/test/poms/rollback-created-artifact-1.0.0.pom diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/unmodified-artifact-1.0.0.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/unmodified-artifact-1.0.0.pom similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/poms/unmodified-artifact-1.0.0.pom rename to archiva-core/src/test/maven-1.x-repository/test/poms/unmodified-artifact-1.0.0.pom diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/v3-warnings-artifact-1.0.0.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/v3-warnings-artifact-1.0.0.pom similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/poms/v3-warnings-artifact-1.0.0.pom rename to archiva-core/src/test/maven-1.x-repository/test/poms/v3-warnings-artifact-1.0.0.pom diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom rename to archiva-core/src/test/maven-1.x-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom rename to archiva-core/src/test/maven-1.x-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/v3artifact-1.0.0.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/v3artifact-1.0.0.pom similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/poms/v3artifact-1.0.0.pom rename to archiva-core/src/test/maven-1.x-repository/test/poms/v3artifact-1.0.0.pom diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom rename to archiva-core/src/test/maven-1.x-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom rename to archiva-core/src/test/maven-1.x-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/v4artifact-1.0.0.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/v4artifact-1.0.0.pom similarity index 100% rename from maven-repository-core/src/test/maven-1.x-repository/test/poms/v4artifact-1.0.0.pom rename to archiva-core/src/test/maven-1.x-repository/test/poms/v4artifact-1.0.0.pom diff --git a/maven-repository-discovery/pom.xml b/archiva-discoverer/pom.xml similarity index 84% rename from maven-repository-discovery/pom.xml rename to archiva-discoverer/pom.xml index dfd1a8b7f..fed41016b 100755 --- a/maven-repository-discovery/pom.xml +++ b/archiva-discoverer/pom.xml @@ -17,17 +17,17 @@ - org.apache.maven.repository - maven-repository-manager + org.apache.maven.archiva + archiva 1.0-SNAPSHOT 4.0.0 - maven-repository-discovery - Maven Repository Artifact Discovery + archiva-discoverer + Archiva Artifact Discoverer - org.apache.maven.repository - maven-repository-utils + org.apache.maven.archiva + archiva-utils org.codehaus.plexus diff --git a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/AbstractArtifactDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/AbstractArtifactDiscoverer.java similarity index 100% rename from maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/AbstractArtifactDiscoverer.java rename to archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/AbstractArtifactDiscoverer.java diff --git a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/AbstractDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/AbstractDiscoverer.java similarity index 100% rename from maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/AbstractDiscoverer.java rename to archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/AbstractDiscoverer.java diff --git a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/ArtifactDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/ArtifactDiscoverer.java similarity index 100% rename from maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/ArtifactDiscoverer.java rename to archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/ArtifactDiscoverer.java diff --git a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultArtifactDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/DefaultArtifactDiscoverer.java similarity index 100% rename from maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultArtifactDiscoverer.java rename to archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/DefaultArtifactDiscoverer.java diff --git a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultMetadataDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/DefaultMetadataDiscoverer.java similarity index 100% rename from maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultMetadataDiscoverer.java rename to archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/DefaultMetadataDiscoverer.java diff --git a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/Discoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/Discoverer.java similarity index 100% rename from maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/Discoverer.java rename to archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/Discoverer.java diff --git a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DiscovererException.java b/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/DiscovererException.java similarity index 100% rename from maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DiscovererException.java rename to archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/DiscovererException.java diff --git a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DiscovererPath.java b/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/DiscovererPath.java similarity index 100% rename from maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DiscovererPath.java rename to archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/DiscovererPath.java diff --git a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/LegacyArtifactDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/LegacyArtifactDiscoverer.java similarity index 100% rename from maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/LegacyArtifactDiscoverer.java rename to archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/LegacyArtifactDiscoverer.java diff --git a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/MetadataDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/MetadataDiscoverer.java similarity index 100% rename from maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/MetadataDiscoverer.java rename to archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/MetadataDiscoverer.java diff --git a/maven-repository-discovery/src/site/apt/design.apt b/archiva-discoverer/src/site/apt/design.apt similarity index 100% rename from maven-repository-discovery/src/site/apt/design.apt rename to archiva-discoverer/src/site/apt/design.apt diff --git a/maven-repository-discovery/src/site/site.xml b/archiva-discoverer/src/site/site.xml similarity index 100% rename from maven-repository-discovery/src/site/site.xml rename to archiva-discoverer/src/site/site.xml diff --git a/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/AbstractArtifactDiscovererTest.java b/archiva-discoverer/src/test/java/org/apache/maven/repository/discovery/AbstractArtifactDiscovererTest.java similarity index 100% rename from maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/AbstractArtifactDiscovererTest.java rename to archiva-discoverer/src/test/java/org/apache/maven/repository/discovery/AbstractArtifactDiscovererTest.java diff --git a/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java b/archiva-discoverer/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java similarity index 100% rename from maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java rename to archiva-discoverer/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java diff --git a/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultMetadataDiscovererTest.java b/archiva-discoverer/src/test/java/org/apache/maven/repository/discovery/DefaultMetadataDiscovererTest.java similarity index 100% rename from maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultMetadataDiscovererTest.java rename to archiva-discoverer/src/test/java/org/apache/maven/repository/discovery/DefaultMetadataDiscovererTest.java diff --git a/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java b/archiva-discoverer/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java similarity index 100% rename from maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java rename to archiva-discoverer/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java diff --git a/maven-repository-discovery/src/test/legacy-repository/KEYS b/archiva-discoverer/src/test/legacy-repository/KEYS similarity index 100% rename from maven-repository-discovery/src/test/legacy-repository/KEYS rename to archiva-discoverer/src/test/legacy-repository/KEYS diff --git a/maven-repository-discovery/src/test/legacy-repository/invalid/foo/invalid-1.0.foo b/archiva-discoverer/src/test/legacy-repository/invalid/foo/invalid-1.0.foo similarity index 100% rename from maven-repository-discovery/src/test/legacy-repository/invalid/foo/invalid-1.0.foo rename to archiva-discoverer/src/test/legacy-repository/invalid/foo/invalid-1.0.foo diff --git a/maven-repository-discovery/src/test/legacy-repository/invalid/invalid-1.0.jar b/archiva-discoverer/src/test/legacy-repository/invalid/invalid-1.0.jar similarity index 100% rename from maven-repository-discovery/src/test/legacy-repository/invalid/invalid-1.0.jar rename to archiva-discoverer/src/test/legacy-repository/invalid/invalid-1.0.jar diff --git a/maven-repository-discovery/src/test/legacy-repository/invalid/jars/1.0/invalid-1.0.jar b/archiva-discoverer/src/test/legacy-repository/invalid/jars/1.0/invalid-1.0.jar similarity index 100% rename from maven-repository-discovery/src/test/legacy-repository/invalid/jars/1.0/invalid-1.0.jar rename to archiva-discoverer/src/test/legacy-repository/invalid/jars/1.0/invalid-1.0.jar diff --git a/maven-repository-discovery/src/test/legacy-repository/invalid/jars/invalid-1.0.rar b/archiva-discoverer/src/test/legacy-repository/invalid/jars/invalid-1.0.rar similarity index 100% rename from maven-repository-discovery/src/test/legacy-repository/invalid/jars/invalid-1.0.rar rename to archiva-discoverer/src/test/legacy-repository/invalid/jars/invalid-1.0.rar diff --git a/maven-repository-discovery/src/test/legacy-repository/invalid/jars/invalid.jar b/archiva-discoverer/src/test/legacy-repository/invalid/jars/invalid.jar similarity index 100% rename from maven-repository-discovery/src/test/legacy-repository/invalid/jars/invalid.jar rename to archiva-discoverer/src/test/legacy-repository/invalid/jars/invalid.jar diff --git a/maven-repository-discovery/src/test/legacy-repository/invalid/jars/no-extension b/archiva-discoverer/src/test/legacy-repository/invalid/jars/no-extension similarity index 100% rename from maven-repository-discovery/src/test/legacy-repository/invalid/jars/no-extension rename to archiva-discoverer/src/test/legacy-repository/invalid/jars/no-extension diff --git a/maven-repository-discovery/src/test/legacy-repository/javax.sql/jars/jdbc-2.0.jar b/archiva-discoverer/src/test/legacy-repository/javax.sql/jars/jdbc-2.0.jar similarity index 100% rename from maven-repository-discovery/src/test/legacy-repository/javax.sql/jars/jdbc-2.0.jar rename to archiva-discoverer/src/test/legacy-repository/javax.sql/jars/jdbc-2.0.jar diff --git a/maven-repository-discovery/src/test/legacy-repository/org.apache.maven.update/jars/test-not-updated-1.0.jar b/archiva-discoverer/src/test/legacy-repository/org.apache.maven.update/jars/test-not-updated-1.0.jar similarity index 100% rename from maven-repository-discovery/src/test/legacy-repository/org.apache.maven.update/jars/test-not-updated-1.0.jar rename to archiva-discoverer/src/test/legacy-repository/org.apache.maven.update/jars/test-not-updated-1.0.jar diff --git a/maven-repository-discovery/src/test/legacy-repository/org.apache.maven.update/jars/test-updated-1.0.jar b/archiva-discoverer/src/test/legacy-repository/org.apache.maven.update/jars/test-updated-1.0.jar similarity index 100% rename from maven-repository-discovery/src/test/legacy-repository/org.apache.maven.update/jars/test-updated-1.0.jar rename to archiva-discoverer/src/test/legacy-repository/org.apache.maven.update/jars/test-updated-1.0.jar diff --git a/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/some-ejb-1.0-client.jar b/archiva-discoverer/src/test/legacy-repository/org.apache.maven/jars/some-ejb-1.0-client.jar similarity index 100% rename from maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/some-ejb-1.0-client.jar rename to archiva-discoverer/src/test/legacy-repository/org.apache.maven/jars/some-ejb-1.0-client.jar diff --git a/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-20050611.112233-1.jar b/archiva-discoverer/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-20050611.112233-1.jar similarity index 100% rename from maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-20050611.112233-1.jar rename to archiva-discoverer/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-20050611.112233-1.jar diff --git a/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-sources.jar b/archiva-discoverer/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-sources.jar similarity index 100% rename from maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-sources.jar rename to archiva-discoverer/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-sources.jar diff --git a/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.jar b/archiva-discoverer/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.jar similarity index 100% rename from maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.jar rename to archiva-discoverer/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.jar diff --git a/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.tar.gz b/archiva-discoverer/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.tar.gz similarity index 100% rename from maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.tar.gz rename to archiva-discoverer/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.tar.gz diff --git a/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.zip b/archiva-discoverer/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.zip similarity index 100% rename from maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.zip rename to archiva-discoverer/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.zip diff --git a/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-UNKNOWN.jar b/archiva-discoverer/src/test/legacy-repository/org.apache.maven/jars/testing-UNKNOWN.jar similarity index 100% rename from maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-UNKNOWN.jar rename to archiva-discoverer/src/test/legacy-repository/org.apache.maven/jars/testing-UNKNOWN.jar diff --git a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/A/1.0/A-1.0.pom b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/A/1.0/A-1.0.pom similarity index 100% rename from maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/A/1.0/A-1.0.pom rename to archiva-discoverer/src/test/pom-artifacts/org/apache/maven/A/1.0/A-1.0.pom diff --git a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/A/1.0/A-1.0.war b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/A/1.0/A-1.0.war similarity index 100% rename from maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/A/1.0/A-1.0.war rename to archiva-discoverer/src/test/pom-artifacts/org/apache/maven/A/1.0/A-1.0.war diff --git a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/B/1.0/B-1.0.pom b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/B/1.0/B-1.0.pom similarity index 100% rename from maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/B/1.0/B-1.0.pom rename to archiva-discoverer/src/test/pom-artifacts/org/apache/maven/B/1.0/B-1.0.pom diff --git a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/B/2.0/B-2.0.pom b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/B/2.0/B-2.0.pom similarity index 100% rename from maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/B/2.0/B-2.0.pom rename to archiva-discoverer/src/test/pom-artifacts/org/apache/maven/B/2.0/B-2.0.pom diff --git a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/C/1.0/C-1.0.pom b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/C/1.0/C-1.0.pom similarity index 100% rename from maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/C/1.0/C-1.0.pom rename to archiva-discoverer/src/test/pom-artifacts/org/apache/maven/C/1.0/C-1.0.pom diff --git a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/C/1.0/C-1.0.war b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/C/1.0/C-1.0.war similarity index 100% rename from maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/C/1.0/C-1.0.war rename to archiva-discoverer/src/test/pom-artifacts/org/apache/maven/C/1.0/C-1.0.war diff --git a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/discovery/1.0/discovery-1.0.pom b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/discovery/1.0/discovery-1.0.pom similarity index 100% rename from maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/discovery/1.0/discovery-1.0.pom rename to archiva-discoverer/src/test/pom-artifacts/org/apache/maven/discovery/1.0/discovery-1.0.pom diff --git a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/samplejar/1.0/samplejar-1.0.jar b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/samplejar/1.0/samplejar-1.0.jar similarity index 100% rename from maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/samplejar/1.0/samplejar-1.0.jar rename to archiva-discoverer/src/test/pom-artifacts/org/apache/maven/samplejar/1.0/samplejar-1.0.jar diff --git a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/samplejar/1.0/samplejar-1.0.pom b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/samplejar/1.0/samplejar-1.0.pom similarity index 100% rename from maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/samplejar/1.0/samplejar-1.0.pom rename to archiva-discoverer/src/test/pom-artifacts/org/apache/maven/samplejar/1.0/samplejar-1.0.pom diff --git a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/samplejar/2.0/samplejar-2.0.jar b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/samplejar/2.0/samplejar-2.0.jar similarity index 100% rename from maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/samplejar/2.0/samplejar-2.0.jar rename to archiva-discoverer/src/test/pom-artifacts/org/apache/maven/samplejar/2.0/samplejar-2.0.jar diff --git a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/samplejar/2.0/samplejar-2.0.pom b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/samplejar/2.0/samplejar-2.0.pom similarity index 100% rename from maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/samplejar/2.0/samplejar-2.0.pom rename to archiva-discoverer/src/test/pom-artifacts/org/apache/maven/samplejar/2.0/samplejar-2.0.pom diff --git a/maven-repository-discovery/src/test/pom-artifacts/org/apache/testgroup/discovery/1.0/discovery-1.0.pom b/archiva-discoverer/src/test/pom-artifacts/org/apache/testgroup/discovery/1.0/discovery-1.0.pom similarity index 100% rename from maven-repository-discovery/src/test/pom-artifacts/org/apache/testgroup/discovery/1.0/discovery-1.0.pom rename to archiva-discoverer/src/test/pom-artifacts/org/apache/testgroup/discovery/1.0/discovery-1.0.pom diff --git a/maven-repository-discovery/src/test/repository/KEYS b/archiva-discoverer/src/test/repository/KEYS similarity index 100% rename from maven-repository-discovery/src/test/repository/KEYS rename to archiva-discoverer/src/test/repository/KEYS diff --git a/maven-repository-discovery/src/test/repository/invalid/invalid-1.0.jar b/archiva-discoverer/src/test/repository/invalid/invalid-1.0.jar similarity index 100% rename from maven-repository-discovery/src/test/repository/invalid/invalid-1.0.jar rename to archiva-discoverer/src/test/repository/invalid/invalid-1.0.jar diff --git a/maven-repository-discovery/src/test/repository/invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar b/archiva-discoverer/src/test/repository/invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar similarity index 100% rename from maven-repository-discovery/src/test/repository/invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar rename to archiva-discoverer/src/test/repository/invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar diff --git a/maven-repository-discovery/src/test/repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar b/archiva-discoverer/src/test/repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar similarity index 100% rename from maven-repository-discovery/src/test/repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar rename to archiva-discoverer/src/test/repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar diff --git a/maven-repository-discovery/src/test/repository/invalid/invalid/1.0/invalid-1.0b.jar b/archiva-discoverer/src/test/repository/invalid/invalid/1.0/invalid-1.0b.jar similarity index 100% rename from maven-repository-discovery/src/test/repository/invalid/invalid/1.0/invalid-1.0b.jar rename to archiva-discoverer/src/test/repository/invalid/invalid/1.0/invalid-1.0b.jar diff --git a/maven-repository-discovery/src/test/repository/invalid/invalid/1.0/invalid-2.0.jar b/archiva-discoverer/src/test/repository/invalid/invalid/1.0/invalid-2.0.jar similarity index 100% rename from maven-repository-discovery/src/test/repository/invalid/invalid/1.0/invalid-2.0.jar rename to archiva-discoverer/src/test/repository/invalid/invalid/1.0/invalid-2.0.jar diff --git a/maven-repository-discovery/src/test/repository/invalid/invalid/1/invalid-1 b/archiva-discoverer/src/test/repository/invalid/invalid/1/invalid-1 similarity index 100% rename from maven-repository-discovery/src/test/repository/invalid/invalid/1/invalid-1 rename to archiva-discoverer/src/test/repository/invalid/invalid/1/invalid-1 diff --git a/maven-repository-discovery/src/test/repository/javax/maven-metadata.xml b/archiva-discoverer/src/test/repository/javax/maven-metadata.xml similarity index 100% rename from maven-repository-discovery/src/test/repository/javax/maven-metadata.xml rename to archiva-discoverer/src/test/repository/javax/maven-metadata.xml diff --git a/maven-repository-discovery/src/test/repository/javax/sql/jdbc/2.0/jdbc-2.0.jar b/archiva-discoverer/src/test/repository/javax/sql/jdbc/2.0/jdbc-2.0.jar similarity index 100% rename from maven-repository-discovery/src/test/repository/javax/sql/jdbc/2.0/jdbc-2.0.jar rename to archiva-discoverer/src/test/repository/javax/sql/jdbc/2.0/jdbc-2.0.jar diff --git a/maven-repository-discovery/src/test/repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml b/archiva-discoverer/src/test/repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml similarity index 100% rename from maven-repository-discovery/src/test/repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml rename to archiva-discoverer/src/test/repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml diff --git a/maven-repository-discovery/src/test/repository/javax/sql/jdbc/maven-metadata-repository.xml b/archiva-discoverer/src/test/repository/javax/sql/jdbc/maven-metadata-repository.xml similarity index 100% rename from maven-repository-discovery/src/test/repository/javax/sql/jdbc/maven-metadata-repository.xml rename to archiva-discoverer/src/test/repository/javax/sql/jdbc/maven-metadata-repository.xml diff --git a/maven-repository-discovery/src/test/repository/javax/sql/maven-metadata-repository.xml b/archiva-discoverer/src/test/repository/javax/sql/maven-metadata-repository.xml similarity index 100% rename from maven-repository-discovery/src/test/repository/javax/sql/maven-metadata-repository.xml rename to archiva-discoverer/src/test/repository/javax/sql/maven-metadata-repository.xml diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/A/1.0/A-1.0.pom b/archiva-discoverer/src/test/repository/org/apache/maven/A/1.0/A-1.0.pom similarity index 100% rename from maven-repository-discovery/src/test/repository/org/apache/maven/A/1.0/A-1.0.pom rename to archiva-discoverer/src/test/repository/org/apache/maven/A/1.0/A-1.0.pom diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/A/1.0/A-1.0.war b/archiva-discoverer/src/test/repository/org/apache/maven/A/1.0/A-1.0.war similarity index 100% rename from maven-repository-discovery/src/test/repository/org/apache/maven/A/1.0/A-1.0.war rename to archiva-discoverer/src/test/repository/org/apache/maven/A/1.0/A-1.0.war diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/B/1.0/B-1.0.pom b/archiva-discoverer/src/test/repository/org/apache/maven/B/1.0/B-1.0.pom similarity index 100% rename from maven-repository-discovery/src/test/repository/org/apache/maven/B/1.0/B-1.0.pom rename to archiva-discoverer/src/test/repository/org/apache/maven/B/1.0/B-1.0.pom diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/B/2.0/B-2.0.pom b/archiva-discoverer/src/test/repository/org/apache/maven/B/2.0/B-2.0.pom similarity index 100% rename from maven-repository-discovery/src/test/repository/org/apache/maven/B/2.0/B-2.0.pom rename to archiva-discoverer/src/test/repository/org/apache/maven/B/2.0/B-2.0.pom diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/C/1.0/C-1.0.pom b/archiva-discoverer/src/test/repository/org/apache/maven/C/1.0/C-1.0.pom similarity index 100% rename from maven-repository-discovery/src/test/repository/org/apache/maven/C/1.0/C-1.0.pom rename to archiva-discoverer/src/test/repository/org/apache/maven/C/1.0/C-1.0.pom diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/C/1.0/C-1.0.war b/archiva-discoverer/src/test/repository/org/apache/maven/C/1.0/C-1.0.war similarity index 100% rename from maven-repository-discovery/src/test/repository/org/apache/maven/C/1.0/C-1.0.war rename to archiva-discoverer/src/test/repository/org/apache/maven/C/1.0/C-1.0.war diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/discovery/1.0/discovery-1.0.pom b/archiva-discoverer/src/test/repository/org/apache/maven/discovery/1.0/discovery-1.0.pom similarity index 100% rename from maven-repository-discovery/src/test/repository/org/apache/maven/discovery/1.0/discovery-1.0.pom rename to archiva-discoverer/src/test/repository/org/apache/maven/discovery/1.0/discovery-1.0.pom diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/maven-metadata.xml b/archiva-discoverer/src/test/repository/org/apache/maven/maven-metadata.xml similarity index 100% rename from maven-repository-discovery/src/test/repository/org/apache/maven/maven-metadata.xml rename to archiva-discoverer/src/test/repository/org/apache/maven/maven-metadata.xml diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar b/archiva-discoverer/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar similarity index 100% rename from maven-repository-discovery/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar rename to archiva-discoverer/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom b/archiva-discoverer/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom similarity index 100% rename from maven-repository-discovery/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom rename to archiva-discoverer/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar b/archiva-discoverer/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar similarity index 100% rename from maven-repository-discovery/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar rename to archiva-discoverer/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom b/archiva-discoverer/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom similarity index 100% rename from maven-repository-discovery/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom rename to archiva-discoverer/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml b/archiva-discoverer/src/test/repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml similarity index 100% rename from maven-repository-discovery/src/test/repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml rename to archiva-discoverer/src/test/repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar b/archiva-discoverer/src/test/repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar similarity index 100% rename from maven-repository-discovery/src/test/repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar rename to archiva-discoverer/src/test/repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1-javadoc.jar b/archiva-discoverer/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1-javadoc.jar similarity index 100% rename from maven-repository-discovery/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1-javadoc.jar rename to archiva-discoverer/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1-javadoc.jar diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar b/archiva-discoverer/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar similarity index 100% rename from maven-repository-discovery/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar rename to archiva-discoverer/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar b/archiva-discoverer/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar similarity index 100% rename from maven-repository-discovery/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar rename to archiva-discoverer/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar b/archiva-discoverer/src/test/repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar similarity index 100% rename from maven-repository-discovery/src/test/repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar rename to archiva-discoverer/src/test/repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.jar b/archiva-discoverer/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.jar similarity index 100% rename from maven-repository-discovery/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.jar rename to archiva-discoverer/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.jar diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz b/archiva-discoverer/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz similarity index 100% rename from maven-repository-discovery/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz rename to archiva-discoverer/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.zip b/archiva-discoverer/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.zip similarity index 100% rename from maven-repository-discovery/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.zip rename to archiva-discoverer/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.zip diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.jar b/archiva-discoverer/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.jar similarity index 100% rename from maven-repository-discovery/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.jar rename to archiva-discoverer/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.jar diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.pom b/archiva-discoverer/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.pom similarity index 100% rename from maven-repository-discovery/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.pom rename to archiva-discoverer/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.pom diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml b/archiva-discoverer/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml similarity index 100% rename from maven-repository-discovery/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml rename to archiva-discoverer/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar b/archiva-discoverer/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar similarity index 100% rename from maven-repository-discovery/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar rename to archiva-discoverer/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom b/archiva-discoverer/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom similarity index 100% rename from maven-repository-discovery/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom rename to archiva-discoverer/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml b/archiva-discoverer/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml similarity index 100% rename from maven-repository-discovery/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml rename to archiva-discoverer/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml diff --git a/maven-repository-discovery/src/test/repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom b/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom similarity index 100% rename from maven-repository-discovery/src/test/repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom rename to archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom diff --git a/maven-repository-discovery/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml b/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml similarity index 100% rename from maven-repository-discovery/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml rename to archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml diff --git a/maven-repository-discovery/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml b/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml similarity index 100% rename from maven-repository-discovery/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml rename to archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml diff --git a/maven-repository-indexer/pom.xml b/archiva-indexer/pom.xml similarity index 89% rename from maven-repository-indexer/pom.xml rename to archiva-indexer/pom.xml index 430b63565..8f5aa5e51 100644 --- a/maven-repository-indexer/pom.xml +++ b/archiva-indexer/pom.xml @@ -17,13 +17,13 @@ - org.apache.maven.repository - maven-repository-manager + org.apache.maven.archiva + archiva 1.0-SNAPSHOT 4.0.0 - maven-repository-indexer - Maven Repository Indexer + archiva-indexer + Archiva Repository Indexer org.apache.maven @@ -55,8 +55,8 @@ plexus-container-default - org.apache.maven.repository - maven-repository-utils + org.apache.maven.archiva + archiva-utils org.apache.maven diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryArtifactIndex.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryArtifactIndex.java similarity index 100% rename from maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryArtifactIndex.java rename to archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryArtifactIndex.java diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryArtifactIndexFactory.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryArtifactIndexFactory.java similarity index 100% rename from maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryArtifactIndexFactory.java rename to archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryArtifactIndexFactory.java diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexException.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexException.java similarity index 100% rename from maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexException.java rename to archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexException.java diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexSearchException.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexSearchException.java similarity index 100% rename from maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexSearchException.java rename to archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexSearchException.java diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneIndexRecordConverter.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneIndexRecordConverter.java similarity index 100% rename from maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneIndexRecordConverter.java rename to archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneIndexRecordConverter.java diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalIndexRecordConverter.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalIndexRecordConverter.java similarity index 100% rename from maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalIndexRecordConverter.java rename to archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalIndexRecordConverter.java diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneQuery.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneQuery.java similarity index 100% rename from maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneQuery.java rename to archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneQuery.java diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneRepositoryArtifactIndex.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneRepositoryArtifactIndex.java similarity index 100% rename from maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneRepositoryArtifactIndex.java rename to archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneRepositoryArtifactIndex.java diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneRepositoryArtifactIndexFactory.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneRepositoryArtifactIndexFactory.java similarity index 100% rename from maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneRepositoryArtifactIndexFactory.java rename to archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneRepositoryArtifactIndexFactory.java diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneStandardIndexRecordConverter.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneStandardIndexRecordConverter.java similarity index 100% rename from maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneStandardIndexRecordConverter.java rename to archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneStandardIndexRecordConverter.java diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/CompoundQuery.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/CompoundQuery.java similarity index 100% rename from maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/CompoundQuery.java rename to archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/CompoundQuery.java diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/CompoundQueryTerm.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/CompoundQueryTerm.java similarity index 100% rename from maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/CompoundQueryTerm.java rename to archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/CompoundQueryTerm.java diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/Query.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/Query.java similarity index 100% rename from maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/Query.java rename to archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/Query.java diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/QueryTerm.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/QueryTerm.java similarity index 100% rename from maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/QueryTerm.java rename to archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/QueryTerm.java diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/RangeQuery.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/RangeQuery.java similarity index 100% rename from maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/RangeQuery.java rename to archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/RangeQuery.java diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/SingleTermQuery.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/SingleTermQuery.java similarity index 100% rename from maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/SingleTermQuery.java rename to archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/SingleTermQuery.java diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/AbstractArtifactIndexRecordFactory.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/AbstractArtifactIndexRecordFactory.java similarity index 100% rename from maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/AbstractArtifactIndexRecordFactory.java rename to archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/AbstractArtifactIndexRecordFactory.java diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecord.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecord.java similarity index 100% rename from maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecord.java rename to archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecord.java diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecordFactory.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecordFactory.java similarity index 100% rename from maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecordFactory.java rename to archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecordFactory.java diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalIndexRecordFields.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalIndexRecordFields.java similarity index 100% rename from maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalIndexRecordFields.java rename to archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalIndexRecordFields.java diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/RepositoryIndexRecord.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/RepositoryIndexRecord.java similarity index 100% rename from maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/RepositoryIndexRecord.java rename to archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/RepositoryIndexRecord.java diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/RepositoryIndexRecordFactory.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/RepositoryIndexRecordFactory.java similarity index 100% rename from maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/RepositoryIndexRecordFactory.java rename to archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/RepositoryIndexRecordFactory.java diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecord.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecord.java similarity index 100% rename from maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecord.java rename to archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecord.java diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecordFactory.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecordFactory.java similarity index 100% rename from maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecordFactory.java rename to archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecordFactory.java diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardIndexRecordFields.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardIndexRecordFields.java similarity index 100% rename from maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardIndexRecordFields.java rename to archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardIndexRecordFields.java diff --git a/maven-repository-indexer/src/site/apt/design.apt b/archiva-indexer/src/site/apt/design.apt similarity index 100% rename from maven-repository-indexer/src/site/apt/design.apt rename to archiva-indexer/src/site/apt/design.apt diff --git a/maven-repository-indexer/src/site/site.xml b/archiva-indexer/src/site/site.xml similarity index 100% rename from maven-repository-indexer/src/site/site.xml rename to archiva-indexer/src/site/site.xml diff --git a/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalArtifactIndexSearchTest.java b/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalArtifactIndexSearchTest.java similarity index 100% rename from maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalArtifactIndexSearchTest.java rename to archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalArtifactIndexSearchTest.java diff --git a/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalArtifactIndexTest.java b/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalArtifactIndexTest.java similarity index 100% rename from maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalArtifactIndexTest.java rename to archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalArtifactIndexTest.java diff --git a/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneStandardArtifactIndexSearchTest.java b/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneStandardArtifactIndexSearchTest.java similarity index 100% rename from maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneStandardArtifactIndexSearchTest.java rename to archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneStandardArtifactIndexSearchTest.java diff --git a/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneStandardArtifactIndexTest.java b/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneStandardArtifactIndexTest.java similarity index 100% rename from maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneStandardArtifactIndexTest.java rename to archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneStandardArtifactIndexTest.java diff --git a/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/query/QueryTest.java b/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/query/QueryTest.java similarity index 100% rename from maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/query/QueryTest.java rename to archiva-indexer/src/test/java/org/apache/maven/repository/indexing/query/QueryTest.java diff --git a/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecordFactoryTest.java b/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecordFactoryTest.java similarity index 100% rename from maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecordFactoryTest.java rename to archiva-indexer/src/test/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecordFactoryTest.java diff --git a/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecordFactoryTest.java b/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecordFactoryTest.java similarity index 100% rename from maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecordFactoryTest.java rename to archiva-indexer/src/test/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecordFactoryTest.java diff --git a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/parent-pom/1/parent-pom-1.pom b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/parent-pom/1/parent-pom-1.pom similarity index 100% rename from maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/parent-pom/1/parent-pom-1.pom rename to archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/parent-pom/1/parent-pom-1.pom diff --git a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-archetype/1.0/test-archetype-1.0.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-archetype/1.0/test-archetype-1.0.jar similarity index 100% rename from maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-archetype/1.0/test-archetype-1.0.jar rename to archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-archetype/1.0/test-archetype-1.0.jar diff --git a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-archetype/1.0/test-archetype-1.0.pom b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-archetype/1.0/test-archetype-1.0.pom similarity index 100% rename from maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-archetype/1.0/test-archetype-1.0.pom rename to archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-archetype/1.0/test-archetype-1.0.pom diff --git a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.jar similarity index 100% rename from maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.jar rename to archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.jar diff --git a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.pom b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.pom similarity index 100% rename from maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.pom rename to archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.pom diff --git a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-corrupt-jar/1.0/test-corrupt-jar-1.0.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-corrupt-jar/1.0/test-corrupt-jar-1.0.jar similarity index 100% rename from maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-corrupt-jar/1.0/test-corrupt-jar-1.0.jar rename to archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-corrupt-jar/1.0/test-corrupt-jar-1.0.jar diff --git a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-dll/1.0.1.34/test-dll-1.0.1.34.dll b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-dll/1.0.1.34/test-dll-1.0.1.34.dll similarity index 100% rename from maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-dll/1.0.1.34/test-dll-1.0.1.34.dll rename to archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-dll/1.0.1.34/test-dll-1.0.1.34.dll diff --git a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1-jdk14.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1-jdk14.jar similarity index 100% rename from maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1-jdk14.jar rename to archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1-jdk14.jar diff --git a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.jar similarity index 100% rename from maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.jar rename to archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.jar diff --git a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.pom b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.pom similarity index 100% rename from maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.pom rename to archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.pom diff --git a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar/1.0/test-jar-1.0-jdk14.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar/1.0/test-jar-1.0-jdk14.jar similarity index 100% rename from maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar/1.0/test-jar-1.0-jdk14.jar rename to archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar/1.0/test-jar-1.0-jdk14.jar diff --git a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar/1.0/test-jar-1.0.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar/1.0/test-jar-1.0.jar similarity index 100% rename from maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar/1.0/test-jar-1.0.jar rename to archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar/1.0/test-jar-1.0.jar diff --git a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-plugin/1.0/test-plugin-1.0.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-plugin/1.0/test-plugin-1.0.jar similarity index 100% rename from maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-plugin/1.0/test-plugin-1.0.jar rename to archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-plugin/1.0/test-plugin-1.0.jar diff --git a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-plugin/1.0/test-plugin-1.0.pom b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-plugin/1.0/test-plugin-1.0.pom similarity index 100% rename from maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-plugin/1.0/test-plugin-1.0.pom rename to archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-plugin/1.0/test-plugin-1.0.pom diff --git a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-pom/1.0/test-pom-1.0.pom b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-pom/1.0/test-pom-1.0.pom similarity index 100% rename from maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-pom/1.0/test-pom-1.0.pom rename to archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-pom/1.0/test-pom-1.0.pom diff --git a/maven-repository-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.jar b/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.jar similarity index 100% rename from maven-repository-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.jar rename to archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.jar diff --git a/maven-repository-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.pom b/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.pom similarity index 100% rename from maven-repository-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.pom rename to archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.pom diff --git a/maven-repository-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-metadata.xml b/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-metadata.xml similarity index 100% rename from maven-repository-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-metadata.xml rename to archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-metadata.xml diff --git a/maven-repository-indexer/src/test/repository/org/apache/maven/maven-artifact/maven-metadata.xml b/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/maven-metadata.xml similarity index 100% rename from maven-repository-indexer/src/test/repository/org/apache/maven/maven-artifact/maven-metadata.xml rename to archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/maven-metadata.xml diff --git a/maven-repository-indexer/src/test/repository/org/apache/maven/maven-corrupt-jar/2.0/maven-corrupt-jar-2.0.jar b/archiva-indexer/src/test/repository/org/apache/maven/maven-corrupt-jar/2.0/maven-corrupt-jar-2.0.jar similarity index 100% rename from maven-repository-indexer/src/test/repository/org/apache/maven/maven-corrupt-jar/2.0/maven-corrupt-jar-2.0.jar rename to archiva-indexer/src/test/repository/org/apache/maven/maven-corrupt-jar/2.0/maven-corrupt-jar-2.0.jar diff --git a/maven-repository-indexer/src/test/repository/org/apache/maven/maven-corrupt-jar/2.0/maven-corrupt-jar-2.0.pom b/archiva-indexer/src/test/repository/org/apache/maven/maven-corrupt-jar/2.0/maven-corrupt-jar-2.0.pom similarity index 100% rename from maven-repository-indexer/src/test/repository/org/apache/maven/maven-corrupt-jar/2.0/maven-corrupt-jar-2.0.pom rename to archiva-indexer/src/test/repository/org/apache/maven/maven-corrupt-jar/2.0/maven-corrupt-jar-2.0.pom diff --git a/maven-repository-indexer/src/test/repository/org/apache/maven/maven-metadata.xml b/archiva-indexer/src/test/repository/org/apache/maven/maven-metadata.xml similarity index 100% rename from maven-repository-indexer/src/test/repository/org/apache/maven/maven-metadata.xml rename to archiva-indexer/src/test/repository/org/apache/maven/maven-metadata.xml diff --git a/maven-repository-indexer/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.jar b/archiva-indexer/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.jar similarity index 100% rename from maven-repository-indexer/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.jar rename to archiva-indexer/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.jar diff --git a/maven-repository-indexer/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.pom b/archiva-indexer/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.pom similarity index 100% rename from maven-repository-indexer/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.pom rename to archiva-indexer/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.pom diff --git a/maven-repository-indexer/src/test/repository/test/inherited/test-inherited/1.0.15/test-inherited-1.0.15.pom b/archiva-indexer/src/test/repository/test/inherited/test-inherited/1.0.15/test-inherited-1.0.15.pom similarity index 100% rename from maven-repository-indexer/src/test/repository/test/inherited/test-inherited/1.0.15/test-inherited-1.0.15.pom rename to archiva-indexer/src/test/repository/test/inherited/test-inherited/1.0.15/test-inherited-1.0.15.pom diff --git a/maven-repository-indexer/src/test/repository/test/maven-metadata.xml b/archiva-indexer/src/test/repository/test/maven-metadata.xml similarity index 100% rename from maven-repository-indexer/src/test/repository/test/maven-metadata.xml rename to archiva-indexer/src/test/repository/test/maven-metadata.xml diff --git a/maven-repository-indexer/src/test/repository/test/test-artifactId/1.0/test-artifactId-1.0.jar b/archiva-indexer/src/test/repository/test/test-artifactId/1.0/test-artifactId-1.0.jar similarity index 100% rename from maven-repository-indexer/src/test/repository/test/test-artifactId/1.0/test-artifactId-1.0.jar rename to archiva-indexer/src/test/repository/test/test-artifactId/1.0/test-artifactId-1.0.jar diff --git a/maven-repository-indexer/src/test/repository/test/test-artifactId/1.0/test-artifactId-1.0.pom b/archiva-indexer/src/test/repository/test/test-artifactId/1.0/test-artifactId-1.0.pom similarity index 100% rename from maven-repository-indexer/src/test/repository/test/test-artifactId/1.0/test-artifactId-1.0.pom rename to archiva-indexer/src/test/repository/test/test-artifactId/1.0/test-artifactId-1.0.pom diff --git a/maven-repository-proxy/pom.xml b/archiva-proxy/pom.xml similarity index 81% rename from maven-repository-proxy/pom.xml rename to archiva-proxy/pom.xml index 77bdc01de..a4cfbcfdd 100644 --- a/maven-repository-proxy/pom.xml +++ b/archiva-proxy/pom.xml @@ -17,17 +17,17 @@ - org.apache.maven.repository - maven-repository-manager + org.apache.maven.archiva + archiva 1.0-SNAPSHOT 4.0.0 - maven-repository-proxy - Maven Repository Proxy + archiva-proxy + Archiva Proxy - org.apache.maven.repository - maven-repository-discovery + org.apache.maven.archiva + archiva-discoverer org.apache.maven diff --git a/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyRequestHandler.java b/archiva-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyRequestHandler.java similarity index 100% rename from maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyRequestHandler.java rename to archiva-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyRequestHandler.java diff --git a/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxiedArtifactRepository.java b/archiva-proxy/src/main/java/org/apache/maven/repository/proxy/ProxiedArtifactRepository.java similarity index 100% rename from maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxiedArtifactRepository.java rename to archiva-proxy/src/main/java/org/apache/maven/repository/proxy/ProxiedArtifactRepository.java diff --git a/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyException.java b/archiva-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyException.java similarity index 100% rename from maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyException.java rename to archiva-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyException.java diff --git a/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyRequestHandler.java b/archiva-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyRequestHandler.java similarity index 100% rename from maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyRequestHandler.java rename to archiva-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyRequestHandler.java diff --git a/maven-repository-proxy/src/site/apt/how-to.apt b/archiva-proxy/src/site/apt/how-to.apt similarity index 100% rename from maven-repository-proxy/src/site/apt/how-to.apt rename to archiva-proxy/src/site/apt/how-to.apt diff --git a/maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/ProxyRequestHandlerTest.java b/archiva-proxy/src/test/java/org/apache/maven/repository/proxy/ProxyRequestHandlerTest.java similarity index 100% rename from maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/ProxyRequestHandlerTest.java rename to archiva-proxy/src/test/java/org/apache/maven/repository/proxy/ProxyRequestHandlerTest.java diff --git a/maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/WagonDelegate.java b/archiva-proxy/src/test/java/org/apache/maven/repository/proxy/WagonDelegate.java similarity index 100% rename from maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/WagonDelegate.java rename to archiva-proxy/src/test/java/org/apache/maven/repository/proxy/WagonDelegate.java diff --git a/maven-repository-proxy/src/test/repositories/legacy-managed/org.apache.maven.test/jars/get-default-layout-present-1.0.jar b/archiva-proxy/src/test/repositories/legacy-managed/org.apache.maven.test/jars/get-default-layout-present-1.0.jar similarity index 100% rename from maven-repository-proxy/src/test/repositories/legacy-managed/org.apache.maven.test/jars/get-default-layout-present-1.0.jar rename to archiva-proxy/src/test/repositories/legacy-managed/org.apache.maven.test/jars/get-default-layout-present-1.0.jar diff --git a/maven-repository-proxy/src/test/repositories/legacy-proxied/org.apache.maven.test/jars/get-default-layout-1.0.jar b/archiva-proxy/src/test/repositories/legacy-proxied/org.apache.maven.test/jars/get-default-layout-1.0.jar similarity index 100% rename from maven-repository-proxy/src/test/repositories/legacy-proxied/org.apache.maven.test/jars/get-default-layout-1.0.jar rename to archiva-proxy/src/test/repositories/legacy-proxied/org.apache.maven.test/jars/get-default-layout-1.0.jar diff --git a/maven-repository-proxy/src/test/repositories/legacy-proxied/org.apache.maven.test/jars/get-default-layout-present-1.0.jar b/archiva-proxy/src/test/repositories/legacy-proxied/org.apache.maven.test/jars/get-default-layout-present-1.0.jar similarity index 100% rename from maven-repository-proxy/src/test/repositories/legacy-proxied/org.apache.maven.test/jars/get-default-layout-present-1.0.jar rename to archiva-proxy/src/test/repositories/legacy-proxied/org.apache.maven.test/jars/get-default-layout-present-1.0.jar diff --git a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar similarity index 100% rename from maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar rename to archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar diff --git a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar.md5 b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar.md5 similarity index 100% rename from maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar.md5 rename to archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar.md5 diff --git a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar.sha1 b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar.sha1 similarity index 100% rename from maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar.sha1 rename to archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar.sha1 diff --git a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-checksum-from-managed-repo/1.0/get-checksum-from-managed-repo-1.0.jar.sha1 b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-checksum-from-managed-repo/1.0/get-checksum-from-managed-repo-1.0.jar.sha1 similarity index 100% rename from maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-checksum-from-managed-repo/1.0/get-checksum-from-managed-repo-1.0.jar.sha1 rename to archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-checksum-from-managed-repo/1.0/get-checksum-from-managed-repo-1.0.jar.sha1 diff --git a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar similarity index 100% rename from maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar rename to archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar diff --git a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-merged-metadata/maven-metadata.xml b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-merged-metadata/maven-metadata.xml similarity index 100% rename from maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-merged-metadata/maven-metadata.xml rename to archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-merged-metadata/maven-metadata.xml diff --git a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/get-present-metadata-snapshot-1.0-20050831.101112-1.jar b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/get-present-metadata-snapshot-1.0-20050831.101112-1.jar similarity index 100% rename from maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/get-present-metadata-snapshot-1.0-20050831.101112-1.jar rename to archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/get-present-metadata-snapshot-1.0-20050831.101112-1.jar diff --git a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar similarity index 100% rename from maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar rename to archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar diff --git a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-removed-from-proxies/1.0/get-removed-from-proxies-1.0.jar b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-removed-from-proxies/1.0/get-removed-from-proxies-1.0.jar similarity index 100% rename from maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-removed-from-proxies/1.0/get-removed-from-proxies-1.0.jar rename to archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-removed-from-proxies/1.0/get-removed-from-proxies-1.0.jar diff --git a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-removed-metadata/1.0/maven-metadata.xml b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-removed-metadata/1.0/maven-metadata.xml similarity index 100% rename from maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-removed-metadata/1.0/maven-metadata.xml rename to archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-removed-metadata/1.0/maven-metadata.xml diff --git a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/.metadata-proxied1 b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/.metadata-proxied1 similarity index 100% rename from maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/.metadata-proxied1 rename to archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/.metadata-proxied1 diff --git a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/.metadata-proxied1 b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/.metadata-proxied1 similarity index 100% rename from maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/.metadata-proxied1 rename to archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/.metadata-proxied1 diff --git a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml similarity index 100% rename from maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml rename to archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml diff --git a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/maven-metadata.xml b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/maven-metadata.xml similarity index 100% rename from maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/maven-metadata.xml rename to archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/maven-metadata.xml diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar rename to archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar rename to archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar.md5 b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar.md5 similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar.md5 rename to archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar.md5 diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar.sha1 b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar.sha1 similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar.sha1 rename to archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar.sha1 diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar rename to archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar.md5 b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar.md5 similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar.md5 rename to archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar.md5 diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar.sha1 b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar.sha1 similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar.sha1 rename to archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar.sha1 diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-from-managed-repo/1.0/get-checksum-from-managed-repo-1.0.jar.sha1 b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-from-managed-repo/1.0/get-checksum-from-managed-repo-1.0.jar.sha1 similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-from-managed-repo/1.0/get-checksum-from-managed-repo-1.0.jar.sha1 rename to archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-from-managed-repo/1.0/get-checksum-from-managed-repo-1.0.jar.sha1 diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar rename to archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar.md5 b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar.md5 similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar.md5 rename to archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar.md5 diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar.sha1 b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar.sha1 similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar.sha1 rename to archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar.sha1 diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar rename to archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar.md5 b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar.md5 similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar.md5 rename to archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar.md5 diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar rename to archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar.md5 b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar.md5 similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar.md5 rename to archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar.md5 diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar.sha1 b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar.sha1 similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar.sha1 rename to archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar.sha1 diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar rename to archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar.sha1 b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar.sha1 similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar.sha1 rename to archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar.sha1 diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar rename to archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar rename to archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-metadata/1.0/maven-metadata.xml b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-metadata/1.0/maven-metadata.xml similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-metadata/1.0/maven-metadata.xml rename to archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-metadata/1.0/maven-metadata.xml diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar rename to archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-merged-metadata/maven-metadata.xml b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-merged-metadata/maven-metadata.xml similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-merged-metadata/maven-metadata.xml rename to archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-merged-metadata/maven-metadata.xml diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-metadata-snapshot/1.0-SNAPSHOT/get-metadata-snapshot-1.0-20050831.101112-1.jar b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-metadata-snapshot/1.0-SNAPSHOT/get-metadata-snapshot-1.0-20050831.101112-1.jar similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-metadata-snapshot/1.0-SNAPSHOT/get-metadata-snapshot-1.0-20050831.101112-1.jar rename to archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-metadata-snapshot/1.0-SNAPSHOT/get-metadata-snapshot-1.0-20050831.101112-1.jar diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/get-present-metadata-snapshot-1.0-20050831.101112-1.jar b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/get-present-metadata-snapshot-1.0-20050831.101112-1.jar similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/get-present-metadata-snapshot-1.0-20050831.101112-1.jar rename to archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/get-present-metadata-snapshot-1.0-20050831.101112-1.jar diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar rename to archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-SNAPSHOT.jar b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-SNAPSHOT.jar similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-SNAPSHOT.jar rename to archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-SNAPSHOT.jar diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot/1.0-SNAPSHOT/get-timestamped-snapshot-1.0-SNAPSHOT.jar b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot/1.0-SNAPSHOT/get-timestamped-snapshot-1.0-SNAPSHOT.jar similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot/1.0-SNAPSHOT/get-timestamped-snapshot-1.0-SNAPSHOT.jar rename to archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot/1.0-SNAPSHOT/get-timestamped-snapshot-1.0-SNAPSHOT.jar diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml rename to archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/maven-metadata.xml b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/maven-metadata.xml similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/maven-metadata.xml rename to archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/maven-metadata.xml diff --git a/maven-repository-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar b/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar rename to archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar diff --git a/maven-repository-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-in-second-proxy/1.0/get-in-second-proxy-1.0.jar b/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-in-second-proxy/1.0/get-in-second-proxy-1.0.jar similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-in-second-proxy/1.0/get-in-second-proxy-1.0.jar rename to archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-in-second-proxy/1.0/get-in-second-proxy-1.0.jar diff --git a/maven-repository-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-merged-metadata/maven-metadata.xml b/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-merged-metadata/maven-metadata.xml similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-merged-metadata/maven-metadata.xml rename to archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-merged-metadata/maven-metadata.xml diff --git a/maven-repository-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-SNAPSHOT.jar b/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-SNAPSHOT.jar similarity index 100% rename from maven-repository-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-SNAPSHOT.jar rename to archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-SNAPSHOT.jar diff --git a/maven-repository-proxy/src/test/resources/org/apache/maven/repository/proxy/ProxyRequestHandlerTest.xml b/archiva-proxy/src/test/resources/org/apache/maven/repository/proxy/ProxyRequestHandlerTest.xml similarity index 100% rename from maven-repository-proxy/src/test/resources/org/apache/maven/repository/proxy/ProxyRequestHandlerTest.xml rename to archiva-proxy/src/test/resources/org/apache/maven/repository/proxy/ProxyRequestHandlerTest.xml diff --git a/maven-repository-reports-standard/pom.xml b/archiva-reports-standard/pom.xml similarity index 82% rename from maven-repository-reports-standard/pom.xml rename to archiva-reports-standard/pom.xml index bbead04d7..f6d85a9ba 100755 --- a/maven-repository-reports-standard/pom.xml +++ b/archiva-reports-standard/pom.xml @@ -17,13 +17,13 @@ - org.apache.maven.repository - maven-repository-manager + org.apache.maven.archiva + archiva 1.0-SNAPSHOT 4.0.0 - maven-repository-reports-standard - Maven Repository Standard Reports + archiva-reports-standard + Archiva Standard Reports org.codehaus.plexus @@ -58,12 +58,12 @@ maven-artifact-manager - org.apache.maven.repository - maven-repository-utils + org.apache.maven.archiva + archiva-utils - org.apache.maven.repository - maven-repository-indexer + org.apache.maven.archiva + archiva-indexer diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/AbstractRepositoryQueryLayer.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/AbstractRepositoryQueryLayer.java similarity index 100% rename from maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/AbstractRepositoryQueryLayer.java rename to archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/AbstractRepositoryQueryLayer.java diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactReportProcessor.java similarity index 100% rename from maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactReportProcessor.java rename to archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactReportProcessor.java diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactReporter.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactReporter.java similarity index 100% rename from maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactReporter.java rename to archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactReporter.java diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactResult.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactResult.java similarity index 100% rename from maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactResult.java rename to archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactResult.java diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/BadMetadataReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/BadMetadataReportProcessor.java similarity index 100% rename from maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/BadMetadataReportProcessor.java rename to archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/BadMetadataReportProcessor.java diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/Cache.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/Cache.java similarity index 100% rename from maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/Cache.java rename to archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/Cache.java diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/CachedRepositoryQueryLayer.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/CachedRepositoryQueryLayer.java similarity index 100% rename from maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/CachedRepositoryQueryLayer.java rename to archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/CachedRepositoryQueryLayer.java diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumArtifactReporter.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumArtifactReporter.java similarity index 100% rename from maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumArtifactReporter.java rename to archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumArtifactReporter.java diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumMetadataReporter.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumMetadataReporter.java similarity index 100% rename from maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumMetadataReporter.java rename to archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumMetadataReporter.java diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultArtifactReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultArtifactReportProcessor.java similarity index 100% rename from maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultArtifactReportProcessor.java rename to archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultArtifactReportProcessor.java diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultArtifactReporter.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultArtifactReporter.java similarity index 100% rename from maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultArtifactReporter.java rename to archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultArtifactReporter.java diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultRepositoryQueryLayer.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultRepositoryQueryLayer.java similarity index 100% rename from maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultRepositoryQueryLayer.java rename to archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultRepositoryQueryLayer.java diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultRepositoryQueryLayerFactory.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultRepositoryQueryLayerFactory.java similarity index 100% rename from maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultRepositoryQueryLayerFactory.java rename to archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultRepositoryQueryLayerFactory.java diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessor.java similarity index 100% rename from maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessor.java rename to archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessor.java diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/InvalidPomArtifactReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/InvalidPomArtifactReportProcessor.java similarity index 100% rename from maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/InvalidPomArtifactReportProcessor.java rename to archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/InvalidPomArtifactReportProcessor.java diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/LocationArtifactReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/LocationArtifactReportProcessor.java similarity index 100% rename from maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/LocationArtifactReportProcessor.java rename to archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/LocationArtifactReportProcessor.java diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/MetadataReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/MetadataReportProcessor.java similarity index 100% rename from maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/MetadataReportProcessor.java rename to archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/MetadataReportProcessor.java diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ReportProcessorException.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ReportProcessorException.java similarity index 100% rename from maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ReportProcessorException.java rename to archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ReportProcessorException.java diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryMetadataResult.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryMetadataResult.java similarity index 100% rename from maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryMetadataResult.java rename to archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryMetadataResult.java diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayer.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayer.java similarity index 100% rename from maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayer.java rename to archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayer.java diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayerException.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayerException.java similarity index 100% rename from maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayerException.java rename to archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayerException.java diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayerFactory.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayerFactory.java similarity index 100% rename from maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayerFactory.java rename to archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayerFactory.java diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractChecksumArtifactReporterTestCase.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractChecksumArtifactReporterTestCase.java similarity index 100% rename from maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractChecksumArtifactReporterTestCase.java rename to archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractChecksumArtifactReporterTestCase.java diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractRepositoryQueryLayerTestCase.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractRepositoryQueryLayerTestCase.java similarity index 100% rename from maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractRepositoryQueryLayerTestCase.java rename to archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractRepositoryQueryLayerTestCase.java diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractRepositoryReportsTestCase.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractRepositoryReportsTestCase.java similarity index 100% rename from maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractRepositoryReportsTestCase.java rename to archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractRepositoryReportsTestCase.java diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReportProcessorTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReportProcessorTest.java similarity index 100% rename from maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReportProcessorTest.java rename to archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReportProcessorTest.java diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReporterTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReporterTest.java similarity index 100% rename from maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReporterTest.java rename to archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReporterTest.java diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/BadMetadataReportProcessorTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/BadMetadataReportProcessorTest.java similarity index 100% rename from maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/BadMetadataReportProcessorTest.java rename to archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/BadMetadataReportProcessorTest.java diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/CacheTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/CacheTest.java similarity index 100% rename from maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/CacheTest.java rename to archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/CacheTest.java diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/CachedRepositoryQueryLayerTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/CachedRepositoryQueryLayerTest.java similarity index 100% rename from maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/CachedRepositoryQueryLayerTest.java rename to archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/CachedRepositoryQueryLayerTest.java diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ChecksumArtifactReporterTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ChecksumArtifactReporterTest.java similarity index 100% rename from maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ChecksumArtifactReporterTest.java rename to archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ChecksumArtifactReporterTest.java diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/DefaultArtifactReporterTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/DefaultArtifactReporterTest.java similarity index 100% rename from maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/DefaultArtifactReporterTest.java rename to archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/DefaultArtifactReporterTest.java diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessorTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessorTest.java similarity index 100% rename from maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessorTest.java rename to archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessorTest.java diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/GenericMockObject.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/GenericMockObject.java similarity index 100% rename from maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/GenericMockObject.java rename to archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/GenericMockObject.java diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/InvalidPomArtifactReportProcessorTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/InvalidPomArtifactReportProcessorTest.java similarity index 100% rename from maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/InvalidPomArtifactReportProcessorTest.java rename to archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/InvalidPomArtifactReportProcessorTest.java diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/LocationArtifactReportProcessorTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/LocationArtifactReportProcessorTest.java similarity index 100% rename from maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/LocationArtifactReportProcessorTest.java rename to archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/LocationArtifactReportProcessorTest.java diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifact.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifact.java similarity index 100% rename from maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifact.java rename to archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifact.java diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactFactory.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactFactory.java similarity index 100% rename from maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactFactory.java rename to archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactFactory.java diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReportProcessor.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReportProcessor.java similarity index 100% rename from maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReportProcessor.java rename to archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReportProcessor.java diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReporter.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReporter.java similarity index 100% rename from maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReporter.java rename to archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReporter.java diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockRepositoryQueryLayer.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockRepositoryQueryLayer.java similarity index 100% rename from maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockRepositoryQueryLayer.java rename to archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockRepositoryQueryLayer.java diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ReportCondition.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ReportCondition.java similarity index 100% rename from maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ReportCondition.java rename to archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ReportCondition.java diff --git a/maven-repository-reports-standard/src/test/repository/groupId/artifactId/1.0-alpha-1/artifactId-1.0-alpha-1.jar b/archiva-reports-standard/src/test/repository/groupId/artifactId/1.0-alpha-1/artifactId-1.0-alpha-1.jar similarity index 100% rename from maven-repository-reports-standard/src/test/repository/groupId/artifactId/1.0-alpha-1/artifactId-1.0-alpha-1.jar rename to archiva-reports-standard/src/test/repository/groupId/artifactId/1.0-alpha-1/artifactId-1.0-alpha-1.jar diff --git a/maven-repository-reports-standard/src/test/repository/groupId/artifactId/1.0-alpha-1/artifactId-1.0-alpha-1.pom b/archiva-reports-standard/src/test/repository/groupId/artifactId/1.0-alpha-1/artifactId-1.0-alpha-1.pom similarity index 100% rename from maven-repository-reports-standard/src/test/repository/groupId/artifactId/1.0-alpha-1/artifactId-1.0-alpha-1.pom rename to archiva-reports-standard/src/test/repository/groupId/artifactId/1.0-alpha-1/artifactId-1.0-alpha-1.pom diff --git a/maven-repository-reports-standard/src/test/repository/groupId/artifactId/1.0-alpha-2/artifactId-1.0-alpha-2.pom b/archiva-reports-standard/src/test/repository/groupId/artifactId/1.0-alpha-2/artifactId-1.0-alpha-2.pom similarity index 100% rename from maven-repository-reports-standard/src/test/repository/groupId/artifactId/1.0-alpha-2/artifactId-1.0-alpha-2.pom rename to archiva-reports-standard/src/test/repository/groupId/artifactId/1.0-alpha-2/artifactId-1.0-alpha-2.pom diff --git a/maven-repository-reports-standard/src/test/repository/groupId/artifactId/maven-metadata.xml b/archiva-reports-standard/src/test/repository/groupId/artifactId/maven-metadata.xml similarity index 100% rename from maven-repository-reports-standard/src/test/repository/groupId/artifactId/maven-metadata.xml rename to archiva-reports-standard/src/test/repository/groupId/artifactId/maven-metadata.xml diff --git a/maven-repository-reports-standard/src/test/repository/groupId/snapshot-artifact/1.0-alpha-1-SNAPSHOT/snapshot-artifact-1.0-alpha-1-20050611.202024-1.pom b/archiva-reports-standard/src/test/repository/groupId/snapshot-artifact/1.0-alpha-1-SNAPSHOT/snapshot-artifact-1.0-alpha-1-20050611.202024-1.pom similarity index 100% rename from maven-repository-reports-standard/src/test/repository/groupId/snapshot-artifact/1.0-alpha-1-SNAPSHOT/snapshot-artifact-1.0-alpha-1-20050611.202024-1.pom rename to archiva-reports-standard/src/test/repository/groupId/snapshot-artifact/1.0-alpha-1-SNAPSHOT/snapshot-artifact-1.0-alpha-1-20050611.202024-1.pom diff --git a/maven-repository-reports-standard/src/test/repository/groupId/snapshot-artifact/1.0-alpha-1-SNAPSHOT/snapshot-artifact-1.0-alpha-1-SNAPSHOT.pom b/archiva-reports-standard/src/test/repository/groupId/snapshot-artifact/1.0-alpha-1-SNAPSHOT/snapshot-artifact-1.0-alpha-1-SNAPSHOT.pom similarity index 100% rename from maven-repository-reports-standard/src/test/repository/groupId/snapshot-artifact/1.0-alpha-1-SNAPSHOT/snapshot-artifact-1.0-alpha-1-SNAPSHOT.pom rename to archiva-reports-standard/src/test/repository/groupId/snapshot-artifact/1.0-alpha-1-SNAPSHOT/snapshot-artifact-1.0-alpha-1-SNAPSHOT.pom diff --git a/maven-repository-reports-standard/src/test/repository/groupId/unexpectedfile.xml b/archiva-reports-standard/src/test/repository/groupId/unexpectedfile.xml similarity index 100% rename from maven-repository-reports-standard/src/test/repository/groupId/unexpectedfile.xml rename to archiva-reports-standard/src/test/repository/groupId/unexpectedfile.xml diff --git a/maven-repository-reports-standard/src/test/repository/maven-metadata.xml b/archiva-reports-standard/src/test/repository/maven-metadata.xml similarity index 100% rename from maven-repository-reports-standard/src/test/repository/maven-metadata.xml rename to archiva-reports-standard/src/test/repository/maven-metadata.xml diff --git a/maven-repository-reports-standard/src/test/repository/org/apache/maven/artifactId/1.0-alpha-3/artifactId-1.0-alpha-3.pom b/archiva-reports-standard/src/test/repository/org/apache/maven/artifactId/1.0-alpha-3/artifactId-1.0-alpha-3.pom similarity index 100% rename from maven-repository-reports-standard/src/test/repository/org/apache/maven/artifactId/1.0-alpha-3/artifactId-1.0-alpha-3.pom rename to archiva-reports-standard/src/test/repository/org/apache/maven/artifactId/1.0-alpha-3/artifactId-1.0-alpha-3.pom diff --git a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-archiver/2.0/maven-archiver-2.0.jar b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-archiver/2.0/maven-archiver-2.0.jar similarity index 100% rename from maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-archiver/2.0/maven-archiver-2.0.jar rename to archiva-reports-standard/src/test/repository/org/apache/maven/maven-archiver/2.0/maven-archiver-2.0.jar diff --git a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-archiver/2.0/maven-archiver-2.0.pom b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-archiver/2.0/maven-archiver-2.0.pom similarity index 100% rename from maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-archiver/2.0/maven-archiver-2.0.pom rename to archiva-reports-standard/src/test/repository/org/apache/maven/maven-archiver/2.0/maven-archiver-2.0.pom diff --git a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-archiver/2.0/note.txt b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-archiver/2.0/note.txt similarity index 100% rename from maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-archiver/2.0/note.txt rename to archiva-reports-standard/src/test/repository/org/apache/maven/maven-archiver/2.0/note.txt diff --git a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.jar b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.jar similarity index 100% rename from maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.jar rename to archiva-reports-standard/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.jar diff --git a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.pom b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.pom similarity index 100% rename from maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.pom rename to archiva-reports-standard/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.pom diff --git a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-model/2.0/note.txt b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-model/2.0/note.txt similarity index 100% rename from maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-model/2.0/note.txt rename to archiva-reports-standard/src/test/repository/org/apache/maven/maven-model/2.0/note.txt diff --git a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-monitor/2.1/maven-monitor-2.1.jar b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-monitor/2.1/maven-monitor-2.1.jar similarity index 100% rename from maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-monitor/2.1/maven-monitor-2.1.jar rename to archiva-reports-standard/src/test/repository/org/apache/maven/maven-monitor/2.1/maven-monitor-2.1.jar diff --git a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-monitor/2.1/maven-monitor-2.1.pom b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-monitor/2.1/maven-monitor-2.1.pom similarity index 100% rename from maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-monitor/2.1/maven-monitor-2.1.pom rename to archiva-reports-standard/src/test/repository/org/apache/maven/maven-monitor/2.1/maven-monitor-2.1.pom diff --git a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-monitor/2.1/note.txt b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-monitor/2.1/note.txt similarity index 100% rename from maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-monitor/2.1/note.txt rename to archiva-reports-standard/src/test/repository/org/apache/maven/maven-monitor/2.1/note.txt diff --git a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-project/2.1/maven-project-2.1.jar b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-project/2.1/maven-project-2.1.jar similarity index 100% rename from maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-project/2.1/maven-project-2.1.jar rename to archiva-reports-standard/src/test/repository/org/apache/maven/maven-project/2.1/maven-project-2.1.jar diff --git a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-project/2.1/maven-project-2.1.pom b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-project/2.1/maven-project-2.1.pom similarity index 100% rename from maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-project/2.1/maven-project-2.1.pom rename to archiva-reports-standard/src/test/repository/org/apache/maven/maven-project/2.1/maven-project-2.1.pom diff --git a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-project/2.1/note.txt b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-project/2.1/note.txt similarity index 100% rename from maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-project/2.1/note.txt rename to archiva-reports-standard/src/test/repository/org/apache/maven/maven-project/2.1/note.txt diff --git a/maven-repository-reports-standard/src/test/resources/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessorTest.xml b/archiva-reports-standard/src/test/resources/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessorTest.xml similarity index 100% rename from maven-repository-reports-standard/src/test/resources/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessorTest.xml rename to archiva-reports-standard/src/test/resources/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessorTest.xml diff --git a/maven-repository-utils/pom.xml b/archiva-utils/pom.xml similarity index 87% rename from maven-repository-utils/pom.xml rename to archiva-utils/pom.xml index 7c211a127..baa86124e 100644 --- a/maven-repository-utils/pom.xml +++ b/archiva-utils/pom.xml @@ -17,13 +17,13 @@ - org.apache.maven.repository - maven-repository-manager + org.apache.maven.archiva + archiva 1.0-SNAPSHOT 4.0.0 - maven-repository-utils - Maven Repository Utilities + archiva-utils + Archiva Digester Utilities org.codehaus.plexus diff --git a/maven-repository-utils/src/main/java/org/apache/maven/repository/digest/AbstractDigester.java b/archiva-utils/src/main/java/org/apache/maven/repository/digest/AbstractDigester.java similarity index 100% rename from maven-repository-utils/src/main/java/org/apache/maven/repository/digest/AbstractDigester.java rename to archiva-utils/src/main/java/org/apache/maven/repository/digest/AbstractDigester.java diff --git a/maven-repository-utils/src/main/java/org/apache/maven/repository/digest/AbstractStreamingDigester.java b/archiva-utils/src/main/java/org/apache/maven/repository/digest/AbstractStreamingDigester.java similarity index 100% rename from maven-repository-utils/src/main/java/org/apache/maven/repository/digest/AbstractStreamingDigester.java rename to archiva-utils/src/main/java/org/apache/maven/repository/digest/AbstractStreamingDigester.java diff --git a/maven-repository-utils/src/main/java/org/apache/maven/repository/digest/DigestUtils.java b/archiva-utils/src/main/java/org/apache/maven/repository/digest/DigestUtils.java similarity index 100% rename from maven-repository-utils/src/main/java/org/apache/maven/repository/digest/DigestUtils.java rename to archiva-utils/src/main/java/org/apache/maven/repository/digest/DigestUtils.java diff --git a/maven-repository-utils/src/main/java/org/apache/maven/repository/digest/Digester.java b/archiva-utils/src/main/java/org/apache/maven/repository/digest/Digester.java similarity index 100% rename from maven-repository-utils/src/main/java/org/apache/maven/repository/digest/Digester.java rename to archiva-utils/src/main/java/org/apache/maven/repository/digest/Digester.java diff --git a/maven-repository-utils/src/main/java/org/apache/maven/repository/digest/DigesterException.java b/archiva-utils/src/main/java/org/apache/maven/repository/digest/DigesterException.java similarity index 100% rename from maven-repository-utils/src/main/java/org/apache/maven/repository/digest/DigesterException.java rename to archiva-utils/src/main/java/org/apache/maven/repository/digest/DigesterException.java diff --git a/maven-repository-utils/src/main/java/org/apache/maven/repository/digest/Md5Digester.java b/archiva-utils/src/main/java/org/apache/maven/repository/digest/Md5Digester.java similarity index 100% rename from maven-repository-utils/src/main/java/org/apache/maven/repository/digest/Md5Digester.java rename to archiva-utils/src/main/java/org/apache/maven/repository/digest/Md5Digester.java diff --git a/maven-repository-utils/src/main/java/org/apache/maven/repository/digest/Sha1Digester.java b/archiva-utils/src/main/java/org/apache/maven/repository/digest/Sha1Digester.java similarity index 100% rename from maven-repository-utils/src/main/java/org/apache/maven/repository/digest/Sha1Digester.java rename to archiva-utils/src/main/java/org/apache/maven/repository/digest/Sha1Digester.java diff --git a/maven-repository-utils/src/main/java/org/apache/maven/repository/digest/StreamingDigester.java b/archiva-utils/src/main/java/org/apache/maven/repository/digest/StreamingDigester.java similarity index 100% rename from maven-repository-utils/src/main/java/org/apache/maven/repository/digest/StreamingDigester.java rename to archiva-utils/src/main/java/org/apache/maven/repository/digest/StreamingDigester.java diff --git a/maven-repository-utils/src/main/java/org/apache/maven/repository/digest/StreamingMd5Digester.java b/archiva-utils/src/main/java/org/apache/maven/repository/digest/StreamingMd5Digester.java similarity index 100% rename from maven-repository-utils/src/main/java/org/apache/maven/repository/digest/StreamingMd5Digester.java rename to archiva-utils/src/main/java/org/apache/maven/repository/digest/StreamingMd5Digester.java diff --git a/maven-repository-utils/src/main/java/org/apache/maven/repository/digest/StreamingSha1Digester.java b/archiva-utils/src/main/java/org/apache/maven/repository/digest/StreamingSha1Digester.java similarity index 100% rename from maven-repository-utils/src/main/java/org/apache/maven/repository/digest/StreamingSha1Digester.java rename to archiva-utils/src/main/java/org/apache/maven/repository/digest/StreamingSha1Digester.java diff --git a/maven-repository-utils/src/test/java/org/apache/maven/repository/digest/DigesterTest.java b/archiva-utils/src/test/java/org/apache/maven/repository/digest/DigesterTest.java similarity index 100% rename from maven-repository-utils/src/test/java/org/apache/maven/repository/digest/DigesterTest.java rename to archiva-utils/src/test/java/org/apache/maven/repository/digest/DigesterTest.java diff --git a/maven-repository-utils/src/test/resources/test-file.txt b/archiva-utils/src/test/resources/test-file.txt similarity index 100% rename from maven-repository-utils/src/test/resources/test-file.txt rename to archiva-utils/src/test/resources/test-file.txt diff --git a/maven-repository-webapp/pom.xml b/archiva-webapp/pom.xml similarity index 82% rename from maven-repository-webapp/pom.xml rename to archiva-webapp/pom.xml index 1201eeb7b..5a7f9c82b 100644 --- a/maven-repository-webapp/pom.xml +++ b/archiva-webapp/pom.xml @@ -18,13 +18,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.apache.maven.repository - maven-repository-manager + org.apache.maven.archiva + archiva 1.0-SNAPSHOT - maven-repository-webapp + archiva-webapp war - Maven Repository Manager Web Application + Archiva Web Application javax.servlet @@ -75,28 +75,28 @@ 1.0-alpha-10-SNAPSHOT - org.apache.maven.repository - maven-repository-indexer + org.apache.maven.archiva + archiva-indexer - org.apache.maven.repository - maven-repository-discovery + org.apache.maven.archiva + archiva-discoverer - org.apache.maven.repository - maven-repository-configuration + org.apache.maven.archiva + archiva-configuration - org.apache.maven.repository - maven-repository-proxy + org.apache.maven.archiva + archiva-proxy - org.apache.maven.repository - maven-repository-core + org.apache.maven.archiva + archiva-core - org.apache.maven.repository - maven-repository-artifact-applet + org.apache.maven.archiva + archiva-applet provided @@ -106,7 +106,7 @@ - maven-repository-webapp + archiva-webapp org.mortbay.jetty @@ -136,10 +136,10 @@ ${project.groupId} - maven-repository-artifact-applet + archiva-applet ${project.version} src/main/webapp - maven-repository-artifact-applet.jar + archiva-applet.jar diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/BrowseAction.java b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/BrowseAction.java similarity index 100% rename from maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/BrowseAction.java rename to archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/BrowseAction.java diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/ProxyAction.java b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/ProxyAction.java similarity index 100% rename from maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/ProxyAction.java rename to archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/ProxyAction.java diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/SearchAction.java b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/SearchAction.java similarity index 100% rename from maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/SearchAction.java rename to archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/SearchAction.java diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/ShowArtifactAction.java b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/ShowArtifactAction.java similarity index 100% rename from maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/ShowArtifactAction.java rename to archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/ShowArtifactAction.java diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/AbstractConfigureRepositoryAction.java b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/AbstractConfigureRepositoryAction.java similarity index 100% rename from maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/AbstractConfigureRepositoryAction.java rename to archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/AbstractConfigureRepositoryAction.java diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/AbstractDeleteRepositoryAction.java b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/AbstractDeleteRepositoryAction.java similarity index 100% rename from maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/AbstractDeleteRepositoryAction.java rename to archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/AbstractDeleteRepositoryAction.java diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureAction.java b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureAction.java similarity index 100% rename from maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureAction.java rename to archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureAction.java diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureProxiedRepositoryAction.java b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureProxiedRepositoryAction.java similarity index 100% rename from maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureProxiedRepositoryAction.java rename to archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureProxiedRepositoryAction.java diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureRepositoryAction.java b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureRepositoryAction.java similarity index 100% rename from maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureRepositoryAction.java rename to archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureRepositoryAction.java diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureSyncedRepositoryAction.java b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureSyncedRepositoryAction.java similarity index 100% rename from maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureSyncedRepositoryAction.java rename to archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureSyncedRepositoryAction.java diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteProxiedRepositoryAction.java b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteProxiedRepositoryAction.java similarity index 100% rename from maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteProxiedRepositoryAction.java rename to archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteProxiedRepositoryAction.java diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteRepositoryAction.java b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteRepositoryAction.java similarity index 100% rename from maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteRepositoryAction.java rename to archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteRepositoryAction.java diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteSyncedRepositoryAction.java b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteSyncedRepositoryAction.java similarity index 100% rename from maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteSyncedRepositoryAction.java rename to archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteSyncedRepositoryAction.java diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/RunIndexerAction.java b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/RunIndexerAction.java similarity index 100% rename from maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/RunIndexerAction.java rename to archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/RunIndexerAction.java diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/interceptor/ConfigurationInterceptor.java b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/interceptor/ConfigurationInterceptor.java similarity index 100% rename from maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/interceptor/ConfigurationInterceptor.java rename to archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/interceptor/ConfigurationInterceptor.java diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/mapper/RepositoryActionMapper.java b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/mapper/RepositoryActionMapper.java similarity index 100% rename from maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/mapper/RepositoryActionMapper.java rename to archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/mapper/RepositoryActionMapper.java diff --git a/maven-repository-webapp/src/main/resources/META-INF/plexus/application.xml b/archiva-webapp/src/main/resources/META-INF/plexus/application.xml similarity index 100% rename from maven-repository-webapp/src/main/resources/META-INF/plexus/application.xml rename to archiva-webapp/src/main/resources/META-INF/plexus/application.xml diff --git a/maven-repository-webapp/src/main/resources/maven-proxy-complete.conf b/archiva-webapp/src/main/resources/maven-proxy-complete.conf similarity index 100% rename from maven-repository-webapp/src/main/resources/maven-proxy-complete.conf rename to archiva-webapp/src/main/resources/maven-proxy-complete.conf diff --git a/maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/SearchAction-checksumSearch-validation.xml b/archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/SearchAction-checksumSearch-validation.xml similarity index 100% rename from maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/SearchAction-checksumSearch-validation.xml rename to archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/SearchAction-checksumSearch-validation.xml diff --git a/maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/SearchAction-quickSearch-validation.xml b/archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/SearchAction-quickSearch-validation.xml similarity index 100% rename from maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/SearchAction-quickSearch-validation.xml rename to archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/SearchAction-quickSearch-validation.xml diff --git a/maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureAction-validation.xml b/archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureAction-validation.xml similarity index 100% rename from maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureAction-validation.xml rename to archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureAction-validation.xml diff --git a/maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureProxiedRepositoryAction-validation.xml b/archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureProxiedRepositoryAction-validation.xml similarity index 100% rename from maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureProxiedRepositoryAction-validation.xml rename to archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureProxiedRepositoryAction-validation.xml diff --git a/maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureRepositoryAction-validation.xml b/archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureRepositoryAction-validation.xml similarity index 100% rename from maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureRepositoryAction-validation.xml rename to archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureRepositoryAction-validation.xml diff --git a/maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureSyncedRepositoryAction-addSelectedSyncedRepository-validation.xml b/archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureSyncedRepositoryAction-addSelectedSyncedRepository-validation.xml similarity index 100% rename from maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureSyncedRepositoryAction-addSelectedSyncedRepository-validation.xml rename to archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureSyncedRepositoryAction-addSelectedSyncedRepository-validation.xml diff --git a/maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureSyncedRepositoryAction-validation.xml b/archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureSyncedRepositoryAction-validation.xml similarity index 100% rename from maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureSyncedRepositoryAction-validation.xml rename to archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureSyncedRepositoryAction-validation.xml diff --git a/maven-repository-webapp/src/main/resources/webwork.properties b/archiva-webapp/src/main/resources/webwork.properties similarity index 100% rename from maven-repository-webapp/src/main/resources/webwork.properties rename to archiva-webapp/src/main/resources/webwork.properties diff --git a/maven-repository-webapp/src/main/resources/xwork.xml b/archiva-webapp/src/main/resources/xwork.xml similarity index 100% rename from maven-repository-webapp/src/main/resources/xwork.xml rename to archiva-webapp/src/main/resources/xwork.xml diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/decorators.xml b/archiva-webapp/src/main/webapp/WEB-INF/decorators.xml similarity index 100% rename from maven-repository-webapp/src/main/webapp/WEB-INF/decorators.xml rename to archiva-webapp/src/main/webapp/WEB-INF/decorators.xml diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/addProxiedRepository.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addProxiedRepository.jsp similarity index 100% rename from maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/addProxiedRepository.jsp rename to archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addProxiedRepository.jsp diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/addRepository.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRepository.jsp similarity index 100% rename from maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/addRepository.jsp rename to archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRepository.jsp diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/addSyncedRepository.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addSyncedRepository.jsp similarity index 100% rename from maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/addSyncedRepository.jsp rename to archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addSyncedRepository.jsp diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/configure.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/configure.jsp similarity index 100% rename from maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/configure.jsp rename to archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/configure.jsp diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxiedRepository.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxiedRepository.jsp similarity index 100% rename from maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxiedRepository.jsp rename to archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxiedRepository.jsp diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp similarity index 100% rename from maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp rename to archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteSyncedRepository.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteSyncedRepository.jsp similarity index 100% rename from maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteSyncedRepository.jsp rename to archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteSyncedRepository.jsp diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/editProxiedRepository.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editProxiedRepository.jsp similarity index 100% rename from maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/editProxiedRepository.jsp rename to archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editProxiedRepository.jsp diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp similarity index 100% rename from maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp rename to archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/editSyncedRepository.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editSyncedRepository.jsp similarity index 100% rename from maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/editSyncedRepository.jsp rename to archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editSyncedRepository.jsp diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/include/managedRepositoryForm.jspf b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/managedRepositoryForm.jspf similarity index 100% rename from maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/include/managedRepositoryForm.jspf rename to archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/managedRepositoryForm.jspf diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxiedRepositoryForm.jspf b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxiedRepositoryForm.jspf similarity index 100% rename from maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxiedRepositoryForm.jspf rename to archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxiedRepositoryForm.jspf diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/include/syncedRepositoryForm.jspf b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/syncedRepositoryForm.jspf similarity index 100% rename from maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/include/syncedRepositoryForm.jspf rename to archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/syncedRepositoryForm.jspf diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp similarity index 100% rename from maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp rename to archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp similarity index 100% rename from maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp rename to archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/selectSyncedRepository.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/selectSyncedRepository.jsp similarity index 100% rename from maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/selectSyncedRepository.jsp rename to archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/selectSyncedRepository.jsp diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/syncedRepositories.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/syncedRepositories.jsp similarity index 100% rename from maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/syncedRepositories.jsp rename to archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/syncedRepositories.jsp diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp similarity index 100% rename from maven-repository-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp rename to archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp similarity index 100% rename from maven-repository-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp rename to archiva-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp similarity index 100% rename from maven-repository-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp rename to archiva-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp similarity index 100% rename from maven-repository-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp rename to archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp similarity index 100% rename from maven-repository-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp rename to archiva-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/form.jspf b/archiva-webapp/src/main/webapp/WEB-INF/jsp/form.jspf similarity index 100% rename from maven-repository-webapp/src/main/webapp/WEB-INF/jsp/form.jspf rename to archiva-webapp/src/main/webapp/WEB-INF/jsp/form.jspf diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/generalError.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/generalError.jsp similarity index 100% rename from maven-repository-webapp/src/main/webapp/WEB-INF/jsp/generalError.jsp rename to archiva-webapp/src/main/webapp/WEB-INF/jsp/generalError.jsp diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/include/quickSearchForm.jspf b/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/quickSearchForm.jspf similarity index 100% rename from maven-repository-webapp/src/main/webapp/WEB-INF/jsp/include/quickSearchForm.jspf rename to archiva-webapp/src/main/webapp/WEB-INF/jsp/include/quickSearchForm.jspf diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp similarity index 100% rename from maven-repository-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp rename to archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/results.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp similarity index 100% rename from maven-repository-webapp/src/main/webapp/WEB-INF/jsp/results.jsp rename to archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp similarity index 100% rename from maven-repository-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp rename to archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag b/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag similarity index 100% rename from maven-repository-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag rename to archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/web.xml b/archiva-webapp/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from maven-repository-webapp/src/main/webapp/WEB-INF/web.xml rename to archiva-webapp/src/main/webapp/WEB-INF/web.xml diff --git a/maven-repository-webapp/src/main/webapp/css/maven-base.css b/archiva-webapp/src/main/webapp/css/maven-base.css similarity index 100% rename from maven-repository-webapp/src/main/webapp/css/maven-base.css rename to archiva-webapp/src/main/webapp/css/maven-base.css diff --git a/maven-repository-webapp/src/main/webapp/css/maven-theme.css b/archiva-webapp/src/main/webapp/css/maven-theme.css similarity index 100% rename from maven-repository-webapp/src/main/webapp/css/maven-theme.css rename to archiva-webapp/src/main/webapp/css/maven-theme.css diff --git a/maven-repository-webapp/src/main/webapp/css/print.css b/archiva-webapp/src/main/webapp/css/print.css similarity index 100% rename from maven-repository-webapp/src/main/webapp/css/print.css rename to archiva-webapp/src/main/webapp/css/print.css diff --git a/maven-repository-webapp/src/main/webapp/css/site.css b/archiva-webapp/src/main/webapp/css/site.css similarity index 100% rename from maven-repository-webapp/src/main/webapp/css/site.css rename to archiva-webapp/src/main/webapp/css/site.css diff --git a/maven-repository-webapp/src/main/webapp/images/collapsed.gif b/archiva-webapp/src/main/webapp/images/collapsed.gif similarity index 100% rename from maven-repository-webapp/src/main/webapp/images/collapsed.gif rename to archiva-webapp/src/main/webapp/images/collapsed.gif diff --git a/maven-repository-webapp/src/main/webapp/images/expanded.gif b/archiva-webapp/src/main/webapp/images/expanded.gif similarity index 100% rename from maven-repository-webapp/src/main/webapp/images/expanded.gif rename to archiva-webapp/src/main/webapp/images/expanded.gif diff --git a/maven-repository-webapp/src/main/webapp/images/external.png b/archiva-webapp/src/main/webapp/images/external.png similarity index 100% rename from maven-repository-webapp/src/main/webapp/images/external.png rename to archiva-webapp/src/main/webapp/images/external.png diff --git a/maven-repository-webapp/src/main/webapp/images/footerborder.gif b/archiva-webapp/src/main/webapp/images/footerborder.gif similarity index 100% rename from maven-repository-webapp/src/main/webapp/images/footerborder.gif rename to archiva-webapp/src/main/webapp/images/footerborder.gif diff --git a/maven-repository-webapp/src/main/webapp/images/icon_error_sml.gif b/archiva-webapp/src/main/webapp/images/icon_error_sml.gif similarity index 100% rename from maven-repository-webapp/src/main/webapp/images/icon_error_sml.gif rename to archiva-webapp/src/main/webapp/images/icon_error_sml.gif diff --git a/maven-repository-webapp/src/main/webapp/images/icon_info_sml.gif b/archiva-webapp/src/main/webapp/images/icon_info_sml.gif similarity index 100% rename from maven-repository-webapp/src/main/webapp/images/icon_info_sml.gif rename to archiva-webapp/src/main/webapp/images/icon_info_sml.gif diff --git a/maven-repository-webapp/src/main/webapp/images/icon_success_sml.gif b/archiva-webapp/src/main/webapp/images/icon_success_sml.gif similarity index 100% rename from maven-repository-webapp/src/main/webapp/images/icon_success_sml.gif rename to archiva-webapp/src/main/webapp/images/icon_success_sml.gif diff --git a/maven-repository-webapp/src/main/webapp/images/icon_warning_sml.gif b/archiva-webapp/src/main/webapp/images/icon_warning_sml.gif similarity index 100% rename from maven-repository-webapp/src/main/webapp/images/icon_warning_sml.gif rename to archiva-webapp/src/main/webapp/images/icon_warning_sml.gif diff --git a/maven-repository-webapp/src/main/webapp/images/newwindow.png b/archiva-webapp/src/main/webapp/images/newwindow.png similarity index 100% rename from maven-repository-webapp/src/main/webapp/images/newwindow.png rename to archiva-webapp/src/main/webapp/images/newwindow.png diff --git a/maven-repository-webapp/src/main/webapp/images/super.gif b/archiva-webapp/src/main/webapp/images/super.gif similarity index 100% rename from maven-repository-webapp/src/main/webapp/images/super.gif rename to archiva-webapp/src/main/webapp/images/super.gif diff --git a/maven-repository-webapp/src/main/webapp/images/super_hl.gif b/archiva-webapp/src/main/webapp/images/super_hl.gif similarity index 100% rename from maven-repository-webapp/src/main/webapp/images/super_hl.gif rename to archiva-webapp/src/main/webapp/images/super_hl.gif diff --git a/maven-repository-webapp/src/main/webapp/index.jsp b/archiva-webapp/src/main/webapp/index.jsp similarity index 100% rename from maven-repository-webapp/src/main/webapp/index.jsp rename to archiva-webapp/src/main/webapp/index.jsp diff --git a/maven-repository-webapp/src/main/webapp/template/repository-manager/radiomap.ftl b/archiva-webapp/src/main/webapp/template/repository-manager/radiomap.ftl similarity index 100% rename from maven-repository-webapp/src/main/webapp/template/repository-manager/radiomap.ftl rename to archiva-webapp/src/main/webapp/template/repository-manager/radiomap.ftl diff --git a/maven-repository-webapp/src/main/webapp/template/repository-manager/theme.properties b/archiva-webapp/src/main/webapp/template/repository-manager/theme.properties similarity index 100% rename from maven-repository-webapp/src/main/webapp/template/repository-manager/theme.properties rename to archiva-webapp/src/main/webapp/template/repository-manager/theme.properties diff --git a/maven-repository-webapp/src/test/java/org/apache/maven/repository/proxy/web/action/test/stub/HttpServletRequestStub.java b/archiva-webapp/src/test/java/org/apache/maven/repository/proxy/web/action/test/stub/HttpServletRequestStub.java similarity index 100% rename from maven-repository-webapp/src/test/java/org/apache/maven/repository/proxy/web/action/test/stub/HttpServletRequestStub.java rename to archiva-webapp/src/test/java/org/apache/maven/repository/proxy/web/action/test/stub/HttpServletRequestStub.java diff --git a/maven-repository-webapp/src/test/java/org/apache/maven/repository/proxy/web/action/test/stub/ServletRequestStub.java b/archiva-webapp/src/test/java/org/apache/maven/repository/proxy/web/action/test/stub/ServletRequestStub.java similarity index 100% rename from maven-repository-webapp/src/test/java/org/apache/maven/repository/proxy/web/action/test/stub/ServletRequestStub.java rename to archiva-webapp/src/test/java/org/apache/maven/repository/proxy/web/action/test/stub/ServletRequestStub.java diff --git a/maven-repository-webapp/src/test/resources/unit/proxy-test/maven-proxy-complete.conf b/archiva-webapp/src/test/resources/unit/proxy-test/maven-proxy-complete.conf similarity index 100% rename from maven-repository-webapp/src/test/resources/unit/proxy-test/maven-proxy-complete.conf rename to archiva-webapp/src/test/resources/unit/proxy-test/maven-proxy-complete.conf diff --git a/maven-meeper/pom.xml b/maven-meeper/pom.xml index 81abc0924..158a2c353 100644 --- a/maven-meeper/pom.xml +++ b/maven-meeper/pom.xml @@ -19,14 +19,12 @@ - maven-repository-manager - org.apache.maven.repository - 2.1-SNAPSHOT + archiva + org.apache.maven.archiva + 1.0-SNAPSHOT 4.0.0 maven-meeper - jar + pom Maven Meeper - 1.0-SNAPSHOT - diff --git a/pom.xml b/pom.xml index 46c227b97..8e57c63a8 100644 --- a/pom.xml +++ b/pom.xml @@ -22,13 +22,13 @@ 1 ../pom/maven/pom.xml - org.apache.maven.repository - maven-repository-manager + org.apache.maven.archiva + archiva pom - Maven Repository Manager + Archiva 1.0-SNAPSHOT - The Maven Repository Manager is an application for managing one or more remote repositories, including + Archiva is an application for managing one or more remote repositories, including administration, artifact handling, browsing and searching. @@ -115,19 +115,17 @@ - - maven-repository-artifact-applet - maven-repository-converter - maven-repository-discovery - maven-repository-reports-standard - maven-repository-indexer - maven-repository-utils - maven-repository-webapp - maven-repository-proxy - maven-repository-core - maven-repository-configuration + archiva-applet + archiva-converter + archiva-discoverer + archiva-reports-standard + archiva-indexer + archiva-utils + archiva-webapp + archiva-proxy + archiva-core + archiva-configuration + maven-meeper @@ -200,48 +198,48 @@ 1.0-alpha-6 - org.apache.maven.repository - maven-repository-core + org.apache.maven.archiva + archiva-core ${pom.version} - org.apache.maven.repository - maven-repository-reports-standard + org.apache.maven.archiva + archiva-reports-standard ${pom.version} - org.apache.maven.repository - maven-repository-discovery + org.apache.maven.archiva + archiva-discoverer ${pom.version} - org.apache.maven.repository - maven-repository-indexer + org.apache.maven.archiva + archiva-indexer ${pom.version} - org.apache.maven.repository - maven-repository-proxy + org.apache.maven.archiva + archiva-proxy ${pom.version} - org.apache.maven.repository - maven-repository-utils + org.apache.maven.archiva + archiva-utils ${pom.version} - org.apache.maven.repository - maven-repository-artifact-applet + org.apache.maven.archiva + archiva-applet ${pom.version} - org.apache.maven.repository - maven-repository-configuration + org.apache.maven.archiva + archiva-configuration ${pom.version} - org.apache.maven.repository - maven-repository-converter + org.apache.maven.archiva + archiva-converter ${pom.version}