From a13bfb5a01af459e734d2f5b4b36d227a8a03a91 Mon Sep 17 00:00:00 2001 From: Martin Stockhammer Date: Mon, 6 May 2019 22:08:19 +0200 Subject: [PATCH] Moving maven specific modules --- .../archiva-consumer-archetype/pom.xml | 4 +- .../archetype-resources/pom.xml | 4 +- .../archiva-core-consumers/pom.xml | 20 ++------ .../archiva-lucene-consumers/pom.xml | 4 +- .../archiva-base/archiva-converter/pom.xml | 10 +--- .../archiva-repository-admin-default/pom.xml | 4 +- .../archiva-repository-layer/pom.xml | 14 ------ archiva-modules/archiva-base/pom.xml | 1 - .../archiva-maven-metadata/pom.xml | 8 ++++ .../model/maven2/MavenArtifactFacet.java | 0 .../archiva-maven-proxy}/pom.xml | 15 ++---- .../maven/MavenRepositoryProxyHandler.java | 0 .../resources/META-INF/spring-context.xml | 0 .../MockRepositoryArchivaTaskScheduler.java | 0 .../archiva/proxy/AbstractProxyTestCase.java | 0 .../proxy/CacheFailuresTransferTest.java | 0 .../archiva/proxy/ChecksumTransferTest.java | 0 .../archiva/proxy/ErrorHandlingTest.java | 0 .../archiva/proxy/HttpProxyTransferTest.java | 0 .../proxy/ManagedDefaultTransferTest.java | 0 .../archiva/proxy/MetadataTransferTest.java | 0 .../archiva/proxy/MockConfiguration.java | 0 .../archiva/proxy/SnapshotTransferTest.java | 0 .../apache/archiva/proxy/WagonDelegate.java | 0 .../proxy/common/WagonFactoryTest.java | 0 .../mock/ArchivaIndexManagerMock.java | 0 .../mock/ManagedRepositoryContentMock.java | 0 .../mock/RemoteRepositoryContentMock.java | 0 .../mock/RepositoryContentProviderMock.java | 0 .../mock/RepositoryProviderMock.java | 0 .../create-managed-to-proxy-map.sh | 0 .../repositories/managed-to-proxy-map.txt | 0 .../1.0/get-bad-local-checksum-1.0.jar | 0 .../1.0/get-bad-local-checksum-1.0.jar.md5 | 0 .../1.0/get-bad-local-checksum-1.0.jar.sha1 | 0 ...et-checksum-from-managed-repo-1.0.jar.sha1 | 0 ...et-default-layout-present-with-pom-1.0.jar | 0 ...et-default-layout-present-with-pom-1.0.pom | 0 .../1.0/get-default-layout-present-1.0.jar | 0 .../get-default-layout-present-1.0.jar.asc | 0 .../get-default-layout-present-1.0.jar.md5 | 0 .../1.0/get-default-metadata-1.0.jar | 0 .../1.0/maven-metadata.xml | 0 .../1.0/get-doubly-relocated-artefact-1.0.pom | 0 .../get-merged-metadata/maven-metadata.xml | 0 .../get-not-on-remotes-1.0-beta-2.jar | 0 .../1.0-beta-2/maven-metadata.xml | 0 .../get-not-on-remotes/maven-metadata.xml | 0 .../1.0.22/get-on-local-on-remote-1.0.22.pom | 0 .../1.0.22/maven-metadata.xml | 0 .../1.0.8/get-on-local-on-remote-1.0.8.pom | 0 .../get-on-local-on-remote/maven-metadata.xml | 0 .../1.0/get-on-multiple-repos-1.0.pom | 0 .../1.0/maven-metadata.xml | 0 .../get-on-multiple-repos/maven-metadata.xml | 0 ...etadata-snapshot-1.0-20050831.101112-1.jar | 0 .../1.0-SNAPSHOT/maven-metadata.xml | 0 ...sent-timestamped-snapshot-1.0-SNAPSHOT.jar | 0 .../1.0/get-project-metadata-1.0.jar | 0 .../1.1/get-project-metadata-1.1.jar | 0 .../2.0/get-project-metadata-2.0.pom | 0 .../get-project-metadata/maven-metadata.xml | 0 .../2.2/get-release-metadata-2.2.jar | 0 .../2.2/maven-metadata.xml | 0 .../get-relocated-artefact-with-pom-1.0.pom | 0 .../1.0/get-relocated-artefact-1.0.pom | 0 .../1.0/get-removed-from-proxies-1.0.jar | 0 .../1.0/maven-metadata.xml | 0 ...t-remote-2.0-alpha-2-20070821.123456-1.jar | 0 ...t-remote-2.0-alpha-2-20070821.220304-2.jar | 0 .../2.0-alpha-2-SNAPSHOT/maven-metadata.xml | 0 ...snapshot-popular-2.0-20070821.102030-1.jar | 0 ...snapshot-popular-2.0-20070821.185701-2.jar | 0 ...snapshot-popular-2.0-20070822.021008-3.jar | 0 .../2.0-SNAPSHOT/maven-metadata.xml | 0 .../get-updated-metadata/.metadata-proxied1 | 0 .../1.0-SNAPSHOT/.metadata-proxied1 | 0 .../1.0-SNAPSHOT/maven-metadata.xml | 0 .../get-updated-metadata/maven-metadata.xml | 0 .../get-not-on-remotes/maven-metadata.xml | 0 .../get-on-local-on-remote/maven-metadata.xml | 0 .../get-on-multiple-repos/maven-metadata.xml | 0 .../get-project-metadata/maven-metadata.xml | 0 .../1.0/get-bad-local-checksum-1.0.jar | 0 .../1.0/get-checksum-both-bad-1.0.jar | 0 .../1.0/get-checksum-both-bad-1.0.jar.md5 | 0 .../1.0/get-checksum-both-bad-1.0.jar.sha1 | 0 .../1.0/get-checksum-both-right-1.0.jar | 0 .../1.0/get-checksum-both-right-1.0.jar.md5 | 0 .../1.0/get-checksum-both-right-1.0.jar.sha1 | 0 ...et-checksum-from-managed-repo-1.0.jar.sha1 | 0 .../1.0/get-checksum-md5-bad-sha1-1.0.jar | 0 .../1.0/get-checksum-md5-bad-sha1-1.0.jar.md5 | 0 .../get-checksum-md5-bad-sha1-1.0.jar.sha1 | 0 .../1.0/get-checksum-md5-only-1.0.jar | 0 .../1.0/get-checksum-md5-only-1.0.jar.md5 | 0 .../1.0/get-checksum-sha1-bad-md5-1.0.jar | 0 .../1.0/get-checksum-sha1-bad-md5-1.0.jar.md5 | 0 .../get-checksum-sha1-bad-md5-1.0.jar.sha1 | 0 .../1.0/get-checksum-sha1-only-1.0.jar | 0 .../1.0/get-checksum-sha1-only-1.0.jar.sha1 | 0 .../1.0/get-default-layout-present-1.0.jar | 0 .../get-default-layout-present-1.0.jar.asc | 0 .../1.0/get-default-layout-1.0.jar | 0 .../1.0/get-default-layout-1.0.jar.asc | 0 .../get-default-layout/1.0/maven-metadata.xml | 0 .../get-default-layout/maven-metadata.xml | 0 .../1.0/maven-metadata.xml | 0 .../get-found-in-proxy-1.0.5-javadoc.jar | 0 .../get-found-in-proxy/maven-metadata.xml | 0 .../1.0/get-in-both-proxies-1.0.jar | 0 .../get-merged-metadata/maven-metadata.xml | 0 ...etadata-snapshot-1.0-20050831.101112-1.jar | 0 .../1.0-SNAPSHOT/maven-metadata.xml | 0 .../1.0.22/maven-metadata.xml | 0 .../get-on-local-on-remote/maven-metadata.xml | 0 .../1.0/maven-metadata.xml | 0 .../get-on-multiple-repos/maven-metadata.xml | 0 ...etadata-snapshot-1.0-20050831.101112-1.jar | 0 .../1.0-SNAPSHOT/maven-metadata.xml | 0 ...sent-timestamped-snapshot-1.0-SNAPSHOT.jar | 0 ...snapshot-popular-2.0-20070819.040004-1.jar | 0 ...snapshot-popular-2.0-20070822.145534-9.jar | 0 .../2.0-SNAPSHOT/maven-metadata.xml | 0 ...snapshot-in-both-1.0-20061222.034118-1.jar | 0 ...snapshot-in-both-1.0-20061227.112101-2.jar | 0 ...estamped-snapshot-in-both-1.0-SNAPSHOT.jar | 0 .../1.0-SNAPSHOT/maven-metadata.xml | 0 .../get-timestamped-snapshot-1.0-SNAPSHOT.jar | 0 .../1.0-SNAPSHOT/maven-metadata.xml | 0 .../get-updated-metadata/maven-metadata.xml | 0 .../get-default-layout/maven-metadata.xml | 0 .../get-found-in-proxy/maven-metadata.xml | 0 .../get-on-local-on-remote/maven-metadata.xml | 0 .../get-on-multiple-repos/maven-metadata.xml | 0 .../1.0.1/get-default-layout-1.0.1.pom | 0 .../1.0/get-default-layout-1.0.jar | 0 .../get-default-layout/1.0/maven-metadata.xml | 0 .../get-default-layout/maven-metadata.xml | 0 .../1.0/get-in-both-proxies-1.0.jar | 0 .../1.0/get-in-second-proxy-1.0.jar | 0 .../get-merged-metadata/maven-metadata.xml | 0 .../1.0/maven-metadata.xml | 0 .../get-on-multiple-repos/maven-metadata.xml | 0 ...snapshot-popular-2.0-20070821.102030-1.jar | 0 ...snapshot-popular-2.0-20070823.111741-5.jar | 0 ...snapshot-popular-2.0-20070823.212711-6.jar | 0 .../2.0-SNAPSHOT/maven-metadata.xml | 0 ...snapshot-in-both-1.0-20061222.034118-1.jar | 0 ...snapshot-in-both-1.0-20070101.000103-2.jar | 0 ...estamped-snapshot-in-both-1.0-SNAPSHOT.jar | 0 .../1.0-SNAPSHOT/maven-metadata.xml | 0 .../get-default-layout/maven-metadata.xml | 0 .../get-on-multiple-repos/maven-metadata.xml | 0 .../resources/META-INF/spring-context.xml | 0 .../src/test/resources/spring-context.xml | 0 .../archiva-maven-repository}/pom.xml | 16 +++---- .../ArchivaRepositoryConnectorFactory.java | 0 .../tree/maven2/DependencyTreeBuilder.java | 0 .../DependencyTreeBuilderException.java | 0 .../maven2/Maven3DependencyTreeBuilder.java | 0 .../maven2/TreeDependencyNodeVisitor.java | 0 .../maven2/ArtifactMappingProvider.java | 0 .../ArtifactMetadataVersionComparator.java | 0 .../DefaultArtifactMappingProvider.java | 0 .../DummyLifecycleBindingsInjector.java | 0 .../Maven2RepositoryPathTranslator.java | 0 .../maven2/Maven2RepositoryStorage.java | 0 .../maven2/MavenArtifactFacetFactory.java | 0 .../storage/maven2/MavenProjectFacet.java | 0 .../maven2/MavenProjectFacetFactory.java | 0 .../storage/maven2/MavenProjectParent.java | 0 .../maven2/RepositoryModelResolver.java | 0 .../AbstractDefaultRepositoryContent.java | 0 .../maven2/ArtifactExtensionMapping.java | 0 .../content/maven2/DefaultPathParser.java | 0 .../content/maven2/FilenameParser.java | 0 .../ManagedDefaultRepositoryContent.java | 0 .../content/maven2/MavenContentProvider.java | 0 .../RemoteDefaultRepositoryContent.java | 0 .../content/maven2/RepositoryRequest.java | 0 .../maven2/MavenManagedRepository.java | 0 .../maven2/MavenRemoteRepository.java | 0 .../maven2/MavenRepositoryProvider.java | 0 .../repository/maven2/MavenSystemManager.java | 0 .../resources/META-INF/spring-context.xml | 0 .../expected-poms/archiva-model-effective.pom | 0 .../src/test/expected-poms/cocoon-1.pom | 0 .../src/test/expected-poms/maven-parent-4.pom | 0 .../expected-poms/model-write-400-simple.pom | 0 .../test-project-model-effective.pom | 0 .../archiva/configuration/MockRepoAdmin.java | 0 .../configuration/TestConfiguration.java | 0 .../DependencyTreeBuilderTestMaven3.java | 0 .../MockRepositoryArchivaTaskScheduler.java | 0 .../repository/TestMetadataResolver.java | 0 ...tractDefaultRepositoryContentTestCase.java | 0 .../ManagedDefaultRepositoryContentTest.java | 0 ...yMetadataResolverMRM1411RepoGroupTest.java | 0 ...RepositoryMetadataResolverMRM1411Test.java | 0 ...oryMetadataResolverManagedReleaseTest.java | 0 ...ryMetadataResolverManagedSnapshotTest.java | 0 .../Maven2RepositoryMetadataResolverTest.java | 0 .../MavenRepositoryMetadataReaderTest.java | 0 .../repository/storage/maven2/MockWagon.java | 0 .../RemoteDefaultRepositoryContentTest.java | 0 .../maven2/conf/MockConfiguration.java | 0 .../AbstractRepositoryLayerTestCase.java | 0 .../archiva/repository/RepositoryURLTest.java | 0 .../maven2/ArtifactExtensionMappingTest.java | 0 .../content/maven2/DefaultPathParserTest.java | 0 .../content/maven2/FilenameParserTest.java | 0 .../content/maven2/RepositoryRequestTest.java | 0 .../index/mock/ArchivaIndexManagerMock.java | 0 .../index/mock/MavenIndexContextMock.java | 0 .../maven2/MavenRepositoryProviderTest.java | 0 .../metadata/Maven2RepositoryStorageTest.java | 0 .../metadata/MetadataToolsTest.java | 0 .../RepositoryMetadataReaderTest.java | 0 .../RepositoryMetadataWriterTest.java | 0 .../repositories/default-repository/CVS/Root | 0 .../test/repositories/default-repository/KEYS | 0 .../invalid/invalid-1.0.jar | 0 .../invalid-1.0-20050611.123456-1.jar | 0 .../invalid/1.0-SNAPSHOT/invalid-1.0.jar | 0 .../invalid/invalid/1.0/invalid-1.0b.jar | 0 .../invalid/invalid/1.0/invalid-2.0.jar | 0 .../invalid/invalid/1/invalid-1 | 0 .../javax/maven-metadata.xml | 0 .../javax/sql/jdbc/2.0/jdbc-2.0.jar | 0 .../jdbc/2.0/maven-metadata-repository.xml | 0 .../sql/jdbc/maven-metadata-repository.xml | 0 .../javax/sql/maven-metadata-repository.xml | 0 .../sample-parent-2.1-20090807.095532-1.pom | 0 .../sample-parent-2.1-20090808.085535-2.pom | 0 .../sample-project-2.1-SNAPSHOT.pom | 0 .../axis2-1.3-20070725.210059-1.pom | 0 .../axis2-1.3-20070725.210059-1.pom.md5 | 0 .../axis2-1.3-20070725.210059-1.pom.sha1 | 0 .../axis2-1.3-20070725.232304-2.pom | 0 .../axis2-1.3-20070725.232304-2.pom.md5 | 0 .../axis2-1.3-20070725.232304-2.pom.sha1 | 0 .../axis2-1.3-20070726.053327-3.pom | 0 .../axis2-1.3-20070726.053327-3.pom.md5 | 0 .../axis2-1.3-20070726.053327-3.pom.sha1 | 0 .../axis2-1.3-20070726.173653-5.pom | 0 .../axis2-1.3-20070726.173653-5.pom.md5 | 0 .../axis2-1.3-20070726.173653-5.pom.sha1 | 0 .../axis2-1.3-20070727.113106-7.pom | 0 .../axis2-1.3-20070727.113106-7.pom.md5 | 0 .../axis2-1.3-20070727.113106-7.pom.sha1 | 0 .../axis2-1.3-20070728.053229-10.pom | 0 .../axis2-1.3-20070728.053229-10.pom.md5 | 0 .../axis2-1.3-20070728.053229-10.pom.sha1 | 0 .../axis2-1.3-20070728.112043-11.pom | 0 .../axis2-1.3-20070728.112043-11.pom.md5 | 0 .../axis2-1.3-20070728.112043-11.pom.sha1 | 0 .../axis2-1.3-20070729.171937-16.pom | 0 .../axis2-1.3-20070729.171937-16.pom.md5 | 0 .../axis2-1.3-20070729.171937-16.pom.sha1 | 0 .../axis2-1.3-20070730.232112-20.pom | 0 .../axis2-1.3-20070730.232112-20.pom.md5 | 0 .../axis2-1.3-20070730.232112-20.pom.sha1 | 0 .../axis2-1.3-20070731.113304-21.pom | 0 .../axis2-1.3-20070731.113304-21.pom.md5 | 0 .../axis2-1.3-20070731.113304-21.pom.sha1 | 0 .../axis2-1.3-20070731.172936-22.pom | 0 .../axis2-1.3-20070731.172936-22.pom.md5 | 0 .../axis2-1.3-20070731.172936-22.pom.sha1 | 0 .../axis2-1.3-20070802.113139-29.pom | 0 .../axis2-1.3-20070802.113139-29.pom.md5 | 0 .../axis2-1.3-20070802.113139-29.pom.sha1 | 0 .../axis2/1.3-SNAPSHOT/maven-metadata.xml | 0 .../axis2/1.3-SNAPSHOT/maven-metadata.xml.md5 | 0 .../1.3-SNAPSHOT/maven-metadata.xml.sha1 | 0 .../org/apache/cocoon/cocoon/1/cocoon-1.pom | 0 .../org/apache/maven/A/1.0/A-1.0.pom | 0 .../org/apache/maven/A/1.0/A-1.0.war | 0 .../org/apache/maven/B/1.0/B-1.0.pom | 0 .../org/apache/maven/B/2.0/B-2.0.pom | 0 .../org/apache/maven/C/1.0/C-1.0.pom | 0 .../org/apache/maven/C/1.0/C-1.0.war | 0 .../archiva-applet-1.0-SNAPSHOT.pom | 0 .../archiva-base-1.0-SNAPSHOT.pom | 0 .../1.0-SNAPSHOT/archiva-cli-1.0-SNAPSHOT.pom | 0 .../archiva-common-1.0-SNAPSHOT.pom | 0 .../archiva-configuration-1.0-SNAPSHOT.pom | 0 .../archiva-consumer-api-1.0-SNAPSHOT.pom | 0 .../archiva-consumers-1.0-SNAPSHOT.pom | 0 .../archiva-converter-1.0-SNAPSHOT.pom | 0 .../archiva-core-consumers-1.0-SNAPSHOT.pom | 0 .../archiva-core-1.0-SNAPSHOT.pom | 0 .../archiva-discoverer-1.0-SNAPSHOT.pom | 0 .../archiva-indexer-1.0-SNAPSHOT.pom | 0 .../archiva-model-1.0-SNAPSHOT.pom | 0 .../archiva-parent-1.0-SNAPSHOT.pom | 0 ...rchiva-plexus-application-1.0-SNAPSHOT.pom | 0 .../archiva-plexus-runtime-1.0-SNAPSHOT.pom | 0 .../archiva-proxy-1.0-SNAPSHOT.pom | 0 .../archiva-reports-standard-1.0-SNAPSHOT.pom | 0 .../archiva-repository-layer-1.0-SNAPSHOT.pom | 0 .../archiva-security-1.0-SNAPSHOT.pom | 0 .../archiva-webapp-1.0-SNAPSHOT.pom | 0 .../archiva-xml-tools-1.0-SNAPSHOT.pom | 0 .../archiva-1.0-20061126.005254-2.pom | 0 .../archiva-1.0-SNAPSHOT-site.xml | 0 .../1.0-SNAPSHOT/archiva-1.0-SNAPSHOT.pom | 0 .../maven/discovery/1.0/discovery-1.0.pom | 0 .../org/apache/maven/maven-metadata.xml | 0 .../maven-parent/4/maven-parent-4-site.xml | 0 .../maven-parent/4/maven-parent-4-site_en.xml | 0 .../maven/maven-parent/4/maven-parent-4.pom | 0 .../maven-parent/4/maven-parent-4.pom.sha1 | 0 .../maven/samplejar/1.0/samplejar-1.0.jar | 0 .../maven/samplejar/1.0/samplejar-1.0.pom | 0 .../maven/samplejar/2.0/samplejar-2.0.jar | 0 .../maven/samplejar/2.0/samplejar-2.0.pom | 0 .../apache/maven/samplejar/maven-metadata.xml | 0 .../1.0/maven-downloader-1.0-javadoc.jar | Bin .../1.0/maven-downloader-1.0-javadoc.jar.md5 | 0 .../1.0/maven-downloader-1.0-javadoc.jar.sha1 | 0 .../1.0/maven-downloader-1.0-sources.jar | Bin .../1.0/maven-downloader-1.0-sources.jar.md5 | 0 .../1.0/maven-downloader-1.0-sources.jar.sha1 | 0 .../1.0/maven-downloader-1.0.jar | Bin .../1.0/maven-downloader-1.0.jar.md5 | 0 .../1.0/maven-downloader-1.0.jar.sha1 | 0 .../1.0/maven-downloader-1.0.pom | 0 .../1.0/maven-downloader-1.0.pom.md5 | 0 .../1.0/maven-downloader-1.0.pom.sha1 | 0 .../1.1/maven-downloader-1.1-javadoc.jar | Bin .../1.1/maven-downloader-1.1-javadoc.jar.md5 | 0 .../1.1/maven-downloader-1.1-javadoc.jar.sha1 | 0 .../1.1/maven-downloader-1.1-sources.jar | Bin .../1.1/maven-downloader-1.1-sources.jar.md5 | 0 .../1.1/maven-downloader-1.1-sources.jar.sha1 | 0 .../1.1/maven-downloader-1.1.jar | Bin .../1.1/maven-downloader-1.1.jar.md5 | 0 .../1.1/maven-downloader-1.1.jar.sha1 | 0 .../1.1/maven-downloader-1.1.pom | 0 .../1.1/maven-downloader-1.1.pom.md5 | 0 .../1.1/maven-downloader-1.1.pom.sha1 | 0 .../maven-downloader/maven-metadata.xml | 0 .../maven-downloader/maven-metadata.xml.md5 | 0 .../maven-downloader/maven-metadata.xml.sha1 | 0 .../maven/some-ejb/1.0/maven-metadata.xml | 0 .../some-ejb/1.0/some-ejb-1.0-client.jar | 0 .../test-1.0-20050611.112233-1-javadoc.jar | 0 .../test-1.0-20050611.112233-1.jar | 0 ...wrong-artifactId-1.0-20050611.112233-1.jar | 0 .../2.0.4-SNAPSHOT/test-2.0.4-SNAPSHOT.pom | 0 .../maven/testing/1.0/testing-1.0-sources.jar | 0 .../testing/1.0/testing-1.0-test-sources.jar | 0 .../apache/maven/testing/1.0/testing-1.0.jar | 0 .../maven/testing/1.0/testing-1.0.tar.gz | 0 .../apache/maven/testing/1.0/testing-1.0.zip | 0 .../1.0/test-not-updated-1.0.jar | 0 .../1.0/test-not-updated-1.0.pom | 0 .../test-not-updated/maven-metadata.xml | 0 .../test-updated/1.0/test-updated-1.0.jar | 0 .../test-updated/1.0/test-updated-1.0.pom | 0 .../update/test-updated/maven-metadata.xml | 0 .../testgroup/discovery/1.0/discovery-1.0.pom | 0 .../discovery/1.0/maven-metadata.xml | 0 .../testgroup/discovery/maven-metadata.xml | 0 .../2.4.4/test-project-api-2.4.4.pom | 0 .../2.4.4/test-project-broker-ejb-2.4.4.pom | 0 .../2.4.4/test-project-broker-pom-2.4.4.pom | 0 .../2.4.4/test-project-common-2.4.4.pom | 0 .../2.4.4/test-project-endpoint-ejb-2.4.4.pom | 0 .../2.4.4/test-project-endpoint-pom-2.4.4.pom | 0 .../test-project/2.4.4/test-project-2.4.4.pom | 0 .../metadata/tests/bad_artifact/empty.txt | 0 .../tests/include_xml/1.0/include_xml-1.0.pom | 0 .../tests/include_xml/1.0/include_xml-1.0.xml | 0 .../tests/include_xml/1.0/maven-metadata.xml | 0 .../1.0/incomplete_metadata_a-1.0.pom | 0 .../incomplete_metadata_a/maven-metadata.xml | 0 .../1.0-SNAPSHOT/maven-metadata.xml | 0 ...missing_artifact-1.0-20091007.132409-1.jar | 0 ...missing_artifact-1.0-20091007.132409-1.pom | 0 .../1.2-SNAPSHOT/maven-metadata.xml | 0 ...missing_artifact-1.2-20091011.133751-1.jar | 0 ...missing_artifact-1.2-20091011.133751-1.pom | 0 .../tests/missing_artifact/maven-metadata.xml | 0 .../1.0/missing_metadata_a-1.0.pom | 0 .../1.0.1/missing_metadata_b-1.0.1.pom | 0 .../1.0/missing_metadata_b-1.0.pom | 0 .../missing_metadata_b-2.0-20070821-dev.pom | 0 .../2.0.1/missing_metadata_b-2.0.1.jar | 0 .../2.0/missing_metadata_b-2.0.pom | 0 .../proxied_multi/1.0/proxied_multi-1.0.pom | 0 .../proxied_multi/1.1/proxied_multi-1.1.pom | 0 .../proxied_multi/2.1/proxied_multi-2.1.pom | 0 .../proxied_multi/maven-metadata-central.xml | 0 .../proxied_multi/maven-metadata-java.net.xml | 0 .../tests/proxied_multi/maven-metadata.xml | 0 .../maven-metadata-apache-snapshots.xml | 0 .../maven-metadata-internal-snapshots.xml | 0 .../maven-metadata-snapshots.codehaus.org.xml | 0 .../1.0-alpha-11-SNAPSHOT/maven-metadata.xml | 0 ...1.0-alpha-11-20070221.194724-2-javadoc.jar | 0 ...1.0-alpha-11-20070221.194724-2-sources.jar | 0 ...shots_a-1.0-alpha-11-20070221.194724-2.pom | 0 ...shots_a-1.0-alpha-11-20070221.194724-2.war | 0 ...1.0-alpha-11-20070302.212723-3-sources.jar | 0 ...shots_a-1.0-alpha-11-20070302.212723-3.pom | 0 ...shots_a-1.0-alpha-11-20070302.212723-3.war | 0 ...1.0-alpha-11-20070303.152828-4-sources.jar | 0 ...shots_a-1.0-alpha-11-20070303.152828-4.pom | 0 ...shots_a-1.0-alpha-11-20070303.152828-4.war | 0 ...shots_a-1.0-alpha-11-20070305.215149-5.pom | 0 ..._a-1.0-alpha-11-20070305.215149-5.pom.sha1 | 0 ...shots_a-1.0-alpha-11-20070305.215149-5.war | 0 ..._a-1.0-alpha-11-20070305.215149-5.war.sha1 | 0 ...shots_a-1.0-alpha-11-20070307.170909-6.pom | 0 ..._a-1.0-alpha-11-20070307.170909-6.pom.sha1 | 0 ...shots_a-1.0-alpha-11-20070307.170909-6.war | 0 ..._a-1.0-alpha-11-20070307.170909-6.war.sha1 | 0 ...shots_a-1.0-alpha-11-20070314.211405-9.pom | 0 ..._a-1.0-alpha-11-20070314.211405-9.pom.sha1 | 0 ...shots_a-1.0-alpha-11-20070314.211405-9.war | 0 ..._a-1.0-alpha-11-20070314.211405-9.war.sha1 | 0 ...hots_a-1.0-alpha-11-20070316.175232-11.pom | 0 ...a-1.0-alpha-11-20070316.175232-11.pom.sha1 | 0 ...hots_a-1.0-alpha-11-20070316.175232-11.war | 0 ...a-1.0-alpha-11-20070316.175232-11.war.sha1 | 0 ..._shots_a-1.0-alpha-11-SNAPSHOT-sources.jar | 0 .../snap_shots_a-1.0-alpha-11-SNAPSHOT.pom | 0 .../snap_shots_a-1.0-alpha-11-SNAPSHOT.war | 0 .../2.2-SNAPSHOT/maven-metadata.xml | 0 .../snap_shots_b-2.2-20070221.172940-1.jar | 0 ...snap_shots_b-2.2-20070221.172940-1.jar.md5 | 0 ...nap_shots_b-2.2-20070221.172940-1.jar.sha1 | 0 .../snap_shots_b-2.2-20070221.172940-1.pom | 0 ...snap_shots_b-2.2-20070221.172940-1.pom.md5 | 0 ...nap_shots_b-2.2-20070221.172940-1.pom.sha1 | 0 ..._shots_b-2.2-20070221.194724-2-sources.jar | 0 ...ts_b-2.2-20070221.194724-2-sources.jar.md5 | 0 ...s_b-2.2-20070221.194724-2-sources.jar.sha1 | 0 .../snap_shots_b-2.2-20070221.194724-2.jar | 0 ...snap_shots_b-2.2-20070221.194724-2.jar.md5 | 0 ...nap_shots_b-2.2-20070221.194724-2.jar.sha1 | 0 .../snap_shots_b-2.2-20070221.194724-2.pom | 0 ...snap_shots_b-2.2-20070221.194724-2.pom.md5 | 0 ...nap_shots_b-2.2-20070221.194724-2.pom.sha1 | 0 ..._shots_b-2.2-20070302.212723-3-sources.jar | 0 ...ts_b-2.2-20070302.212723-3-sources.jar.md5 | 0 ...s_b-2.2-20070302.212723-3-sources.jar.sha1 | 0 .../snap_shots_b-2.2-20070302.212723-3.jar | 0 ...snap_shots_b-2.2-20070302.212723-3.jar.md5 | 0 ...nap_shots_b-2.2-20070302.212723-3.jar.sha1 | 0 .../snap_shots_b-2.2-20070302.212723-3.pom | 0 ...snap_shots_b-2.2-20070302.212723-3.pom.md5 | 0 ...nap_shots_b-2.2-20070302.212723-3.pom.sha1 | 0 ..._shots_b-2.2-20070303.152828-4-sources.jar | 0 ...ts_b-2.2-20070303.152828-4-sources.jar.md5 | 0 ...s_b-2.2-20070303.152828-4-sources.jar.sha1 | 0 .../snap_shots_b-2.2-20070303.152828-4.jar | 0 ...snap_shots_b-2.2-20070303.152828-4.jar.md5 | 0 ...nap_shots_b-2.2-20070303.152828-4.jar.sha1 | 0 .../snap_shots_b-2.2-20070303.152828-4.pom | 0 ...snap_shots_b-2.2-20070303.152828-4.pom.md5 | 0 ...nap_shots_b-2.2-20070303.152828-4.pom.sha1 | 0 .../snap_shots_b-2.2-20070305.215149-5.jar | 0 ...snap_shots_b-2.2-20070305.215149-5.jar.md5 | 0 ...nap_shots_b-2.2-20070305.215149-5.jar.sha1 | 0 .../snap_shots_b-2.2-20070305.215149-5.pom | 0 ...snap_shots_b-2.2-20070305.215149-5.pom.md5 | 0 ...nap_shots_b-2.2-20070305.215149-5.pom.sha1 | 0 .../snap_shots_b-2.2-20070307.170909-6.jar | 0 ...snap_shots_b-2.2-20070307.170909-6.jar.md5 | 0 ...nap_shots_b-2.2-20070307.170909-6.jar.sha1 | 0 .../snap_shots_b-2.2-20070307.170909-6.pom | 0 ...snap_shots_b-2.2-20070307.170909-6.pom.md5 | 0 ...nap_shots_b-2.2-20070307.170909-6.pom.sha1 | 0 .../snap_shots_b-2.2-20070314.190911-7.jar | 0 ...snap_shots_b-2.2-20070314.190911-7.jar.md5 | 0 ...nap_shots_b-2.2-20070314.190911-7.jar.sha1 | 0 .../snap_shots_b-2.2-20070314.190911-7.pom | 0 ...snap_shots_b-2.2-20070314.190911-7.pom.md5 | 0 ...nap_shots_b-2.2-20070314.190911-7.pom.sha1 | 0 .../snap_shots_b-2.2-20070314.193642-8.jar | 0 ...snap_shots_b-2.2-20070314.193642-8.jar.md5 | 0 ...nap_shots_b-2.2-20070314.193642-8.jar.sha1 | 0 .../snap_shots_b-2.2-20070314.193642-8.pom | 0 ...snap_shots_b-2.2-20070314.193642-8.pom.md5 | 0 ...nap_shots_b-2.2-20070314.193642-8.pom.sha1 | 0 ..._shots_b-2.2-20070314.211405-9-javadoc.jar | 0 ...ts_b-2.2-20070314.211405-9-javadoc.jar.md5 | 0 ...s_b-2.2-20070314.211405-9-javadoc.jar.sha1 | 0 ..._shots_b-2.2-20070314.211405-9-sources.jar | 0 ...ts_b-2.2-20070314.211405-9-sources.jar.md5 | 0 ...s_b-2.2-20070314.211405-9-sources.jar.sha1 | 0 .../snap_shots_b-2.2-20070314.211405-9.jar | 0 ...snap_shots_b-2.2-20070314.211405-9.jar.md5 | 0 ...nap_shots_b-2.2-20070314.211405-9.jar.sha1 | 0 .../snap_shots_b-2.2-20070314.211405-9.pom | 0 ...snap_shots_b-2.2-20070314.211405-9.pom.md5 | 0 ...nap_shots_b-2.2-20070314.211405-9.pom.sha1 | 0 .../snap_shots_b-2.2-20070316.153953-10.jar | 0 ...nap_shots_b-2.2-20070316.153953-10.jar.md5 | 0 ...ap_shots_b-2.2-20070316.153953-10.jar.sha1 | 0 .../snap_shots_b-2.2-20070316.153953-10.pom | 0 ...nap_shots_b-2.2-20070316.153953-10.pom.md5 | 0 ...ap_shots_b-2.2-20070316.153953-10.pom.sha1 | 0 .../resources/META-INF/spring-context.xml | 0 .../1.0/test-artifact-module-a-1.0.pom | 0 .../1.0/test-artifact-module-a-1.0.pom.md5 | 0 .../1.0/test-artifact-module-a-1.0.pom.sha1 | 0 .../1.0/test-artifact-module-b-1.0.pom | 0 .../1.0/test-artifact-module-b-1.0.pom.md5 | 0 .../1.0/test-artifact-module-b-1.0.pom.sha1 | 0 .../1/test-artifact-parent-1.pom | 0 .../1/test-artifact-parent-1.pom.md5 | 0 .../1/test-artifact-parent-1.pom.sha1 | 0 .../1.0/test-artifact-root-1.0.pom | 0 .../1.0/test-artifact-root-1.0.pom.md5 | 0 .../1.0/test-artifact-root-1.0.pom.sha1 | 0 ...napshot-artifact-module-a-1.1-SNAPSHOT.pom | 0 ...hot-artifact-module-a-1.1-SNAPSHOT.pom.md5 | 0 ...ot-artifact-module-a-1.1-SNAPSHOT.pom.sha1 | 0 .../1.1-SNAPSHOT/maven-metadata.xml | 0 ...ot-artifact-root-1.1-20100310.014828-2.pom | 0 ...rtifact-root-1.1-20100310.014828-2.pom.md5 | 0 ...tifact-root-1.1-20100310.014828-2.pom.sha1 | 0 .../commons-io/1.4/commons-io-1.4.pom | 0 .../src/test/resources/m1-repo-filelist.txt | 0 .../test/resources/resolver-status.properties | 0 .../src/test/resources/scanner-archiva.xml | 0 .../spring-context-metadata-tools-test.xml | 0 .../resources/spring-context-no-mock-conf.xml | 0 .../spring-context-repo-request-test.xml | 0 .../test/resources/spring-context-storage.xml | 0 .../src/test/resources/spring-context.xml | 0 .../generic-version-1.0-SNAPSHOT.pom | 0 .../1.0/released-version-1.0.pom | 0 .../unique-version-1.0-20090807.070903-1.pom | 0 .../unique-version-1.0-20090808.051902-2.pom | 0 .../unique-version-1.0-20090808.081025-3.pom | 0 .../src/test/resources/test01.properties | 0 .../archiva-maven-scheduler}/pom.xml | 16 +++---- .../maven/ArchivaIndexingTaskExecutor.java | 0 .../DefaultDownloadRemoteIndexScheduler.java | 0 .../maven/DefaultIndexUpdateSideEffect.java | 0 .../maven/DownloadRemoteIndexTask.java | 0 .../maven/DownloadRemoteIndexTaskRequest.java | 0 .../resources/META-INF/spring-context.xml | 0 .../nexus-maven-repository-index.gz | Bin .../nexus-maven-repository-index.properties | 0 .../nexus-maven-repository-index.zip | Bin .../ArchivaIndexingTaskExecutorTest.java | 0 .../maven/DownloadRemoteIndexTaskTest.java | 0 .../src/test/resources/log4j2-test.xml | 0 .../src/test/resources/spring-context.xml | 0 archiva-modules/archiva-maven/pom.xml | 3 ++ .../archiva-scheduler-repository/pom.xml | 4 +- archiva-modules/archiva-scheduler/pom.xml | 1 - .../archiva-rest-services/pom.xml | 8 ++-- .../archiva-web/archiva-webapp/pom.xml | 4 +- .../archiva-web/archiva-webdav/pom.xml | 8 ++-- .../metadata/metadata-model-maven2/pom.xml | 45 ------------------ .../metadata/metadata-statistics-api/pom.xml | 4 +- archiva-modules/metadata/pom.xml | 1 - .../plugins/metadata-store-jcr/pom.xml | 4 +- archiva-modules/plugins/pom.xml | 1 - .../plugins/repository-statistics/pom.xml | 4 +- .../plugins/stage-repository-merge/pom.xml | 4 +- pom.xml | 16 +++---- src/ci/scripts/prepareWorkspace.sh | 12 ++++- 570 files changed, 84 insertions(+), 151 deletions(-) rename archiva-modules/{metadata/metadata-model-maven2 => archiva-maven/archiva-maven-metadata}/src/main/java/org/apache/archiva/metadata/model/maven2/MavenArtifactFacet.java (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/pom.xml (94%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/main/java/org/apache/archiva/proxy/maven/MavenRepositoryProxyHandler.java (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/main/resources/META-INF/spring-context.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/java/org/apache/archiva/metadata/repository/MockRepositoryArchivaTaskScheduler.java (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/java/org/apache/archiva/proxy/CacheFailuresTransferTest.java (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/java/org/apache/archiva/proxy/ChecksumTransferTest.java (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/java/org/apache/archiva/proxy/ErrorHandlingTest.java (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/java/org/apache/archiva/proxy/ManagedDefaultTransferTest.java (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/java/org/apache/archiva/proxy/MockConfiguration.java (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/java/org/apache/archiva/proxy/SnapshotTransferTest.java (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/java/org/apache/archiva/proxy/WagonDelegate.java (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/java/org/apache/archiva/proxy/common/WagonFactoryTest.java (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/java/org/apache/archiva/repository/mock/ArchivaIndexManagerMock.java (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/java/org/apache/archiva/repository/mock/RemoteRepositoryContentMock.java (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/java/org/apache/archiva/repository/mock/RepositoryContentProviderMock.java (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/create-managed-to-proxy-map.sh (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed-to-proxy-map.txt (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar.md5 (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar.sha1 (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-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 (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present-with-pom/1.0/get-default-layout-present-with-pom-1.0.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present-with-pom/1.0/get-default-layout-present-with-pom-1.0.pom (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar.asc (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar.md5 (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-default-metadata/1.0/get-default-metadata-1.0.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-default-metadata/1.0/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-doubly-relocated-artefact/1.0/get-doubly-relocated-artefact-1.0.pom (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-merged-metadata/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-not-on-remotes/1.0-beta-2/get-not-on-remotes-1.0-beta-2.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-not-on-remotes/1.0-beta-2/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-not-on-remotes/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-on-local-on-remote/1.0.22/get-on-local-on-remote-1.0.22.pom (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-on-local-on-remote/1.0.22/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-on-local-on-remote/1.0.8/get-on-local-on-remote-1.0.8.pom (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-on-local-on-remote/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-on-multiple-repos/1.0/get-on-multiple-repos-1.0.pom (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-on-multiple-repos/1.0/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-on-multiple-repos/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-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 (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-project-metadata/1.0/get-project-metadata-1.0.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-project-metadata/1.1/get-project-metadata-1.1.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-project-metadata/2.0/get-project-metadata-2.0.pom (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-project-metadata/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-release-metadata/2.2/get-release-metadata-2.2.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-release-metadata/2.2/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-relocated-artefact-with-pom/1.0/get-relocated-artefact-with-pom-1.0.pom (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-relocated-artefact/1.0/get-relocated-artefact-1.0.pom (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-removed-from-proxies/1.0/get-removed-from-proxies-1.0.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-removed-metadata/1.0/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-snapshot-on-local-not-remote/2.0-alpha-2-SNAPSHOT/get-snapshot-on-local-not-remote-2.0-alpha-2-20070821.123456-1.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-snapshot-on-local-not-remote/2.0-alpha-2-SNAPSHOT/get-snapshot-on-local-not-remote-2.0-alpha-2-20070821.220304-2.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-snapshot-on-local-not-remote/2.0-alpha-2-SNAPSHOT/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070821.102030-1.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070821.185701-2.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070822.021008-3.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/.metadata-proxied1 (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/.metadata-proxied1 (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/groups/get-not-on-remotes/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/groups/get-on-local-on-remote/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/groups/get-on-multiple-repos/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/managed/org/apache/maven/test/groups/get-project-metadata/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar.md5 (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar.sha1 (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar.md5 (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar.sha1 (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-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 (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-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 (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-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 (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar.md5 (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-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 (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-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 (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar.sha1 (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar.asc (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar.asc (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/1.0/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-default-metadata/1.0/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-found-in-proxy/1.0.5/get-found-in-proxy-1.0.5-javadoc.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-found-in-proxy/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-merged-metadata/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-metadata-snapshot/1.0-SNAPSHOT/get-metadata-snapshot-1.0-20050831.101112-1.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-metadata-snapshot/1.0-SNAPSHOT/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-on-local-on-remote/1.0.22/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-on-local-on-remote/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-on-multiple-repos/1.0/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-on-multiple-repos/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-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 (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070819.040004-1.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070822.145534-9.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-20061222.034118-1.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-20061227.112101-2.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-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 (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot/1.0-SNAPSHOT/get-timestamped-snapshot-1.0-SNAPSHOT.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/groups/get-default-layout/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/groups/get-found-in-proxy/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/groups/get-on-local-on-remote/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied1/org/apache/maven/test/groups/get-on-multiple-repos/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied2/org/apache/maven/test/get-default-layout/1.0.1/get-default-layout-1.0.1.pom (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied2/org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied2/org/apache/maven/test/get-default-layout/1.0/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied2/org/apache/maven/test/get-default-layout/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied2/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied2/org/apache/maven/test/get-in-second-proxy/1.0/get-in-second-proxy-1.0.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied2/org/apache/maven/test/get-merged-metadata/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied2/org/apache/maven/test/get-on-multiple-repos/1.0/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied2/org/apache/maven/test/get-on-multiple-repos/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied2/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070821.102030-1.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied2/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070823.111741-5.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied2/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070823.212711-6.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied2/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied2/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-20061222.034118-1.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied2/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-20070101.000103-2.jar (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-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 (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied2/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied2/org/apache/maven/test/groups/get-default-layout/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/repositories/proxied2/org/apache/maven/test/groups/get-on-multiple-repos/maven-metadata.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/resources/META-INF/spring-context.xml (100%) rename archiva-modules/{archiva-base/archiva-proxy-maven => archiva-maven/archiva-maven-proxy}/src/test/resources/spring-context.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/pom.xml (95%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/main/java/org/apache/archiva/dependency/tree/maven2/ArchivaRepositoryConnectorFactory.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/main/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilder.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/main/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderException.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/main/java/org/apache/archiva/dependency/tree/maven2/Maven3DependencyTreeBuilder.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/main/java/org/apache/archiva/dependency/tree/maven2/TreeDependencyNodeVisitor.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/ArtifactMappingProvider.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/ArtifactMetadataVersionComparator.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DefaultArtifactMappingProvider.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenArtifactFacetFactory.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectParent.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/main/java/org/apache/archiva/repository/content/maven2/AbstractDefaultRepositoryContent.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/main/java/org/apache/archiva/repository/content/maven2/ArtifactExtensionMapping.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/main/java/org/apache/archiva/repository/content/maven2/DefaultPathParser.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/main/java/org/apache/archiva/repository/content/maven2/FilenameParser.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/main/java/org/apache/archiva/repository/content/maven2/ManagedDefaultRepositoryContent.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/main/java/org/apache/archiva/repository/content/maven2/MavenContentProvider.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/main/java/org/apache/archiva/repository/content/maven2/RemoteDefaultRepositoryContent.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/main/java/org/apache/archiva/repository/content/maven2/RepositoryRequest.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/main/java/org/apache/archiva/repository/maven2/MavenManagedRepository.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/main/java/org/apache/archiva/repository/maven2/MavenRemoteRepository.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/main/java/org/apache/archiva/repository/maven2/MavenRepositoryProvider.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/main/java/org/apache/archiva/repository/maven2/MavenSystemManager.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/main/resources/META-INF/spring-context.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/expected-poms/archiva-model-effective.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/expected-poms/cocoon-1.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/expected-poms/maven-parent-4.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/expected-poms/model-write-400-simple.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/expected-poms/test-project-model-effective.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/java/org/apache/archiva/configuration/MockRepoAdmin.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/java/org/apache/archiva/configuration/TestConfiguration.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTestMaven3.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/java/org/apache/archiva/metadata/repository/MockRepositoryArchivaTaskScheduler.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411Test.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedReleaseTest.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedSnapshotTest.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MockWagon.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/RemoteDefaultRepositoryContentTest.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/java/org/apache/archiva/repository/AbstractRepositoryLayerTestCase.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/java/org/apache/archiva/repository/RepositoryURLTest.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/java/org/apache/archiva/repository/content/maven2/ArtifactExtensionMappingTest.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/java/org/apache/archiva/repository/content/maven2/DefaultPathParserTest.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/java/org/apache/archiva/repository/content/maven2/FilenameParserTest.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/java/org/apache/archiva/repository/content/maven2/RepositoryRequestTest.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/java/org/apache/archiva/repository/index/mock/ArchivaIndexManagerMock.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/java/org/apache/archiva/repository/index/mock/MavenIndexContextMock.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/java/org/apache/archiva/repository/maven2/MavenRepositoryProviderTest.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/java/org/apache/archiva/repository/metadata/Maven2RepositoryStorageTest.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataReaderTest.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataWriterTest.java (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/CVS/Root (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/KEYS (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/invalid/invalid-1.0.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/invalid/invalid/1.0/invalid-1.0b.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/invalid/invalid/1.0/invalid-2.0.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/invalid/invalid/1/invalid-1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/javax/maven-metadata.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/javax/sql/jdbc/2.0/jdbc-2.0.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/javax/sql/jdbc/maven-metadata-repository.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/javax/sql/maven-metadata-repository.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/archiva/sample-parent/2.1-SNAPSHOT/sample-parent-2.1-20090807.095532-1.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/archiva/sample-parent/2.1-SNAPSHOT/sample-parent-2.1-20090808.085535-2.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/archiva/sample-project/2.1-SNAPSHOT/sample-project-2.1-SNAPSHOT.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.210059-1.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.210059-1.pom.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.210059-1.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.232304-2.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.232304-2.pom.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.232304-2.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.053327-3.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.053327-3.pom.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.053327-3.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.173653-5.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.173653-5.pom.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.173653-5.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070727.113106-7.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070727.113106-7.pom.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070727.113106-7.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.053229-10.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.053229-10.pom.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.053229-10.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.112043-11.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.112043-11.pom.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.112043-11.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070729.171937-16.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070729.171937-16.pom.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070729.171937-16.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070730.232112-20.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070730.232112-20.pom.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070730.232112-20.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.113304-21.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.113304-21.pom.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.113304-21.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.172936-22.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.172936-22.pom.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.172936-22.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070802.113139-29.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070802.113139-29.pom.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070802.113139-29.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/maven-metadata.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/maven-metadata.xml.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/maven-metadata.xml.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/cocoon/cocoon/1/cocoon-1.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.war (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/B/1.0/B-1.0.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/B/2.0/B-2.0.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.war (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-applet/1.0-SNAPSHOT/archiva-applet-1.0-SNAPSHOT.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-base/1.0-SNAPSHOT/archiva-base-1.0-SNAPSHOT.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-cli/1.0-SNAPSHOT/archiva-cli-1.0-SNAPSHOT.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-common/1.0-SNAPSHOT/archiva-common-1.0-SNAPSHOT.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-configuration/1.0-SNAPSHOT/archiva-configuration-1.0-SNAPSHOT.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-consumer-api/1.0-SNAPSHOT/archiva-consumer-api-1.0-SNAPSHOT.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-consumers/1.0-SNAPSHOT/archiva-consumers-1.0-SNAPSHOT.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-converter/1.0-SNAPSHOT/archiva-converter-1.0-SNAPSHOT.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-core-consumers/1.0-SNAPSHOT/archiva-core-consumers-1.0-SNAPSHOT.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-core/1.0-SNAPSHOT/archiva-core-1.0-SNAPSHOT.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-discoverer/1.0-SNAPSHOT/archiva-discoverer-1.0-SNAPSHOT.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-indexer/1.0-SNAPSHOT/archiva-indexer-1.0-SNAPSHOT.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-model/1.0-SNAPSHOT/archiva-model-1.0-SNAPSHOT.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-parent/1.0-SNAPSHOT/archiva-parent-1.0-SNAPSHOT.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-plexus-application/1.0-SNAPSHOT/archiva-plexus-application-1.0-SNAPSHOT.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-plexus-runtime/1.0-SNAPSHOT/archiva-plexus-runtime-1.0-SNAPSHOT.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-proxy/1.0-SNAPSHOT/archiva-proxy-1.0-SNAPSHOT.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-reports-standard/1.0-SNAPSHOT/archiva-reports-standard-1.0-SNAPSHOT.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-repository-layer/1.0-SNAPSHOT/archiva-repository-layer-1.0-SNAPSHOT.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-security/1.0-SNAPSHOT/archiva-security-1.0-SNAPSHOT.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-webapp/1.0-SNAPSHOT/archiva-webapp-1.0-SNAPSHOT.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-xml-tools/1.0-SNAPSHOT/archiva-xml-tools-1.0-SNAPSHOT.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/archiva/archiva/1.0-SNAPSHOT/archiva-1.0-20061126.005254-2.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/archiva/archiva/1.0-SNAPSHOT/archiva-1.0-SNAPSHOT-site.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/archiva/archiva/1.0-SNAPSHOT/archiva-1.0-SNAPSHOT.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/discovery/1.0/discovery-1.0.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/maven-metadata.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4-site.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4-site_en.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/samplejar/maven-metadata.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-javadoc.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-javadoc.jar.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-javadoc.jar.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-sources.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-sources.jar.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-sources.jar.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.jar.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.jar.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.pom.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-javadoc.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-javadoc.jar.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-javadoc.jar.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-sources.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-sources.jar.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-sources.jar.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.jar.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.jar.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.pom.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/maven-metadata.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/maven-metadata.xml.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/maven-metadata.xml.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1-javadoc.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/test/2.0.4-SNAPSHOT/test-2.0.4-SNAPSHOT.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0-test-sources.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.zip (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/maven-metadata.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/maven/update/test-updated/maven-metadata.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/org/apache/testgroup/discovery/maven-metadata.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/test-project/test-project-api/2.4.4/test-project-api-2.4.4.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/test-project/test-project-broker-ejb/2.4.4/test-project-broker-ejb-2.4.4.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/test-project/test-project-broker-pom/2.4.4/test-project-broker-pom-2.4.4.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/test-project/test-project-common/2.4.4/test-project-common-2.4.4.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/test-project/test-project-endpoint-ejb/2.4.4/test-project-endpoint-ejb-2.4.4.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/test-project/test-project-endpoint-pom/2.4.4/test-project-endpoint-pom-2.4.4.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/default-repository/test-project/test-project/2.4.4/test-project-2.4.4.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/bad_artifact/empty.txt (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/include_xml-1.0.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/include_xml-1.0.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/maven-metadata.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/incomplete_metadata_a/1.0/incomplete_metadata_a-1.0.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/incomplete_metadata_a/maven-metadata.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.0-SNAPSHOT/maven-metadata.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.0-SNAPSHOT/missing_artifact-1.0-20091007.132409-1.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.0-SNAPSHOT/missing_artifact-1.0-20091007.132409-1.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.2-SNAPSHOT/maven-metadata.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.2-SNAPSHOT/missing_artifact-1.2-20091011.133751-1.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.2-SNAPSHOT/missing_artifact-1.2-20091011.133751-1.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/maven-metadata.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_a/1.0/missing_metadata_a-1.0.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/1.0.1/missing_metadata_b-1.0.1.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/1.0/missing_metadata_b-1.0.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/2.0-20070821-dev/missing_metadata_b-2.0-20070821-dev.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/2.0.1/missing_metadata_b-2.0.1.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/2.0/missing_metadata_b-2.0.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/1.0/proxied_multi-1.0.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/1.1/proxied_multi-1.1.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/2.1/proxied_multi-2.1.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/maven-metadata-central.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/maven-metadata-java.net.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/maven-metadata.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata-apache-snapshots.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata-internal-snapshots.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata-snapshots.codehaus.org.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2-javadoc.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2-sources.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2.war (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070302.212723-3-sources.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070302.212723-3.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070302.212723-3.war (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070303.152828-4-sources.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070303.152828-4.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070303.152828-4.war (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.war (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.war.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.war (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.war.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.war (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.war.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.war (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.war.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-SNAPSHOT-sources.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-SNAPSHOT.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-SNAPSHOT.war (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/maven-metadata.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.jar.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.jar.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.pom.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2-sources.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2-sources.jar.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2-sources.jar.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.jar.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.jar.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.pom.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3-sources.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3-sources.jar.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3-sources.jar.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.jar.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.jar.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.pom.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4-sources.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4-sources.jar.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4-sources.jar.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.jar.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.jar.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.pom.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.jar.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.jar.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.pom.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.jar.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.jar.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.pom.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.jar.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.jar.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.pom.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.jar.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.jar.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.pom.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-javadoc.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-javadoc.jar.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-javadoc.jar.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-sources.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-sources.jar.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-sources.jar.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.jar.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.jar.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.pom.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.jar (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.jar.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.jar.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.pom.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/META-INF/spring-context.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.pom.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/com/example/test/test-artifact-module-b/1.0/test-artifact-module-b-1.0.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/com/example/test/test-artifact-module-b/1.0/test-artifact-module-b-1.0.pom.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/com/example/test/test-artifact-module-b/1.0/test-artifact-module-b-1.0.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/com/example/test/test-artifact-parent/1/test-artifact-parent-1.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/com/example/test/test-artifact-parent/1/test-artifact-parent-1.pom.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/com/example/test/test-artifact-parent/1/test-artifact-parent-1.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/com/example/test/test-artifact-root/1.0/test-artifact-root-1.0.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/com/example/test/test-artifact-root/1.0/test-artifact-root-1.0.pom.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/com/example/test/test-artifact-root/1.0/test-artifact-root-1.0.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/com/example/test/test-snapshot-artifact-module-a/1.1-SNAPSHOT/test-snapshot-artifact-module-a-1.1-SNAPSHOT.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/com/example/test/test-snapshot-artifact-module-a/1.1-SNAPSHOT/test-snapshot-artifact-module-a-1.1-SNAPSHOT.pom.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/com/example/test/test-snapshot-artifact-module-a/1.1-SNAPSHOT/test-snapshot-artifact-module-a-1.1-SNAPSHOT.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/com/example/test/test-snapshot-artifact-root/1.1-SNAPSHOT/maven-metadata.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/com/example/test/test-snapshot-artifact-root/1.1-SNAPSHOT/test-snapshot-artifact-root-1.1-20100310.014828-2.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/com/example/test/test-snapshot-artifact-root/1.1-SNAPSHOT/test-snapshot-artifact-root-1.1-20100310.014828-2.pom.md5 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/com/example/test/test-snapshot-artifact-root/1.1-SNAPSHOT/test-snapshot-artifact-root-1.1-20100310.014828-2.pom.sha1 (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/commons-io/commons-io/1.4/commons-io-1.4.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/m1-repo-filelist.txt (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/resolver-status.properties (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/scanner-archiva.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/spring-context-metadata-tools-test.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/spring-context-no-mock-conf.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/spring-context-repo-request-test.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/spring-context-storage.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/spring-context.xml (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/test-repo/org/apache/archiva/generic-version/1.0-SNAPSHOT/generic-version-1.0-SNAPSHOT.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/test-repo/org/apache/archiva/released-version/1.0/released-version-1.0.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/test-repo/org/apache/archiva/unique-version/1.0-SNAPSHOT/unique-version-1.0-20090807.070903-1.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/test-repo/org/apache/archiva/unique-version/1.0-SNAPSHOT/unique-version-1.0-20090808.051902-2.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/test-repo/org/apache/archiva/unique-version/1.0-SNAPSHOT/unique-version-1.0-20090808.081025-3.pom (100%) rename archiva-modules/{plugins/maven2-repository => archiva-maven/archiva-maven-repository}/src/test/resources/test01.properties (100%) rename archiva-modules/{archiva-scheduler/archiva-scheduler-indexing-maven2 => archiva-maven/archiva-maven-scheduler}/pom.xml (93%) rename archiva-modules/{archiva-scheduler/archiva-scheduler-indexing-maven2 => archiva-maven/archiva-maven-scheduler}/src/main/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutor.java (100%) rename archiva-modules/{archiva-scheduler/archiva-scheduler-indexing-maven2 => archiva-maven/archiva-maven-scheduler}/src/main/java/org/apache/archiva/scheduler/indexing/maven/DefaultDownloadRemoteIndexScheduler.java (100%) rename archiva-modules/{archiva-scheduler/archiva-scheduler-indexing-maven2 => archiva-maven/archiva-maven-scheduler}/src/main/java/org/apache/archiva/scheduler/indexing/maven/DefaultIndexUpdateSideEffect.java (100%) rename archiva-modules/{archiva-scheduler/archiva-scheduler-indexing-maven2 => archiva-maven/archiva-maven-scheduler}/src/main/java/org/apache/archiva/scheduler/indexing/maven/DownloadRemoteIndexTask.java (100%) rename archiva-modules/{archiva-scheduler/archiva-scheduler-indexing-maven2 => archiva-maven/archiva-maven-scheduler}/src/main/java/org/apache/archiva/scheduler/indexing/maven/DownloadRemoteIndexTaskRequest.java (100%) rename archiva-modules/{archiva-scheduler/archiva-scheduler-indexing-maven2 => archiva-maven/archiva-maven-scheduler}/src/main/resources/META-INF/spring-context.xml (100%) rename archiva-modules/{archiva-scheduler/archiva-scheduler-indexing-maven2 => archiva-maven/archiva-maven-scheduler}/src/test/index-updates/nexus-maven-repository-index.gz (100%) rename archiva-modules/{archiva-scheduler/archiva-scheduler-indexing-maven2 => archiva-maven/archiva-maven-scheduler}/src/test/index-updates/nexus-maven-repository-index.properties (100%) rename archiva-modules/{archiva-scheduler/archiva-scheduler-indexing-maven2 => archiva-maven/archiva-maven-scheduler}/src/test/index-updates/nexus-maven-repository-index.zip (100%) rename archiva-modules/{archiva-scheduler/archiva-scheduler-indexing-maven2 => archiva-maven/archiva-maven-scheduler}/src/test/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutorTest.java (100%) rename archiva-modules/{archiva-scheduler/archiva-scheduler-indexing-maven2 => archiva-maven/archiva-maven-scheduler}/src/test/java/org/apache/archiva/scheduler/indexing/maven/DownloadRemoteIndexTaskTest.java (100%) rename archiva-modules/{archiva-scheduler/archiva-scheduler-indexing-maven2 => archiva-maven/archiva-maven-scheduler}/src/test/resources/log4j2-test.xml (100%) rename archiva-modules/{archiva-scheduler/archiva-scheduler-indexing-maven2 => archiva-maven/archiva-maven-scheduler}/src/test/resources/spring-context.xml (100%) delete mode 100644 archiva-modules/metadata/metadata-model-maven2/pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml index dd0fee6c3..a50eb2602 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml @@ -80,8 +80,8 @@ test - org.apache.archiva - maven2-repository + org.apache.archiva.maven + archiva-maven-repository test diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml index a976949c0..4bf1e1683 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml @@ -186,8 +186,8 @@ test - org.apache.archiva - maven2-repository + org.apache.archiva.maven + archiva-maven-repository ${archiva.version} test diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml index 5dd419ee5..aabd0e7ea 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml @@ -73,30 +73,18 @@ metadata-repository-api - org.apache.archiva - metadata-model-maven2 + org.apache.archiva.maven + archiva-maven-metadata org.apache.archiva archiva-plexus-bridge - - org.apache.archiva - maven2-repository + org.apache.archiva.maven + archiva-maven-repository test diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml index 4140617aa..9711c1d59 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml @@ -126,8 +126,8 @@ test - org.apache.archiva - maven2-repository + org.apache.archiva.maven + archiva-maven-repository test diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml b/archiva-modules/archiva-base/archiva-converter/pom.xml index c2e9a5fc8..8c81cdc35 100644 --- a/archiva-modules/archiva-base/archiva-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-converter/pom.xml @@ -98,15 +98,9 @@ archiva-common - org.apache.archiva - maven2-repository + org.apache.archiva.maven + archiva-maven-repository - org.apache.maven.wagon wagon-http diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml index 4f7c70627..9e3132c5d 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml @@ -79,8 +79,8 @@ metadata-model - org.apache.archiva - maven2-repository + org.apache.archiva.maven + archiva-maven-repository javax.inject diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml index 045209193..2606b82f6 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml @@ -80,20 +80,6 @@ org.apache.archiva metadata-model - org.apache.maven.wagon wagon-http diff --git a/archiva-modules/archiva-base/pom.xml b/archiva-modules/archiva-base/pom.xml index 41e594e20..50f24c622 100644 --- a/archiva-modules/archiva-base/pom.xml +++ b/archiva-modules/archiva-base/pom.xml @@ -47,7 +47,6 @@ archiva-repository-layer archiva-xml-tools archiva-proxy-api - archiva-proxy-maven archiva-proxy archiva-transaction archiva-converter diff --git a/archiva-modules/archiva-maven/archiva-maven-metadata/pom.xml b/archiva-modules/archiva-maven/archiva-maven-metadata/pom.xml index f1604347c..aca1c7d4b 100644 --- a/archiva-modules/archiva-maven/archiva-maven-metadata/pom.xml +++ b/archiva-modules/archiva-maven/archiva-maven-metadata/pom.xml @@ -43,6 +43,14 @@ org.apache.archiva archiva-xml-tools + + org.apache.archiva + metadata-model + + + commons-lang + commons-lang + commons-io commons-io diff --git a/archiva-modules/metadata/metadata-model-maven2/src/main/java/org/apache/archiva/metadata/model/maven2/MavenArtifactFacet.java b/archiva-modules/archiva-maven/archiva-maven-metadata/src/main/java/org/apache/archiva/metadata/model/maven2/MavenArtifactFacet.java similarity index 100% rename from archiva-modules/metadata/metadata-model-maven2/src/main/java/org/apache/archiva/metadata/model/maven2/MavenArtifactFacet.java rename to archiva-modules/archiva-maven/archiva-maven-metadata/src/main/java/org/apache/archiva/metadata/model/maven2/MavenArtifactFacet.java diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/pom.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml similarity index 94% rename from archiva-modules/archiva-base/archiva-proxy-maven/pom.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml index b6ae5a14a..1a1788a18 100644 --- a/archiva-modules/archiva-base/archiva-proxy-maven/pom.xml +++ b/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml @@ -21,12 +21,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - archiva-base - org.apache.archiva + org.apache.archiva.maven + archiva-maven 3.0.0-SNAPSHOT - archiva-proxy-maven - Archiva Base :: Proxy Maven + archiva-maven-proxy + Archiva :: Maven :: Proxy ${project.parent.parent.basedir} @@ -84,13 +84,6 @@ commons-logging commons-logging - org.apache.archiva archiva-test-utils diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/main/java/org/apache/archiva/proxy/maven/MavenRepositoryProxyHandler.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/main/java/org/apache/archiva/proxy/maven/MavenRepositoryProxyHandler.java similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/main/java/org/apache/archiva/proxy/maven/MavenRepositoryProxyHandler.java rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/main/java/org/apache/archiva/proxy/maven/MavenRepositoryProxyHandler.java diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/main/resources/META-INF/spring-context.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/main/resources/META-INF/spring-context.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/main/resources/META-INF/spring-context.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/metadata/repository/MockRepositoryArchivaTaskScheduler.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/metadata/repository/MockRepositoryArchivaTaskScheduler.java similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/metadata/repository/MockRepositoryArchivaTaskScheduler.java rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/metadata/repository/MockRepositoryArchivaTaskScheduler.java diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/proxy/CacheFailuresTransferTest.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/CacheFailuresTransferTest.java similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/proxy/CacheFailuresTransferTest.java rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/CacheFailuresTransferTest.java diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/proxy/ChecksumTransferTest.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/ChecksumTransferTest.java similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/proxy/ChecksumTransferTest.java rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/ChecksumTransferTest.java diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/proxy/ErrorHandlingTest.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/ErrorHandlingTest.java similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/proxy/ErrorHandlingTest.java rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/ErrorHandlingTest.java diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/proxy/ManagedDefaultTransferTest.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/ManagedDefaultTransferTest.java similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/proxy/ManagedDefaultTransferTest.java rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/ManagedDefaultTransferTest.java diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/proxy/MockConfiguration.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/MockConfiguration.java similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/proxy/MockConfiguration.java rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/MockConfiguration.java diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/proxy/SnapshotTransferTest.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/SnapshotTransferTest.java similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/proxy/SnapshotTransferTest.java rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/SnapshotTransferTest.java diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/proxy/WagonDelegate.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/WagonDelegate.java similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/proxy/WagonDelegate.java rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/WagonDelegate.java diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/proxy/common/WagonFactoryTest.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/common/WagonFactoryTest.java similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/proxy/common/WagonFactoryTest.java rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/common/WagonFactoryTest.java diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/repository/mock/ArchivaIndexManagerMock.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/ArchivaIndexManagerMock.java similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/repository/mock/ArchivaIndexManagerMock.java rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/ArchivaIndexManagerMock.java diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/repository/mock/RemoteRepositoryContentMock.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/RemoteRepositoryContentMock.java similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/repository/mock/RemoteRepositoryContentMock.java rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/RemoteRepositoryContentMock.java diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/repository/mock/RepositoryContentProviderMock.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/RepositoryContentProviderMock.java similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/repository/mock/RepositoryContentProviderMock.java rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/RepositoryContentProviderMock.java diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/create-managed-to-proxy-map.sh b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/create-managed-to-proxy-map.sh similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/create-managed-to-proxy-map.sh rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/create-managed-to-proxy-map.sh diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed-to-proxy-map.txt b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed-to-proxy-map.txt similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed-to-proxy-map.txt rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed-to-proxy-map.txt diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar b/archiva-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar rename to archiva-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present-with-pom/1.0/get-default-layout-present-with-pom-1.0.jar b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present-with-pom/1.0/get-default-layout-present-with-pom-1.0.jar similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present-with-pom/1.0/get-default-layout-present-with-pom-1.0.jar rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present-with-pom/1.0/get-default-layout-present-with-pom-1.0.jar diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present-with-pom/1.0/get-default-layout-present-with-pom-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present-with-pom/1.0/get-default-layout-present-with-pom-1.0.pom similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present-with-pom/1.0/get-default-layout-present-with-pom-1.0.pom rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present-with-pom/1.0/get-default-layout-present-with-pom-1.0.pom diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar b/archiva-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar rename to archiva-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar.asc b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar.asc similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar.asc rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar.asc diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar.md5 similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar.md5 rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar.md5 diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-default-metadata/1.0/get-default-metadata-1.0.jar b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-metadata/1.0/get-default-metadata-1.0.jar similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-default-metadata/1.0/get-default-metadata-1.0.jar rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-metadata/1.0/get-default-metadata-1.0.jar diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-default-metadata/1.0/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-metadata/1.0/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-default-metadata/1.0/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-metadata/1.0/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-doubly-relocated-artefact/1.0/get-doubly-relocated-artefact-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-doubly-relocated-artefact/1.0/get-doubly-relocated-artefact-1.0.pom similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-doubly-relocated-artefact/1.0/get-doubly-relocated-artefact-1.0.pom rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-doubly-relocated-artefact/1.0/get-doubly-relocated-artefact-1.0.pom diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-merged-metadata/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-merged-metadata/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-merged-metadata/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-merged-metadata/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-not-on-remotes/1.0-beta-2/get-not-on-remotes-1.0-beta-2.jar b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-not-on-remotes/1.0-beta-2/get-not-on-remotes-1.0-beta-2.jar similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-not-on-remotes/1.0-beta-2/get-not-on-remotes-1.0-beta-2.jar rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-not-on-remotes/1.0-beta-2/get-not-on-remotes-1.0-beta-2.jar diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-not-on-remotes/1.0-beta-2/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-not-on-remotes/1.0-beta-2/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-not-on-remotes/1.0-beta-2/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-not-on-remotes/1.0-beta-2/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-not-on-remotes/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-not-on-remotes/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-not-on-remotes/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-not-on-remotes/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-on-local-on-remote/1.0.22/get-on-local-on-remote-1.0.22.pom b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-on-local-on-remote/1.0.22/get-on-local-on-remote-1.0.22.pom similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-on-local-on-remote/1.0.22/get-on-local-on-remote-1.0.22.pom rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-on-local-on-remote/1.0.22/get-on-local-on-remote-1.0.22.pom diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-on-local-on-remote/1.0.22/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-on-local-on-remote/1.0.22/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-on-local-on-remote/1.0.22/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-on-local-on-remote/1.0.22/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-on-local-on-remote/1.0.8/get-on-local-on-remote-1.0.8.pom b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-on-local-on-remote/1.0.8/get-on-local-on-remote-1.0.8.pom similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-on-local-on-remote/1.0.8/get-on-local-on-remote-1.0.8.pom rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-on-local-on-remote/1.0.8/get-on-local-on-remote-1.0.8.pom diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-on-local-on-remote/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-on-local-on-remote/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-on-local-on-remote/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-on-local-on-remote/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-on-multiple-repos/1.0/get-on-multiple-repos-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-on-multiple-repos/1.0/get-on-multiple-repos-1.0.pom similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-on-multiple-repos/1.0/get-on-multiple-repos-1.0.pom rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-on-multiple-repos/1.0/get-on-multiple-repos-1.0.pom diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-on-multiple-repos/1.0/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-on-multiple-repos/1.0/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-on-multiple-repos/1.0/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-on-multiple-repos/1.0/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-on-multiple-repos/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-on-multiple-repos/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-on-multiple-repos/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-on-multiple-repos/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-project-metadata/1.0/get-project-metadata-1.0.jar b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-project-metadata/1.0/get-project-metadata-1.0.jar similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-project-metadata/1.0/get-project-metadata-1.0.jar rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-project-metadata/1.0/get-project-metadata-1.0.jar diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-project-metadata/1.1/get-project-metadata-1.1.jar b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-project-metadata/1.1/get-project-metadata-1.1.jar similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-project-metadata/1.1/get-project-metadata-1.1.jar rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-project-metadata/1.1/get-project-metadata-1.1.jar diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-project-metadata/2.0/get-project-metadata-2.0.pom b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-project-metadata/2.0/get-project-metadata-2.0.pom similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-project-metadata/2.0/get-project-metadata-2.0.pom rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-project-metadata/2.0/get-project-metadata-2.0.pom diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-project-metadata/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-project-metadata/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-project-metadata/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-project-metadata/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-release-metadata/2.2/get-release-metadata-2.2.jar b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-release-metadata/2.2/get-release-metadata-2.2.jar similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-release-metadata/2.2/get-release-metadata-2.2.jar rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-release-metadata/2.2/get-release-metadata-2.2.jar diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-release-metadata/2.2/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-release-metadata/2.2/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-release-metadata/2.2/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-release-metadata/2.2/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-relocated-artefact-with-pom/1.0/get-relocated-artefact-with-pom-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-relocated-artefact-with-pom/1.0/get-relocated-artefact-with-pom-1.0.pom similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-relocated-artefact-with-pom/1.0/get-relocated-artefact-with-pom-1.0.pom rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-relocated-artefact-with-pom/1.0/get-relocated-artefact-with-pom-1.0.pom diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-relocated-artefact/1.0/get-relocated-artefact-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-relocated-artefact/1.0/get-relocated-artefact-1.0.pom similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-relocated-artefact/1.0/get-relocated-artefact-1.0.pom rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-relocated-artefact/1.0/get-relocated-artefact-1.0.pom diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-removed-from-proxies/1.0/get-removed-from-proxies-1.0.jar b/archiva-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-removed-from-proxies/1.0/get-removed-from-proxies-1.0.jar rename to archiva-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-removed-metadata/1.0/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-removed-metadata/1.0/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-removed-metadata/1.0/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-removed-metadata/1.0/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-snapshot-on-local-not-remote/2.0-alpha-2-SNAPSHOT/get-snapshot-on-local-not-remote-2.0-alpha-2-20070821.123456-1.jar b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-snapshot-on-local-not-remote/2.0-alpha-2-SNAPSHOT/get-snapshot-on-local-not-remote-2.0-alpha-2-20070821.123456-1.jar similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-snapshot-on-local-not-remote/2.0-alpha-2-SNAPSHOT/get-snapshot-on-local-not-remote-2.0-alpha-2-20070821.123456-1.jar rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-snapshot-on-local-not-remote/2.0-alpha-2-SNAPSHOT/get-snapshot-on-local-not-remote-2.0-alpha-2-20070821.123456-1.jar diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-snapshot-on-local-not-remote/2.0-alpha-2-SNAPSHOT/get-snapshot-on-local-not-remote-2.0-alpha-2-20070821.220304-2.jar b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-snapshot-on-local-not-remote/2.0-alpha-2-SNAPSHOT/get-snapshot-on-local-not-remote-2.0-alpha-2-20070821.220304-2.jar similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-snapshot-on-local-not-remote/2.0-alpha-2-SNAPSHOT/get-snapshot-on-local-not-remote-2.0-alpha-2-20070821.220304-2.jar rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-snapshot-on-local-not-remote/2.0-alpha-2-SNAPSHOT/get-snapshot-on-local-not-remote-2.0-alpha-2-20070821.220304-2.jar diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-snapshot-on-local-not-remote/2.0-alpha-2-SNAPSHOT/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-snapshot-on-local-not-remote/2.0-alpha-2-SNAPSHOT/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-snapshot-on-local-not-remote/2.0-alpha-2-SNAPSHOT/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-snapshot-on-local-not-remote/2.0-alpha-2-SNAPSHOT/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070821.102030-1.jar b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070821.102030-1.jar similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070821.102030-1.jar rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070821.102030-1.jar diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070821.185701-2.jar b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070821.185701-2.jar similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070821.185701-2.jar rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070821.185701-2.jar diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070822.021008-3.jar b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070822.021008-3.jar similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070822.021008-3.jar rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070822.021008-3.jar diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/.metadata-proxied1 b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/.metadata-proxied1 similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/.metadata-proxied1 rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/.metadata-proxied1 diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/.metadata-proxied1 b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/.metadata-proxied1 similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/.metadata-proxied1 rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/.metadata-proxied1 diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/groups/get-not-on-remotes/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/groups/get-not-on-remotes/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/groups/get-not-on-remotes/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/groups/get-not-on-remotes/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/groups/get-on-local-on-remote/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/groups/get-on-local-on-remote/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/groups/get-on-local-on-remote/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/groups/get-on-local-on-remote/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/groups/get-on-multiple-repos/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/groups/get-on-multiple-repos/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/groups/get-on-multiple-repos/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/groups/get-on-multiple-repos/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/groups/get-project-metadata/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/groups/get-project-metadata/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/groups/get-project-metadata/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/managed/org/apache/maven/test/groups/get-project-metadata/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar b/archiva-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar rename to archiva-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar b/archiva-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar rename to archiva-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar b/archiva-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar rename to archiva-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar b/archiva-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar rename to archiva-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar b/archiva-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar rename to archiva-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar b/archiva-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar rename to archiva-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar.asc b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar.asc similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar.asc rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar.asc diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar b/archiva-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar.asc b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar.asc similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar.asc rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar.asc diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/1.0/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/1.0/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/1.0/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/1.0/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-default-metadata/1.0/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-metadata/1.0/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-default-metadata/1.0/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-metadata/1.0/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-found-in-proxy/1.0.5/get-found-in-proxy-1.0.5-javadoc.jar b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-found-in-proxy/1.0.5/get-found-in-proxy-1.0.5-javadoc.jar similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-found-in-proxy/1.0.5/get-found-in-proxy-1.0.5-javadoc.jar rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-found-in-proxy/1.0.5/get-found-in-proxy-1.0.5-javadoc.jar diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-found-in-proxy/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-found-in-proxy/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-found-in-proxy/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-found-in-proxy/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar b/archiva-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar rename to archiva-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-merged-metadata/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-merged-metadata/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-merged-metadata/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-merged-metadata/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-metadata-snapshot/1.0-SNAPSHOT/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-metadata-snapshot/1.0-SNAPSHOT/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-metadata-snapshot/1.0-SNAPSHOT/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-metadata-snapshot/1.0-SNAPSHOT/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-on-local-on-remote/1.0.22/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-on-local-on-remote/1.0.22/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-on-local-on-remote/1.0.22/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-on-local-on-remote/1.0.22/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-on-local-on-remote/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-on-local-on-remote/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-on-local-on-remote/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-on-local-on-remote/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-on-multiple-repos/1.0/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-on-multiple-repos/1.0/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-on-multiple-repos/1.0/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-on-multiple-repos/1.0/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-on-multiple-repos/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-on-multiple-repos/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-on-multiple-repos/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-on-multiple-repos/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070819.040004-1.jar b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070819.040004-1.jar similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070819.040004-1.jar rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070819.040004-1.jar diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070822.145534-9.jar b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070822.145534-9.jar similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070822.145534-9.jar rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070822.145534-9.jar diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-20061222.034118-1.jar b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-20061222.034118-1.jar similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-20061222.034118-1.jar rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-20061222.034118-1.jar diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-20061227.112101-2.jar b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-20061227.112101-2.jar similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-20061227.112101-2.jar rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-20061227.112101-2.jar diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot/1.0-SNAPSHOT/get-timestamped-snapshot-1.0-SNAPSHOT.jar b/archiva-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot/1.0-SNAPSHOT/get-timestamped-snapshot-1.0-SNAPSHOT.jar rename to archiva-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/groups/get-default-layout/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/groups/get-default-layout/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/groups/get-default-layout/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/groups/get-default-layout/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/groups/get-found-in-proxy/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/groups/get-found-in-proxy/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/groups/get-found-in-proxy/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/groups/get-found-in-proxy/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/groups/get-on-local-on-remote/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/groups/get-on-local-on-remote/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/groups/get-on-local-on-remote/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/groups/get-on-local-on-remote/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/groups/get-on-multiple-repos/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/groups/get-on-multiple-repos/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/groups/get-on-multiple-repos/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied1/org/apache/maven/test/groups/get-on-multiple-repos/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-default-layout/1.0.1/get-default-layout-1.0.1.pom b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-default-layout/1.0.1/get-default-layout-1.0.1.pom similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-default-layout/1.0.1/get-default-layout-1.0.1.pom rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-default-layout/1.0.1/get-default-layout-1.0.1.pom diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-default-layout/1.0/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-default-layout/1.0/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-default-layout/1.0/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-default-layout/1.0/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-default-layout/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-default-layout/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-default-layout/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-default-layout/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar b/archiva-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar rename to archiva-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-in-second-proxy/1.0/get-in-second-proxy-1.0.jar b/archiva-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-in-second-proxy/1.0/get-in-second-proxy-1.0.jar rename to archiva-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-merged-metadata/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-merged-metadata/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-merged-metadata/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-merged-metadata/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-on-multiple-repos/1.0/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-on-multiple-repos/1.0/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-on-multiple-repos/1.0/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-on-multiple-repos/1.0/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-on-multiple-repos/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-on-multiple-repos/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-on-multiple-repos/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-on-multiple-repos/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070821.102030-1.jar b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070821.102030-1.jar similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070821.102030-1.jar rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070821.102030-1.jar diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070823.111741-5.jar b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070823.111741-5.jar similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070823.111741-5.jar rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070823.111741-5.jar diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070823.212711-6.jar b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070823.212711-6.jar similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070823.212711-6.jar rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070823.212711-6.jar diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-20061222.034118-1.jar b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-20061222.034118-1.jar similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-20061222.034118-1.jar rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-20061222.034118-1.jar diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-20070101.000103-2.jar b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-20070101.000103-2.jar similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-20070101.000103-2.jar rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-20070101.000103-2.jar diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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 archiva-modules/archiva-base/archiva-proxy-maven/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-modules/archiva-maven/archiva-maven-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/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/groups/get-default-layout/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied2/org/apache/maven/test/groups/get-default-layout/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/groups/get-default-layout/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied2/org/apache/maven/test/groups/get-default-layout/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/groups/get-on-multiple-repos/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied2/org/apache/maven/test/groups/get-on-multiple-repos/maven-metadata.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/groups/get-on-multiple-repos/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/repositories/proxied2/org/apache/maven/test/groups/get-on-multiple-repos/maven-metadata.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/resources/META-INF/spring-context.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/resources/META-INF/spring-context.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/resources/META-INF/spring-context.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/resources/META-INF/spring-context.xml diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/src/test/resources/spring-context.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/resources/spring-context.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-proxy-maven/src/test/resources/spring-context.xml rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/resources/spring-context.xml diff --git a/archiva-modules/plugins/maven2-repository/pom.xml b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml similarity index 95% rename from archiva-modules/plugins/maven2-repository/pom.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/pom.xml index e01eb3a20..7eba9e946 100644 --- a/archiva-modules/plugins/maven2-repository/pom.xml +++ b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml @@ -20,12 +20,12 @@ 4.0.0 - org.apache.archiva - plugins + org.apache.archiva.maven + archiva-maven 3.0.0-SNAPSHOT - maven2-repository - Archiva Core Plugins :: Maven 2.x Repository Support + archiva-maven-repository + Archiva :: Maven :: Repository Support ${project.parent.parent.basedir} @@ -37,8 +37,8 @@ metadata-model - org.apache.archiva - metadata-model-maven2 + org.apache.archiva.maven + archiva-maven-metadata org.apache.archiva @@ -57,8 +57,8 @@ archiva-model - org.apache.archiva - archiva-proxy-maven + org.apache.archiva.maven + archiva-maven-proxy commons-logging diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/ArchivaRepositoryConnectorFactory.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/ArchivaRepositoryConnectorFactory.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/ArchivaRepositoryConnectorFactory.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/ArchivaRepositoryConnectorFactory.java diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilder.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilder.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilder.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilder.java diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderException.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderException.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderException.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderException.java diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/Maven3DependencyTreeBuilder.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/Maven3DependencyTreeBuilder.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/Maven3DependencyTreeBuilder.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/Maven3DependencyTreeBuilder.java diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/TreeDependencyNodeVisitor.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/TreeDependencyNodeVisitor.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/TreeDependencyNodeVisitor.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/TreeDependencyNodeVisitor.java diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/ArtifactMappingProvider.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/ArtifactMappingProvider.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/ArtifactMappingProvider.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/ArtifactMappingProvider.java diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/ArtifactMetadataVersionComparator.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/ArtifactMetadataVersionComparator.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/ArtifactMetadataVersionComparator.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/ArtifactMetadataVersionComparator.java diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DefaultArtifactMappingProvider.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DefaultArtifactMappingProvider.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DefaultArtifactMappingProvider.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DefaultArtifactMappingProvider.java diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenArtifactFacetFactory.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenArtifactFacetFactory.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenArtifactFacetFactory.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenArtifactFacetFactory.java diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectParent.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectParent.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectParent.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectParent.java diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/AbstractDefaultRepositoryContent.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/AbstractDefaultRepositoryContent.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/AbstractDefaultRepositoryContent.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/AbstractDefaultRepositoryContent.java diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/ArtifactExtensionMapping.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/ArtifactExtensionMapping.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/ArtifactExtensionMapping.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/ArtifactExtensionMapping.java diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/DefaultPathParser.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/DefaultPathParser.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/DefaultPathParser.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/DefaultPathParser.java diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/FilenameParser.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/FilenameParser.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/FilenameParser.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/FilenameParser.java diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/ManagedDefaultRepositoryContent.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/ManagedDefaultRepositoryContent.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/ManagedDefaultRepositoryContent.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/ManagedDefaultRepositoryContent.java diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/MavenContentProvider.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/MavenContentProvider.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/MavenContentProvider.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/MavenContentProvider.java diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/RemoteDefaultRepositoryContent.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/RemoteDefaultRepositoryContent.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/RemoteDefaultRepositoryContent.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/RemoteDefaultRepositoryContent.java diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/RepositoryRequest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/RepositoryRequest.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/RepositoryRequest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/RepositoryRequest.java diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/maven2/MavenManagedRepository.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven2/MavenManagedRepository.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/maven2/MavenManagedRepository.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven2/MavenManagedRepository.java diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/maven2/MavenRemoteRepository.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven2/MavenRemoteRepository.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/maven2/MavenRemoteRepository.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven2/MavenRemoteRepository.java diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/maven2/MavenRepositoryProvider.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven2/MavenRepositoryProvider.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/maven2/MavenRepositoryProvider.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven2/MavenRepositoryProvider.java diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/maven2/MavenSystemManager.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven2/MavenSystemManager.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/maven2/MavenSystemManager.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven2/MavenSystemManager.java diff --git a/archiva-modules/plugins/maven2-repository/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/resources/META-INF/spring-context.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/main/resources/META-INF/spring-context.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/resources/META-INF/spring-context.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/expected-poms/archiva-model-effective.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/expected-poms/archiva-model-effective.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/expected-poms/archiva-model-effective.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/expected-poms/archiva-model-effective.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/expected-poms/cocoon-1.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/expected-poms/cocoon-1.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/expected-poms/cocoon-1.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/expected-poms/cocoon-1.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/expected-poms/maven-parent-4.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/expected-poms/maven-parent-4.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/expected-poms/maven-parent-4.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/expected-poms/maven-parent-4.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/expected-poms/model-write-400-simple.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/expected-poms/model-write-400-simple.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/expected-poms/model-write-400-simple.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/expected-poms/model-write-400-simple.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/expected-poms/test-project-model-effective.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/expected-poms/test-project-model-effective.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/expected-poms/test-project-model-effective.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/expected-poms/test-project-model-effective.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/MockRepoAdmin.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/configuration/MockRepoAdmin.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/MockRepoAdmin.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/configuration/MockRepoAdmin.java diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTestMaven3.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTestMaven3.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTestMaven3.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTestMaven3.java diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/MockRepositoryArchivaTaskScheduler.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/MockRepositoryArchivaTaskScheduler.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/MockRepositoryArchivaTaskScheduler.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/MockRepositoryArchivaTaskScheduler.java diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411Test.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411Test.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411Test.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411Test.java diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedReleaseTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedReleaseTest.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedReleaseTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedReleaseTest.java diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedSnapshotTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedSnapshotTest.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedSnapshotTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverManagedSnapshotTest.java diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MockWagon.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MockWagon.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MockWagon.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MockWagon.java diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/RemoteDefaultRepositoryContentTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/RemoteDefaultRepositoryContentTest.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/RemoteDefaultRepositoryContentTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/RemoteDefaultRepositoryContentTest.java diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/AbstractRepositoryLayerTestCase.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/AbstractRepositoryLayerTestCase.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/AbstractRepositoryLayerTestCase.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/AbstractRepositoryLayerTestCase.java diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/RepositoryURLTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/RepositoryURLTest.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/RepositoryURLTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/RepositoryURLTest.java diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/ArtifactExtensionMappingTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/content/maven2/ArtifactExtensionMappingTest.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/ArtifactExtensionMappingTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/content/maven2/ArtifactExtensionMappingTest.java diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/DefaultPathParserTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/content/maven2/DefaultPathParserTest.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/DefaultPathParserTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/content/maven2/DefaultPathParserTest.java diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/FilenameParserTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/content/maven2/FilenameParserTest.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/FilenameParserTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/content/maven2/FilenameParserTest.java diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/RepositoryRequestTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/content/maven2/RepositoryRequestTest.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/RepositoryRequestTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/content/maven2/RepositoryRequestTest.java diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/index/mock/ArchivaIndexManagerMock.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/index/mock/ArchivaIndexManagerMock.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/index/mock/ArchivaIndexManagerMock.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/index/mock/ArchivaIndexManagerMock.java diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/index/mock/MavenIndexContextMock.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/index/mock/MavenIndexContextMock.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/index/mock/MavenIndexContextMock.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/index/mock/MavenIndexContextMock.java diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/maven2/MavenRepositoryProviderTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven2/MavenRepositoryProviderTest.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/maven2/MavenRepositoryProviderTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven2/MavenRepositoryProviderTest.java diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/Maven2RepositoryStorageTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/metadata/Maven2RepositoryStorageTest.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/Maven2RepositoryStorageTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/metadata/Maven2RepositoryStorageTest.java diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataReaderTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataReaderTest.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataReaderTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataReaderTest.java diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataWriterTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataWriterTest.java similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataWriterTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataWriterTest.java diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/CVS/Root b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/CVS/Root similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/CVS/Root rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/CVS/Root diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/KEYS b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/KEYS similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/KEYS rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/KEYS diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/invalid/invalid-1.0.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/invalid/invalid-1.0.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/invalid/invalid-1.0.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/invalid/invalid-1.0.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/invalid/invalid/1.0/invalid-1.0b.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/invalid/invalid/1.0/invalid-1.0b.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/invalid/invalid/1.0/invalid-1.0b.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/invalid/invalid/1.0/invalid-1.0b.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/invalid/invalid/1.0/invalid-2.0.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/invalid/invalid/1.0/invalid-2.0.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/invalid/invalid/1.0/invalid-2.0.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/invalid/invalid/1.0/invalid-2.0.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/invalid/invalid/1/invalid-1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/invalid/invalid/1/invalid-1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/invalid/invalid/1/invalid-1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/invalid/invalid/1/invalid-1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/javax/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/javax/maven-metadata.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/javax/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/javax/maven-metadata.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/javax/sql/jdbc/2.0/jdbc-2.0.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/javax/sql/jdbc/2.0/jdbc-2.0.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/javax/sql/jdbc/2.0/jdbc-2.0.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/javax/sql/jdbc/2.0/jdbc-2.0.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/javax/sql/jdbc/maven-metadata-repository.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/javax/sql/jdbc/maven-metadata-repository.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/javax/sql/jdbc/maven-metadata-repository.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/javax/sql/jdbc/maven-metadata-repository.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/javax/sql/maven-metadata-repository.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/javax/sql/maven-metadata-repository.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/javax/sql/maven-metadata-repository.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/javax/sql/maven-metadata-repository.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/archiva/sample-parent/2.1-SNAPSHOT/sample-parent-2.1-20090807.095532-1.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/archiva/sample-parent/2.1-SNAPSHOT/sample-parent-2.1-20090807.095532-1.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/archiva/sample-parent/2.1-SNAPSHOT/sample-parent-2.1-20090807.095532-1.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/archiva/sample-parent/2.1-SNAPSHOT/sample-parent-2.1-20090807.095532-1.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/archiva/sample-parent/2.1-SNAPSHOT/sample-parent-2.1-20090808.085535-2.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/archiva/sample-parent/2.1-SNAPSHOT/sample-parent-2.1-20090808.085535-2.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/archiva/sample-parent/2.1-SNAPSHOT/sample-parent-2.1-20090808.085535-2.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/archiva/sample-parent/2.1-SNAPSHOT/sample-parent-2.1-20090808.085535-2.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/archiva/sample-project/2.1-SNAPSHOT/sample-project-2.1-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/archiva/sample-project/2.1-SNAPSHOT/sample-project-2.1-SNAPSHOT.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/archiva/sample-project/2.1-SNAPSHOT/sample-project-2.1-SNAPSHOT.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/archiva/sample-project/2.1-SNAPSHOT/sample-project-2.1-SNAPSHOT.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.210059-1.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.210059-1.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.210059-1.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.210059-1.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.210059-1.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.210059-1.pom.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.210059-1.pom.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.210059-1.pom.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.210059-1.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.210059-1.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.210059-1.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.210059-1.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.232304-2.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.232304-2.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.232304-2.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.232304-2.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.232304-2.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.232304-2.pom.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.232304-2.pom.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.232304-2.pom.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.232304-2.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.232304-2.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.232304-2.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.232304-2.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.053327-3.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.053327-3.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.053327-3.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.053327-3.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.053327-3.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.053327-3.pom.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.053327-3.pom.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.053327-3.pom.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.053327-3.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.053327-3.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.053327-3.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.053327-3.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.173653-5.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.173653-5.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.173653-5.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.173653-5.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.173653-5.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.173653-5.pom.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.173653-5.pom.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.173653-5.pom.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.173653-5.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.173653-5.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.173653-5.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.173653-5.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070727.113106-7.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070727.113106-7.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070727.113106-7.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070727.113106-7.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070727.113106-7.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070727.113106-7.pom.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070727.113106-7.pom.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070727.113106-7.pom.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070727.113106-7.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070727.113106-7.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070727.113106-7.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070727.113106-7.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.053229-10.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.053229-10.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.053229-10.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.053229-10.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.053229-10.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.053229-10.pom.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.053229-10.pom.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.053229-10.pom.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.053229-10.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.053229-10.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.053229-10.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.053229-10.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.112043-11.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.112043-11.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.112043-11.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.112043-11.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.112043-11.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.112043-11.pom.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.112043-11.pom.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.112043-11.pom.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.112043-11.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.112043-11.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.112043-11.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.112043-11.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070729.171937-16.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070729.171937-16.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070729.171937-16.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070729.171937-16.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070729.171937-16.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070729.171937-16.pom.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070729.171937-16.pom.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070729.171937-16.pom.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070729.171937-16.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070729.171937-16.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070729.171937-16.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070729.171937-16.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070730.232112-20.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070730.232112-20.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070730.232112-20.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070730.232112-20.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070730.232112-20.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070730.232112-20.pom.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070730.232112-20.pom.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070730.232112-20.pom.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070730.232112-20.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070730.232112-20.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070730.232112-20.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070730.232112-20.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.113304-21.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.113304-21.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.113304-21.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.113304-21.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.113304-21.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.113304-21.pom.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.113304-21.pom.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.113304-21.pom.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.113304-21.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.113304-21.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.113304-21.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.113304-21.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.172936-22.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.172936-22.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.172936-22.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.172936-22.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.172936-22.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.172936-22.pom.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.172936-22.pom.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.172936-22.pom.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.172936-22.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.172936-22.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.172936-22.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.172936-22.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070802.113139-29.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070802.113139-29.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070802.113139-29.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070802.113139-29.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070802.113139-29.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070802.113139-29.pom.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070802.113139-29.pom.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070802.113139-29.pom.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070802.113139-29.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070802.113139-29.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070802.113139-29.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070802.113139-29.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/maven-metadata.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/maven-metadata.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/maven-metadata.xml.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/maven-metadata.xml.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/maven-metadata.xml.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/maven-metadata.xml.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/maven-metadata.xml.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/maven-metadata.xml.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/maven-metadata.xml.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/maven-metadata.xml.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/cocoon/cocoon/1/cocoon-1.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/cocoon/cocoon/1/cocoon-1.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/cocoon/cocoon/1/cocoon-1.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/cocoon/cocoon/1/cocoon-1.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.war b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.war similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.war rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.war diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/B/1.0/B-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/B/1.0/B-1.0.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/B/1.0/B-1.0.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/B/1.0/B-1.0.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/B/2.0/B-2.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/B/2.0/B-2.0.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/B/2.0/B-2.0.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/B/2.0/B-2.0.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.war b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.war similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.war rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.war diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-applet/1.0-SNAPSHOT/archiva-applet-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-applet/1.0-SNAPSHOT/archiva-applet-1.0-SNAPSHOT.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-applet/1.0-SNAPSHOT/archiva-applet-1.0-SNAPSHOT.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-applet/1.0-SNAPSHOT/archiva-applet-1.0-SNAPSHOT.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-base/1.0-SNAPSHOT/archiva-base-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-base/1.0-SNAPSHOT/archiva-base-1.0-SNAPSHOT.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-base/1.0-SNAPSHOT/archiva-base-1.0-SNAPSHOT.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-base/1.0-SNAPSHOT/archiva-base-1.0-SNAPSHOT.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-cli/1.0-SNAPSHOT/archiva-cli-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-cli/1.0-SNAPSHOT/archiva-cli-1.0-SNAPSHOT.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-cli/1.0-SNAPSHOT/archiva-cli-1.0-SNAPSHOT.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-cli/1.0-SNAPSHOT/archiva-cli-1.0-SNAPSHOT.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-common/1.0-SNAPSHOT/archiva-common-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-common/1.0-SNAPSHOT/archiva-common-1.0-SNAPSHOT.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-common/1.0-SNAPSHOT/archiva-common-1.0-SNAPSHOT.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-common/1.0-SNAPSHOT/archiva-common-1.0-SNAPSHOT.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-configuration/1.0-SNAPSHOT/archiva-configuration-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-configuration/1.0-SNAPSHOT/archiva-configuration-1.0-SNAPSHOT.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-configuration/1.0-SNAPSHOT/archiva-configuration-1.0-SNAPSHOT.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-configuration/1.0-SNAPSHOT/archiva-configuration-1.0-SNAPSHOT.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-consumer-api/1.0-SNAPSHOT/archiva-consumer-api-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-consumer-api/1.0-SNAPSHOT/archiva-consumer-api-1.0-SNAPSHOT.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-consumer-api/1.0-SNAPSHOT/archiva-consumer-api-1.0-SNAPSHOT.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-consumer-api/1.0-SNAPSHOT/archiva-consumer-api-1.0-SNAPSHOT.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-consumers/1.0-SNAPSHOT/archiva-consumers-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-consumers/1.0-SNAPSHOT/archiva-consumers-1.0-SNAPSHOT.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-consumers/1.0-SNAPSHOT/archiva-consumers-1.0-SNAPSHOT.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-consumers/1.0-SNAPSHOT/archiva-consumers-1.0-SNAPSHOT.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-converter/1.0-SNAPSHOT/archiva-converter-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-converter/1.0-SNAPSHOT/archiva-converter-1.0-SNAPSHOT.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-converter/1.0-SNAPSHOT/archiva-converter-1.0-SNAPSHOT.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-converter/1.0-SNAPSHOT/archiva-converter-1.0-SNAPSHOT.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-core-consumers/1.0-SNAPSHOT/archiva-core-consumers-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-core-consumers/1.0-SNAPSHOT/archiva-core-consumers-1.0-SNAPSHOT.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-core-consumers/1.0-SNAPSHOT/archiva-core-consumers-1.0-SNAPSHOT.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-core-consumers/1.0-SNAPSHOT/archiva-core-consumers-1.0-SNAPSHOT.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-core/1.0-SNAPSHOT/archiva-core-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-core/1.0-SNAPSHOT/archiva-core-1.0-SNAPSHOT.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-core/1.0-SNAPSHOT/archiva-core-1.0-SNAPSHOT.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-core/1.0-SNAPSHOT/archiva-core-1.0-SNAPSHOT.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-discoverer/1.0-SNAPSHOT/archiva-discoverer-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-discoverer/1.0-SNAPSHOT/archiva-discoverer-1.0-SNAPSHOT.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-discoverer/1.0-SNAPSHOT/archiva-discoverer-1.0-SNAPSHOT.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-discoverer/1.0-SNAPSHOT/archiva-discoverer-1.0-SNAPSHOT.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-indexer/1.0-SNAPSHOT/archiva-indexer-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-indexer/1.0-SNAPSHOT/archiva-indexer-1.0-SNAPSHOT.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-indexer/1.0-SNAPSHOT/archiva-indexer-1.0-SNAPSHOT.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-indexer/1.0-SNAPSHOT/archiva-indexer-1.0-SNAPSHOT.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-model/1.0-SNAPSHOT/archiva-model-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-model/1.0-SNAPSHOT/archiva-model-1.0-SNAPSHOT.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-model/1.0-SNAPSHOT/archiva-model-1.0-SNAPSHOT.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-model/1.0-SNAPSHOT/archiva-model-1.0-SNAPSHOT.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-parent/1.0-SNAPSHOT/archiva-parent-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-parent/1.0-SNAPSHOT/archiva-parent-1.0-SNAPSHOT.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-parent/1.0-SNAPSHOT/archiva-parent-1.0-SNAPSHOT.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-parent/1.0-SNAPSHOT/archiva-parent-1.0-SNAPSHOT.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-plexus-application/1.0-SNAPSHOT/archiva-plexus-application-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-plexus-application/1.0-SNAPSHOT/archiva-plexus-application-1.0-SNAPSHOT.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-plexus-application/1.0-SNAPSHOT/archiva-plexus-application-1.0-SNAPSHOT.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-plexus-application/1.0-SNAPSHOT/archiva-plexus-application-1.0-SNAPSHOT.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-plexus-runtime/1.0-SNAPSHOT/archiva-plexus-runtime-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-plexus-runtime/1.0-SNAPSHOT/archiva-plexus-runtime-1.0-SNAPSHOT.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-plexus-runtime/1.0-SNAPSHOT/archiva-plexus-runtime-1.0-SNAPSHOT.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-plexus-runtime/1.0-SNAPSHOT/archiva-plexus-runtime-1.0-SNAPSHOT.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-proxy/1.0-SNAPSHOT/archiva-proxy-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-proxy/1.0-SNAPSHOT/archiva-proxy-1.0-SNAPSHOT.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-proxy/1.0-SNAPSHOT/archiva-proxy-1.0-SNAPSHOT.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-proxy/1.0-SNAPSHOT/archiva-proxy-1.0-SNAPSHOT.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-reports-standard/1.0-SNAPSHOT/archiva-reports-standard-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-reports-standard/1.0-SNAPSHOT/archiva-reports-standard-1.0-SNAPSHOT.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-reports-standard/1.0-SNAPSHOT/archiva-reports-standard-1.0-SNAPSHOT.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-reports-standard/1.0-SNAPSHOT/archiva-reports-standard-1.0-SNAPSHOT.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-repository-layer/1.0-SNAPSHOT/archiva-repository-layer-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-repository-layer/1.0-SNAPSHOT/archiva-repository-layer-1.0-SNAPSHOT.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-repository-layer/1.0-SNAPSHOT/archiva-repository-layer-1.0-SNAPSHOT.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-repository-layer/1.0-SNAPSHOT/archiva-repository-layer-1.0-SNAPSHOT.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-security/1.0-SNAPSHOT/archiva-security-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-security/1.0-SNAPSHOT/archiva-security-1.0-SNAPSHOT.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-security/1.0-SNAPSHOT/archiva-security-1.0-SNAPSHOT.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-security/1.0-SNAPSHOT/archiva-security-1.0-SNAPSHOT.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-webapp/1.0-SNAPSHOT/archiva-webapp-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-webapp/1.0-SNAPSHOT/archiva-webapp-1.0-SNAPSHOT.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-webapp/1.0-SNAPSHOT/archiva-webapp-1.0-SNAPSHOT.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-webapp/1.0-SNAPSHOT/archiva-webapp-1.0-SNAPSHOT.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-xml-tools/1.0-SNAPSHOT/archiva-xml-tools-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-xml-tools/1.0-SNAPSHOT/archiva-xml-tools-1.0-SNAPSHOT.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-xml-tools/1.0-SNAPSHOT/archiva-xml-tools-1.0-SNAPSHOT.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-xml-tools/1.0-SNAPSHOT/archiva-xml-tools-1.0-SNAPSHOT.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva/1.0-SNAPSHOT/archiva-1.0-20061126.005254-2.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva/1.0-SNAPSHOT/archiva-1.0-20061126.005254-2.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva/1.0-SNAPSHOT/archiva-1.0-20061126.005254-2.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva/1.0-SNAPSHOT/archiva-1.0-20061126.005254-2.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva/1.0-SNAPSHOT/archiva-1.0-SNAPSHOT-site.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva/1.0-SNAPSHOT/archiva-1.0-SNAPSHOT-site.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva/1.0-SNAPSHOT/archiva-1.0-SNAPSHOT-site.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva/1.0-SNAPSHOT/archiva-1.0-SNAPSHOT-site.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva/1.0-SNAPSHOT/archiva-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva/1.0-SNAPSHOT/archiva-1.0-SNAPSHOT.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva/1.0-SNAPSHOT/archiva-1.0-SNAPSHOT.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva/1.0-SNAPSHOT/archiva-1.0-SNAPSHOT.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/discovery/1.0/discovery-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/discovery/1.0/discovery-1.0.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/discovery/1.0/discovery-1.0.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/discovery/1.0/discovery-1.0.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/maven-metadata.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/maven-metadata.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4-site.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4-site.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4-site.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4-site.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4-site_en.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4-site_en.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4-site_en.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4-site_en.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/samplejar/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/samplejar/maven-metadata.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/samplejar/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/samplejar/maven-metadata.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-javadoc.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-javadoc.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-javadoc.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-javadoc.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-javadoc.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-javadoc.jar.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-javadoc.jar.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-javadoc.jar.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-javadoc.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-javadoc.jar.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-javadoc.jar.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-javadoc.jar.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-sources.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-sources.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-sources.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-sources.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-sources.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-sources.jar.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-sources.jar.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-sources.jar.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-sources.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-sources.jar.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-sources.jar.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-sources.jar.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.jar.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.jar.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.jar.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.jar.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.jar.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.jar.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.pom.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.pom.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.pom.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-javadoc.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-javadoc.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-javadoc.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-javadoc.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-javadoc.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-javadoc.jar.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-javadoc.jar.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-javadoc.jar.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-javadoc.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-javadoc.jar.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-javadoc.jar.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-javadoc.jar.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-sources.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-sources.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-sources.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-sources.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-sources.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-sources.jar.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-sources.jar.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-sources.jar.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-sources.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-sources.jar.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-sources.jar.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-sources.jar.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.jar.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.jar.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.jar.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.jar.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.jar.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.jar.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.pom.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.pom.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.pom.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/maven-metadata.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/maven-metadata.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/maven-metadata.xml.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/maven-metadata.xml.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/maven-metadata.xml.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/maven-metadata.xml.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/maven-metadata.xml.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/maven-metadata.xml.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/maven-metadata.xml.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/maven-metadata.xml.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1-javadoc.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1-javadoc.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1-javadoc.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1-javadoc.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/test/2.0.4-SNAPSHOT/test-2.0.4-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/test/2.0.4-SNAPSHOT/test-2.0.4-SNAPSHOT.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/test/2.0.4-SNAPSHOT/test-2.0.4-SNAPSHOT.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/test/2.0.4-SNAPSHOT/test-2.0.4-SNAPSHOT.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0-test-sources.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0-test-sources.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0-test-sources.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0-test-sources.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.zip b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.zip similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.zip rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.zip diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/maven-metadata.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/maven-metadata.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/update/test-updated/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/update/test-updated/maven-metadata.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/maven/update/test-updated/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/update/test-updated/maven-metadata.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/testgroup/discovery/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/testgroup/discovery/maven-metadata.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/org/apache/testgroup/discovery/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/testgroup/discovery/maven-metadata.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/test-project/test-project-api/2.4.4/test-project-api-2.4.4.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/test-project/test-project-api/2.4.4/test-project-api-2.4.4.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/test-project/test-project-api/2.4.4/test-project-api-2.4.4.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/test-project/test-project-api/2.4.4/test-project-api-2.4.4.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/test-project/test-project-broker-ejb/2.4.4/test-project-broker-ejb-2.4.4.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/test-project/test-project-broker-ejb/2.4.4/test-project-broker-ejb-2.4.4.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/test-project/test-project-broker-ejb/2.4.4/test-project-broker-ejb-2.4.4.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/test-project/test-project-broker-ejb/2.4.4/test-project-broker-ejb-2.4.4.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/test-project/test-project-broker-pom/2.4.4/test-project-broker-pom-2.4.4.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/test-project/test-project-broker-pom/2.4.4/test-project-broker-pom-2.4.4.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/test-project/test-project-broker-pom/2.4.4/test-project-broker-pom-2.4.4.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/test-project/test-project-broker-pom/2.4.4/test-project-broker-pom-2.4.4.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/test-project/test-project-common/2.4.4/test-project-common-2.4.4.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/test-project/test-project-common/2.4.4/test-project-common-2.4.4.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/test-project/test-project-common/2.4.4/test-project-common-2.4.4.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/test-project/test-project-common/2.4.4/test-project-common-2.4.4.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/test-project/test-project-endpoint-ejb/2.4.4/test-project-endpoint-ejb-2.4.4.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/test-project/test-project-endpoint-ejb/2.4.4/test-project-endpoint-ejb-2.4.4.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/test-project/test-project-endpoint-ejb/2.4.4/test-project-endpoint-ejb-2.4.4.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/test-project/test-project-endpoint-ejb/2.4.4/test-project-endpoint-ejb-2.4.4.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/test-project/test-project-endpoint-pom/2.4.4/test-project-endpoint-pom-2.4.4.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/test-project/test-project-endpoint-pom/2.4.4/test-project-endpoint-pom-2.4.4.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/test-project/test-project-endpoint-pom/2.4.4/test-project-endpoint-pom-2.4.4.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/test-project/test-project-endpoint-pom/2.4.4/test-project-endpoint-pom-2.4.4.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/test-project/test-project/2.4.4/test-project-2.4.4.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/test-project/test-project/2.4.4/test-project-2.4.4.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/default-repository/test-project/test-project/2.4.4/test-project-2.4.4.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/test-project/test-project/2.4.4/test-project-2.4.4.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/bad_artifact/empty.txt b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/bad_artifact/empty.txt similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/bad_artifact/empty.txt rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/bad_artifact/empty.txt diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/include_xml-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/include_xml-1.0.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/include_xml-1.0.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/include_xml-1.0.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/include_xml-1.0.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/include_xml-1.0.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/include_xml-1.0.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/include_xml-1.0.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/maven-metadata.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/maven-metadata.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/incomplete_metadata_a/1.0/incomplete_metadata_a-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/incomplete_metadata_a/1.0/incomplete_metadata_a-1.0.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/incomplete_metadata_a/1.0/incomplete_metadata_a-1.0.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/incomplete_metadata_a/1.0/incomplete_metadata_a-1.0.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/incomplete_metadata_a/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/incomplete_metadata_a/maven-metadata.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/incomplete_metadata_a/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/incomplete_metadata_a/maven-metadata.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.0-SNAPSHOT/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.0-SNAPSHOT/maven-metadata.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.0-SNAPSHOT/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.0-SNAPSHOT/maven-metadata.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.0-SNAPSHOT/missing_artifact-1.0-20091007.132409-1.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.0-SNAPSHOT/missing_artifact-1.0-20091007.132409-1.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.0-SNAPSHOT/missing_artifact-1.0-20091007.132409-1.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.0-SNAPSHOT/missing_artifact-1.0-20091007.132409-1.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.0-SNAPSHOT/missing_artifact-1.0-20091007.132409-1.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.0-SNAPSHOT/missing_artifact-1.0-20091007.132409-1.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.0-SNAPSHOT/missing_artifact-1.0-20091007.132409-1.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.0-SNAPSHOT/missing_artifact-1.0-20091007.132409-1.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.2-SNAPSHOT/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.2-SNAPSHOT/maven-metadata.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.2-SNAPSHOT/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.2-SNAPSHOT/maven-metadata.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.2-SNAPSHOT/missing_artifact-1.2-20091011.133751-1.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.2-SNAPSHOT/missing_artifact-1.2-20091011.133751-1.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.2-SNAPSHOT/missing_artifact-1.2-20091011.133751-1.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.2-SNAPSHOT/missing_artifact-1.2-20091011.133751-1.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.2-SNAPSHOT/missing_artifact-1.2-20091011.133751-1.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.2-SNAPSHOT/missing_artifact-1.2-20091011.133751-1.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.2-SNAPSHOT/missing_artifact-1.2-20091011.133751-1.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.2-SNAPSHOT/missing_artifact-1.2-20091011.133751-1.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/maven-metadata.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/maven-metadata.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_a/1.0/missing_metadata_a-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_a/1.0/missing_metadata_a-1.0.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_a/1.0/missing_metadata_a-1.0.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_a/1.0/missing_metadata_a-1.0.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/1.0.1/missing_metadata_b-1.0.1.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/1.0.1/missing_metadata_b-1.0.1.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/1.0.1/missing_metadata_b-1.0.1.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/1.0.1/missing_metadata_b-1.0.1.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/1.0/missing_metadata_b-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/1.0/missing_metadata_b-1.0.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/1.0/missing_metadata_b-1.0.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/1.0/missing_metadata_b-1.0.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/2.0-20070821-dev/missing_metadata_b-2.0-20070821-dev.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/2.0-20070821-dev/missing_metadata_b-2.0-20070821-dev.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/2.0-20070821-dev/missing_metadata_b-2.0-20070821-dev.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/2.0-20070821-dev/missing_metadata_b-2.0-20070821-dev.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/2.0.1/missing_metadata_b-2.0.1.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/2.0.1/missing_metadata_b-2.0.1.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/2.0.1/missing_metadata_b-2.0.1.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/2.0.1/missing_metadata_b-2.0.1.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/2.0/missing_metadata_b-2.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/2.0/missing_metadata_b-2.0.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/2.0/missing_metadata_b-2.0.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/2.0/missing_metadata_b-2.0.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/1.0/proxied_multi-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/1.0/proxied_multi-1.0.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/1.0/proxied_multi-1.0.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/1.0/proxied_multi-1.0.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/1.1/proxied_multi-1.1.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/1.1/proxied_multi-1.1.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/1.1/proxied_multi-1.1.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/1.1/proxied_multi-1.1.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/2.1/proxied_multi-2.1.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/2.1/proxied_multi-2.1.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/2.1/proxied_multi-2.1.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/2.1/proxied_multi-2.1.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/maven-metadata-central.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/maven-metadata-central.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/maven-metadata-central.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/maven-metadata-central.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/maven-metadata-java.net.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/maven-metadata-java.net.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/maven-metadata-java.net.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/maven-metadata-java.net.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/maven-metadata.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/maven-metadata.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata-apache-snapshots.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata-apache-snapshots.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata-apache-snapshots.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata-apache-snapshots.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata-internal-snapshots.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata-internal-snapshots.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata-internal-snapshots.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata-internal-snapshots.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata-snapshots.codehaus.org.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata-snapshots.codehaus.org.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata-snapshots.codehaus.org.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata-snapshots.codehaus.org.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2-javadoc.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2-javadoc.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2-javadoc.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2-javadoc.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2-sources.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2-sources.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2-sources.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2-sources.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2.war b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2.war similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2.war rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2.war diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070302.212723-3-sources.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070302.212723-3-sources.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070302.212723-3-sources.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070302.212723-3-sources.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070302.212723-3.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070302.212723-3.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070302.212723-3.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070302.212723-3.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070302.212723-3.war b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070302.212723-3.war similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070302.212723-3.war rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070302.212723-3.war diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070303.152828-4-sources.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070303.152828-4-sources.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070303.152828-4-sources.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070303.152828-4-sources.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070303.152828-4.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070303.152828-4.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070303.152828-4.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070303.152828-4.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070303.152828-4.war b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070303.152828-4.war similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070303.152828-4.war rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070303.152828-4.war diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.war b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.war similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.war rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.war diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.war.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.war.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.war.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.war.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.war b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.war similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.war rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.war diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.war.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.war.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.war.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.war.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.war b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.war similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.war rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.war diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.war.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.war.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.war.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.war.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.war b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.war similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.war rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.war diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.war.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.war.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.war.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.war.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-SNAPSHOT-sources.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-SNAPSHOT-sources.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-SNAPSHOT-sources.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-SNAPSHOT-sources.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-SNAPSHOT.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-SNAPSHOT.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-SNAPSHOT.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-SNAPSHOT.war b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-SNAPSHOT.war similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-SNAPSHOT.war rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-SNAPSHOT.war diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/maven-metadata.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/maven-metadata.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.jar.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.jar.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.jar.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.jar.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.jar.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.jar.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.pom.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.pom.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.pom.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2-sources.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2-sources.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2-sources.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2-sources.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2-sources.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2-sources.jar.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2-sources.jar.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2-sources.jar.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2-sources.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2-sources.jar.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2-sources.jar.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2-sources.jar.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.jar.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.jar.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.jar.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.jar.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.jar.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.jar.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.pom.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.pom.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.pom.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3-sources.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3-sources.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3-sources.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3-sources.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3-sources.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3-sources.jar.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3-sources.jar.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3-sources.jar.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3-sources.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3-sources.jar.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3-sources.jar.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3-sources.jar.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.jar.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.jar.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.jar.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.jar.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.jar.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.jar.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.pom.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.pom.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.pom.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4-sources.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4-sources.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4-sources.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4-sources.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4-sources.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4-sources.jar.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4-sources.jar.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4-sources.jar.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4-sources.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4-sources.jar.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4-sources.jar.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4-sources.jar.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.jar.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.jar.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.jar.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.jar.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.jar.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.jar.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.pom.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.pom.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.pom.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.jar.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.jar.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.jar.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.jar.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.jar.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.jar.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.pom.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.pom.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.pom.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.jar.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.jar.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.jar.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.jar.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.jar.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.jar.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.pom.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.pom.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.pom.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.jar.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.jar.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.jar.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.jar.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.jar.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.jar.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.pom.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.pom.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.pom.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.jar.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.jar.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.jar.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.jar.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.jar.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.jar.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.pom.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.pom.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.pom.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-javadoc.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-javadoc.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-javadoc.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-javadoc.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-javadoc.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-javadoc.jar.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-javadoc.jar.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-javadoc.jar.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-javadoc.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-javadoc.jar.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-javadoc.jar.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-javadoc.jar.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-sources.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-sources.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-sources.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-sources.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-sources.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-sources.jar.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-sources.jar.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-sources.jar.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-sources.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-sources.jar.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-sources.jar.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-sources.jar.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.jar.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.jar.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.jar.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.jar.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.jar.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.jar.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.pom.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.pom.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.pom.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.jar similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.jar rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.jar diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.jar.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.jar.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.jar.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.jar.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.jar.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.jar.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.pom.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.pom.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.pom.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/META-INF/spring-context.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/META-INF/spring-context.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/META-INF/spring-context.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/META-INF/spring-context.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.pom.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.pom.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.pom.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-b/1.0/test-artifact-module-b-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-artifact-module-b/1.0/test-artifact-module-b-1.0.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-b/1.0/test-artifact-module-b-1.0.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-artifact-module-b/1.0/test-artifact-module-b-1.0.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-b/1.0/test-artifact-module-b-1.0.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-artifact-module-b/1.0/test-artifact-module-b-1.0.pom.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-b/1.0/test-artifact-module-b-1.0.pom.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-artifact-module-b/1.0/test-artifact-module-b-1.0.pom.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-b/1.0/test-artifact-module-b-1.0.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-artifact-module-b/1.0/test-artifact-module-b-1.0.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-b/1.0/test-artifact-module-b-1.0.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-artifact-module-b/1.0/test-artifact-module-b-1.0.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-parent/1/test-artifact-parent-1.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-artifact-parent/1/test-artifact-parent-1.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-parent/1/test-artifact-parent-1.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-artifact-parent/1/test-artifact-parent-1.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-parent/1/test-artifact-parent-1.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-artifact-parent/1/test-artifact-parent-1.pom.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-parent/1/test-artifact-parent-1.pom.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-artifact-parent/1/test-artifact-parent-1.pom.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-parent/1/test-artifact-parent-1.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-artifact-parent/1/test-artifact-parent-1.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-parent/1/test-artifact-parent-1.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-artifact-parent/1/test-artifact-parent-1.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-root/1.0/test-artifact-root-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-artifact-root/1.0/test-artifact-root-1.0.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-root/1.0/test-artifact-root-1.0.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-artifact-root/1.0/test-artifact-root-1.0.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-root/1.0/test-artifact-root-1.0.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-artifact-root/1.0/test-artifact-root-1.0.pom.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-root/1.0/test-artifact-root-1.0.pom.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-artifact-root/1.0/test-artifact-root-1.0.pom.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-root/1.0/test-artifact-root-1.0.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-artifact-root/1.0/test-artifact-root-1.0.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-root/1.0/test-artifact-root-1.0.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-artifact-root/1.0/test-artifact-root-1.0.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-snapshot-artifact-module-a/1.1-SNAPSHOT/test-snapshot-artifact-module-a-1.1-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-snapshot-artifact-module-a/1.1-SNAPSHOT/test-snapshot-artifact-module-a-1.1-SNAPSHOT.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-snapshot-artifact-module-a/1.1-SNAPSHOT/test-snapshot-artifact-module-a-1.1-SNAPSHOT.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-snapshot-artifact-module-a/1.1-SNAPSHOT/test-snapshot-artifact-module-a-1.1-SNAPSHOT.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-snapshot-artifact-module-a/1.1-SNAPSHOT/test-snapshot-artifact-module-a-1.1-SNAPSHOT.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-snapshot-artifact-module-a/1.1-SNAPSHOT/test-snapshot-artifact-module-a-1.1-SNAPSHOT.pom.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-snapshot-artifact-module-a/1.1-SNAPSHOT/test-snapshot-artifact-module-a-1.1-SNAPSHOT.pom.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-snapshot-artifact-module-a/1.1-SNAPSHOT/test-snapshot-artifact-module-a-1.1-SNAPSHOT.pom.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-snapshot-artifact-module-a/1.1-SNAPSHOT/test-snapshot-artifact-module-a-1.1-SNAPSHOT.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-snapshot-artifact-module-a/1.1-SNAPSHOT/test-snapshot-artifact-module-a-1.1-SNAPSHOT.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-snapshot-artifact-module-a/1.1-SNAPSHOT/test-snapshot-artifact-module-a-1.1-SNAPSHOT.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-snapshot-artifact-module-a/1.1-SNAPSHOT/test-snapshot-artifact-module-a-1.1-SNAPSHOT.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-snapshot-artifact-root/1.1-SNAPSHOT/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-snapshot-artifact-root/1.1-SNAPSHOT/maven-metadata.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-snapshot-artifact-root/1.1-SNAPSHOT/maven-metadata.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-snapshot-artifact-root/1.1-SNAPSHOT/maven-metadata.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-snapshot-artifact-root/1.1-SNAPSHOT/test-snapshot-artifact-root-1.1-20100310.014828-2.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-snapshot-artifact-root/1.1-SNAPSHOT/test-snapshot-artifact-root-1.1-20100310.014828-2.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-snapshot-artifact-root/1.1-SNAPSHOT/test-snapshot-artifact-root-1.1-20100310.014828-2.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-snapshot-artifact-root/1.1-SNAPSHOT/test-snapshot-artifact-root-1.1-20100310.014828-2.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-snapshot-artifact-root/1.1-SNAPSHOT/test-snapshot-artifact-root-1.1-20100310.014828-2.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-snapshot-artifact-root/1.1-SNAPSHOT/test-snapshot-artifact-root-1.1-20100310.014828-2.pom.md5 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-snapshot-artifact-root/1.1-SNAPSHOT/test-snapshot-artifact-root-1.1-20100310.014828-2.pom.md5 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-snapshot-artifact-root/1.1-SNAPSHOT/test-snapshot-artifact-root-1.1-20100310.014828-2.pom.md5 diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-snapshot-artifact-root/1.1-SNAPSHOT/test-snapshot-artifact-root-1.1-20100310.014828-2.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-snapshot-artifact-root/1.1-SNAPSHOT/test-snapshot-artifact-root-1.1-20100310.014828-2.pom.sha1 similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-snapshot-artifact-root/1.1-SNAPSHOT/test-snapshot-artifact-root-1.1-20100310.014828-2.pom.sha1 rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/com/example/test/test-snapshot-artifact-root/1.1-SNAPSHOT/test-snapshot-artifact-root-1.1-20100310.014828-2.pom.sha1 diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io/commons-io/1.4/commons-io-1.4.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/commons-io/commons-io/1.4/commons-io-1.4.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/commons-io/commons-io/1.4/commons-io-1.4.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/commons-io/commons-io/1.4/commons-io-1.4.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/m1-repo-filelist.txt b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/m1-repo-filelist.txt similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/m1-repo-filelist.txt rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/m1-repo-filelist.txt diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/resolver-status.properties b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/resolver-status.properties similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/resolver-status.properties rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/resolver-status.properties diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/scanner-archiva.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/scanner-archiva.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/scanner-archiva.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/scanner-archiva.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/spring-context-metadata-tools-test.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-metadata-tools-test.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/spring-context-metadata-tools-test.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-metadata-tools-test.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/spring-context-no-mock-conf.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-no-mock-conf.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/spring-context-no-mock-conf.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-no-mock-conf.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/spring-context-repo-request-test.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-repo-request-test.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/spring-context-repo-request-test.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-repo-request-test.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/spring-context-storage.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-storage.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/spring-context-storage.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-storage.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/spring-context.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context.xml similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/spring-context.xml rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context.xml diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/test-repo/org/apache/archiva/generic-version/1.0-SNAPSHOT/generic-version-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/test-repo/org/apache/archiva/generic-version/1.0-SNAPSHOT/generic-version-1.0-SNAPSHOT.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/test-repo/org/apache/archiva/generic-version/1.0-SNAPSHOT/generic-version-1.0-SNAPSHOT.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/test-repo/org/apache/archiva/generic-version/1.0-SNAPSHOT/generic-version-1.0-SNAPSHOT.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/test-repo/org/apache/archiva/released-version/1.0/released-version-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/test-repo/org/apache/archiva/released-version/1.0/released-version-1.0.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/test-repo/org/apache/archiva/released-version/1.0/released-version-1.0.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/test-repo/org/apache/archiva/released-version/1.0/released-version-1.0.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/test-repo/org/apache/archiva/unique-version/1.0-SNAPSHOT/unique-version-1.0-20090807.070903-1.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/test-repo/org/apache/archiva/unique-version/1.0-SNAPSHOT/unique-version-1.0-20090807.070903-1.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/test-repo/org/apache/archiva/unique-version/1.0-SNAPSHOT/unique-version-1.0-20090807.070903-1.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/test-repo/org/apache/archiva/unique-version/1.0-SNAPSHOT/unique-version-1.0-20090807.070903-1.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/test-repo/org/apache/archiva/unique-version/1.0-SNAPSHOT/unique-version-1.0-20090808.051902-2.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/test-repo/org/apache/archiva/unique-version/1.0-SNAPSHOT/unique-version-1.0-20090808.051902-2.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/test-repo/org/apache/archiva/unique-version/1.0-SNAPSHOT/unique-version-1.0-20090808.051902-2.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/test-repo/org/apache/archiva/unique-version/1.0-SNAPSHOT/unique-version-1.0-20090808.051902-2.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/test-repo/org/apache/archiva/unique-version/1.0-SNAPSHOT/unique-version-1.0-20090808.081025-3.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/test-repo/org/apache/archiva/unique-version/1.0-SNAPSHOT/unique-version-1.0-20090808.081025-3.pom similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/test-repo/org/apache/archiva/unique-version/1.0-SNAPSHOT/unique-version-1.0-20090808.081025-3.pom rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/test-repo/org/apache/archiva/unique-version/1.0-SNAPSHOT/unique-version-1.0-20090808.081025-3.pom diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/test01.properties b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/test01.properties similarity index 100% rename from archiva-modules/plugins/maven2-repository/src/test/resources/test01.properties rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/test01.properties diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/pom.xml b/archiva-modules/archiva-maven/archiva-maven-scheduler/pom.xml similarity index 93% rename from archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/pom.xml rename to archiva-modules/archiva-maven/archiva-maven-scheduler/pom.xml index 148559569..52763e1a9 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/pom.xml +++ b/archiva-modules/archiva-maven/archiva-maven-scheduler/pom.xml @@ -24,8 +24,8 @@ 4.0.0 - archiva-scheduler - org.apache.archiva + archiva-maven + org.apache.archiva.maven 3.0.0-SNAPSHOT @@ -34,8 +34,8 @@ ${project.parent.parent.basedir} - archiva-scheduler-indexing-maven2 - Archiva Scheduler :: Maven Indexing + archiva-maven-scheduler + Archiva :: Maven :: Scheduler Scheduler for downloading remote Maven indexes. @@ -57,8 +57,8 @@ archiva-repository-layer - org.apache.archiva - archiva-proxy-maven + org.apache.archiva.maven + archiva-maven-proxy @@ -84,8 +84,8 @@ test - org.apache.archiva - maven2-repository + org.apache.archiva.maven + archiva-maven-repository test diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/main/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutor.java b/archiva-modules/archiva-maven/archiva-maven-scheduler/src/main/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutor.java similarity index 100% rename from archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/main/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutor.java rename to archiva-modules/archiva-maven/archiva-maven-scheduler/src/main/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutor.java diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/main/java/org/apache/archiva/scheduler/indexing/maven/DefaultDownloadRemoteIndexScheduler.java b/archiva-modules/archiva-maven/archiva-maven-scheduler/src/main/java/org/apache/archiva/scheduler/indexing/maven/DefaultDownloadRemoteIndexScheduler.java similarity index 100% rename from archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/main/java/org/apache/archiva/scheduler/indexing/maven/DefaultDownloadRemoteIndexScheduler.java rename to archiva-modules/archiva-maven/archiva-maven-scheduler/src/main/java/org/apache/archiva/scheduler/indexing/maven/DefaultDownloadRemoteIndexScheduler.java diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/main/java/org/apache/archiva/scheduler/indexing/maven/DefaultIndexUpdateSideEffect.java b/archiva-modules/archiva-maven/archiva-maven-scheduler/src/main/java/org/apache/archiva/scheduler/indexing/maven/DefaultIndexUpdateSideEffect.java similarity index 100% rename from archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/main/java/org/apache/archiva/scheduler/indexing/maven/DefaultIndexUpdateSideEffect.java rename to archiva-modules/archiva-maven/archiva-maven-scheduler/src/main/java/org/apache/archiva/scheduler/indexing/maven/DefaultIndexUpdateSideEffect.java diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/main/java/org/apache/archiva/scheduler/indexing/maven/DownloadRemoteIndexTask.java b/archiva-modules/archiva-maven/archiva-maven-scheduler/src/main/java/org/apache/archiva/scheduler/indexing/maven/DownloadRemoteIndexTask.java similarity index 100% rename from archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/main/java/org/apache/archiva/scheduler/indexing/maven/DownloadRemoteIndexTask.java rename to archiva-modules/archiva-maven/archiva-maven-scheduler/src/main/java/org/apache/archiva/scheduler/indexing/maven/DownloadRemoteIndexTask.java diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/main/java/org/apache/archiva/scheduler/indexing/maven/DownloadRemoteIndexTaskRequest.java b/archiva-modules/archiva-maven/archiva-maven-scheduler/src/main/java/org/apache/archiva/scheduler/indexing/maven/DownloadRemoteIndexTaskRequest.java similarity index 100% rename from archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/main/java/org/apache/archiva/scheduler/indexing/maven/DownloadRemoteIndexTaskRequest.java rename to archiva-modules/archiva-maven/archiva-maven-scheduler/src/main/java/org/apache/archiva/scheduler/indexing/maven/DownloadRemoteIndexTaskRequest.java diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-maven/archiva-maven-scheduler/src/main/resources/META-INF/spring-context.xml similarity index 100% rename from archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/main/resources/META-INF/spring-context.xml rename to archiva-modules/archiva-maven/archiva-maven-scheduler/src/main/resources/META-INF/spring-context.xml diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/index-updates/nexus-maven-repository-index.gz b/archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/index-updates/nexus-maven-repository-index.gz similarity index 100% rename from archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/index-updates/nexus-maven-repository-index.gz rename to archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/index-updates/nexus-maven-repository-index.gz diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/index-updates/nexus-maven-repository-index.properties b/archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/index-updates/nexus-maven-repository-index.properties similarity index 100% rename from archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/index-updates/nexus-maven-repository-index.properties rename to archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/index-updates/nexus-maven-repository-index.properties diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/index-updates/nexus-maven-repository-index.zip b/archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/index-updates/nexus-maven-repository-index.zip similarity index 100% rename from archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/index-updates/nexus-maven-repository-index.zip rename to archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/index-updates/nexus-maven-repository-index.zip diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutorTest.java b/archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutorTest.java similarity index 100% rename from archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutorTest.java rename to archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutorTest.java diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/java/org/apache/archiva/scheduler/indexing/maven/DownloadRemoteIndexTaskTest.java b/archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/java/org/apache/archiva/scheduler/indexing/maven/DownloadRemoteIndexTaskTest.java similarity index 100% rename from archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/java/org/apache/archiva/scheduler/indexing/maven/DownloadRemoteIndexTaskTest.java rename to archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/java/org/apache/archiva/scheduler/indexing/maven/DownloadRemoteIndexTaskTest.java diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/resources/log4j2-test.xml b/archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/resources/log4j2-test.xml similarity index 100% rename from archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/resources/log4j2-test.xml rename to archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/resources/log4j2-test.xml diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/resources/spring-context.xml b/archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/resources/spring-context.xml similarity index 100% rename from archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/resources/spring-context.xml rename to archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/resources/spring-context.xml diff --git a/archiva-modules/archiva-maven/pom.xml b/archiva-modules/archiva-maven/pom.xml index 38580ee99..1dbd32ebe 100644 --- a/archiva-modules/archiva-maven/pom.xml +++ b/archiva-modules/archiva-maven/pom.xml @@ -40,5 +40,8 @@ archiva-maven-model archiva-maven-metadata archiva-maven-indexer + archiva-maven-scheduler + archiva-maven-repository + archiva-maven-proxy diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml index ed918ba82..fce3ed5f9 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml @@ -76,8 +76,8 @@ archiva-repository-scanner - org.apache.archiva - maven2-repository + org.apache.archiva.maven + archiva-maven-repository test diff --git a/archiva-modules/archiva-scheduler/pom.xml b/archiva-modules/archiva-scheduler/pom.xml index 89d5e7929..34328de00 100644 --- a/archiva-modules/archiva-scheduler/pom.xml +++ b/archiva-modules/archiva-scheduler/pom.xml @@ -36,7 +36,6 @@ archiva-scheduler-api archiva-scheduler-indexing - archiva-scheduler-indexing-maven2 archiva-scheduler-repository-api archiva-scheduler-repository diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml index b59d808af..1067fc24a 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml @@ -67,8 +67,8 @@ - org.apache.archiva - archiva-scheduler-indexing-maven2 + org.apache.archiva.maven + archiva-maven-scheduler org.apache.archiva @@ -106,8 +106,8 @@ - org.apache.archiva - archiva-proxy-maven + org.apache.archiva.maven + archiva-maven-proxy diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index 2651ad531..38aa011cd 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -182,9 +182,9 @@ runtime - org.apache.archiva + org.apache.archiva.maven - maven2-repository + archiva-maven-repository commons-logging diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml index 8d4ba146c..73dcd4a7f 100644 --- a/archiva-modules/archiva-web/archiva-webdav/pom.xml +++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml @@ -60,8 +60,8 @@ --> - org.apache.archiva - maven2-repository + org.apache.archiva.maven + archiva-maven-repository org.apache.archiva @@ -88,8 +88,8 @@ - org.apache.archiva - archiva-proxy-maven + org.apache.archiva.maven + archiva-maven-proxy org.apache.archiva diff --git a/archiva-modules/metadata/metadata-model-maven2/pom.xml b/archiva-modules/metadata/metadata-model-maven2/pom.xml deleted file mode 100644 index ef1d0ade7..000000000 --- a/archiva-modules/metadata/metadata-model-maven2/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - 4.0.0 - - metadata - org.apache.archiva - 3.0.0-SNAPSHOT - - metadata-model-maven2 - Archiva Metadata :: Maven 2 Model - - - ${project.parent.parent.basedir} - - - - - org.apache.archiva - metadata-model - - - commons-lang - commons-lang - - - - diff --git a/archiva-modules/metadata/metadata-statistics-api/pom.xml b/archiva-modules/metadata/metadata-statistics-api/pom.xml index 1fbbcc8b4..5c9b0a13d 100644 --- a/archiva-modules/metadata/metadata-statistics-api/pom.xml +++ b/archiva-modules/metadata/metadata-statistics-api/pom.xml @@ -37,8 +37,8 @@ metadata-repository-api - org.apache.archiva - metadata-model-maven2 + org.apache.archiva.maven + archiva-maven-metadata diff --git a/archiva-modules/metadata/pom.xml b/archiva-modules/metadata/pom.xml index b86b8751a..10735d432 100644 --- a/archiva-modules/metadata/pom.xml +++ b/archiva-modules/metadata/pom.xml @@ -35,7 +35,6 @@ metadata-model metadata-repository-api - metadata-model-maven2 metadata-statistics-api test-repository diff --git a/archiva-modules/plugins/metadata-store-jcr/pom.xml b/archiva-modules/plugins/metadata-store-jcr/pom.xml index 2b38ec7d6..98a730dd7 100644 --- a/archiva-modules/plugins/metadata-store-jcr/pom.xml +++ b/archiva-modules/plugins/metadata-store-jcr/pom.xml @@ -117,8 +117,8 @@ test - org.apache.archiva - maven2-repository + org.apache.archiva.maven + archiva-maven-repository test diff --git a/archiva-modules/plugins/pom.xml b/archiva-modules/plugins/pom.xml index e8242b392..72f937207 100644 --- a/archiva-modules/plugins/pom.xml +++ b/archiva-modules/plugins/pom.xml @@ -34,7 +34,6 @@ metadata-store-file - maven2-repository repository-statistics problem-reports audit diff --git a/archiva-modules/plugins/repository-statistics/pom.xml b/archiva-modules/plugins/repository-statistics/pom.xml index eeba93852..47d92116c 100644 --- a/archiva-modules/plugins/repository-statistics/pom.xml +++ b/archiva-modules/plugins/repository-statistics/pom.xml @@ -41,8 +41,8 @@ metadata-statistics-api - org.apache.archiva - metadata-model-maven2 + org.apache.archiva.maven + archiva-maven-metadata org.slf4j diff --git a/archiva-modules/plugins/stage-repository-merge/pom.xml b/archiva-modules/plugins/stage-repository-merge/pom.xml index bdf308224..c04f28e45 100644 --- a/archiva-modules/plugins/stage-repository-merge/pom.xml +++ b/archiva-modules/plugins/stage-repository-merge/pom.xml @@ -47,8 +47,8 @@ archiva-repository-layer - org.apache.archiva - maven2-repository + org.apache.archiva.maven + archiva-maven-repository log4j diff --git a/pom.xml b/pom.xml index e1649b804..8a1ae2a87 100644 --- a/pom.xml +++ b/pom.xml @@ -169,8 +169,8 @@ ${project.version} - org.apache.archiva - metadata-model-maven2 + org.apache.archiva.maven + archiva-maven-metadata ${project.version} @@ -241,8 +241,8 @@ ${project.version} - org.apache.archiva - maven2-repository + org.apache.archiva.maven + archiva-maven-repository ${project.version} @@ -457,8 +457,8 @@ ${project.version} - org.apache.archiva - archiva-proxy-maven + org.apache.archiva.maven + archiva-maven-proxy ${project.version} @@ -497,8 +497,8 @@ ${project.version} - org.apache.archiva - archiva-scheduler-indexing-maven2 + org.apache.archiva.maven + archiva-maven-scheduler ${project.version} diff --git a/src/ci/scripts/prepareWorkspace.sh b/src/ci/scripts/prepareWorkspace.sh index bdb31ee2d..d06341551 100755 --- a/src/ci/scripts/prepareWorkspace.sh +++ b/src/ci/scripts/prepareWorkspace.sh @@ -22,7 +22,17 @@ # # Removes directories that are not used anymore. ## -ATTIC_DIRS="archiva-modules/archiva-base/archiva-indexer archiva-modules/archiva-base/archiva-proxy-common" +ATTIC_DIRS="archiva-modules/archiva-base/archiva-indexer\ + archiva-modules/archiva-base/archiva-proxy-common\ + archiva-modules/archiva-base/archiva-maven2-common\ + archiva-modules/archiva-base/archiva-maven2-indexer\ + archiva-modules/archiva-base/archiva-maven2-metadata\ + archiva-modules/archiva-base/archiva-maven2-model\ + archiva-modules/archiva-base/archiva-proxy-maven\ + archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2\ + archiva-modules/metadata/metadata-model-maven2\ + archiva-modules/plugins/maven2-repository\ +" REMOVE_DIRS=".indexer" TMP_DIRECTORY=".tmp"