From ce6b82aa75b40c3a1af4061931968a90e90b3fdd Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Sat, 26 Aug 2006 07:22:22 +0000 Subject: [PATCH] rename java packages to archiva git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@437105 13f79535-47bb-0310-9956-ffa450edef68 --- .../applet/ChecksumApplet.java | 2 +- archiva-configuration/pom.xml | 8 +-- .../ConfigurationChangeException.java | 2 +- .../ConfigurationChangeListener.java | 2 +- .../configuration/ConfigurationStore.java | 2 +- .../ConfigurationStoreException.java | 2 +- .../DefaultConfigurationStore.java | 8 +-- .../InvalidConfigurationException.java | 2 +- .../MavenProxyPropertyLoader.java | 2 +- .../src/main/mdo/configuration.mdo | 2 +- ...ositoryConfiguration-conversion.properties | 0 .../configuration/ConfigurationStoreTest.java | 2 +- .../MavenProxyPropertyLoaderTest.java | 2 +- .../configuration/ConfigurationStoreTest.xml | 16 +++--- .../converter/DefaultRepositoryConverter.java | 12 ++-- .../RepositoryConversionException.java | 2 +- .../converter/RepositoryConverter.java | 5 +- .../transaction/AbstractTransactionEvent.java | 8 +-- .../converter/transaction/CopyFileEvent.java | 2 +- .../transaction/CreateFileEvent.java | 2 +- .../transaction/FileTransaction.java | 4 +- .../transaction/TransactionEvent.java | 2 +- .../DefaultRepositoryConverter.properties | 0 .../converter/RepositoryConverterTest.java | 8 +-- .../transaction/CopyFileEventTest.java | 6 +- .../transaction/CreateFileEventTest.java | 6 +- .../converter/RepositoryConverterTest.xml | 16 +++--- .../DefaultRepositoryManager.java | 12 ++-- .../RepositoryManager.java | 6 +- .../ConfiguredRepositoryFactory.java | 4 +- .../DefaultConfiguredRepositoryFactory.java | 8 +-- .../proxy/DefaultProxyManager.java | 18 +++--- .../proxy/ProxiedRepositoryGroup.java | 4 +- .../proxy/ProxyManager.java | 13 +++-- .../DefaultRepositoryTaskScheduler.java | 16 +++--- .../scheduler/IndexerTask.java | 28 ++++----- .../scheduler/RepositoryTask.java | 2 +- .../scheduler/RepositoryTaskJob.java | 2 +- .../scheduler/RepositoryTaskScheduler.java | 2 +- .../scheduler/TaskExecutionException.java | 2 +- .../RepositoryManagerTest.java | 2 +- .../discovery/AbstractArtifactDiscoverer.java | 2 +- .../discovery/AbstractDiscoverer.java | 2 +- .../discovery/ArtifactDiscoverer.java | 2 +- .../discovery/DefaultArtifactDiscoverer.java | 6 +- .../discovery/DefaultMetadataDiscoverer.java | 4 +- .../discovery/Discoverer.java | 2 +- .../discovery/DiscovererException.java | 2 +- .../discovery/DiscovererPath.java | 2 +- .../discovery/LegacyArtifactDiscoverer.java | 12 ++-- .../discovery/MetadataDiscoverer.java | 2 +- archiva-discoverer/src/site/apt/design.apt | 4 +- .../AbstractArtifactDiscovererTest.java | 2 +- .../DefaultArtifactDiscovererTest.java | 2 +- .../DefaultMetadataDiscovererTest.java | 2 +- .../LegacyArtifactDiscovererTest.java | 2 +- .../indexing/RepositoryArtifactIndex.java | 4 +- .../RepositoryArtifactIndexFactory.java | 2 +- .../indexing/RepositoryIndexException.java | 2 +- .../RepositoryIndexSearchException.java | 2 +- .../lucene/LuceneIndexRecordConverter.java | 4 +- .../LuceneMinimalIndexRecordConverter.java | 8 +-- .../indexing/lucene/LuceneQuery.java | 4 +- .../lucene/LuceneRepositoryArtifactIndex.java | 12 ++-- .../LuceneRepositoryArtifactIndexFactory.java | 8 +-- .../LuceneStandardIndexRecordConverter.java | 8 +-- .../indexing/query/CompoundQuery.java | 2 +- .../indexing/query/CompoundQueryTerm.java | 2 +- .../indexing/query/Query.java | 2 +- .../indexing/query/QueryTerm.java | 2 +- .../indexing/query/RangeQuery.java | 2 +- .../indexing/query/SingleTermQuery.java | 2 +- .../AbstractArtifactIndexRecordFactory.java | 6 +- .../record/MinimalArtifactIndexRecord.java | 2 +- .../MinimalArtifactIndexRecordFactory.java | 8 ++- .../record/MinimalIndexRecordFields.java | 2 +- .../record/RepositoryIndexRecord.java | 2 +- .../record/RepositoryIndexRecordFactory.java | 4 +- .../record/StandardArtifactIndexRecord.java | 2 +- .../StandardArtifactIndexRecordFactory.java | 12 ++-- .../record/StandardIndexRecordFields.java | 2 +- archiva-indexer/src/site/apt/design.apt | 2 +- .../LuceneMinimalArtifactIndexSearchTest.java | 14 ++--- .../LuceneMinimalArtifactIndexTest.java | 20 +++---- ...LuceneStandardArtifactIndexSearchTest.java | 19 +++---- .../LuceneStandardArtifactIndexTest.java | 37 ++++++------ .../indexing/query/QueryTest.java | 2 +- ...MinimalArtifactIndexRecordFactoryTest.java | 10 ++-- ...tandardArtifactIndexRecordFactoryTest.java | 36 ++++++------ .../record/parent-pom/1/parent-pom-1.pom | 4 +- .../test-archetype/1.0/test-archetype-1.0.jar | Bin 0 -> 4371 bytes .../test-archetype/1.0/test-archetype-1.0.pom | 4 +- .../test-child-pom-1.0-20060728.121314-1.jar | Bin .../test-child-pom-1.0-20060728.121314-1.pom | 4 +- .../1.0/test-corrupt-jar-1.0.jar | 0 .../test-dll/1.0.1.34/test-dll-1.0.1.34.dll | 0 .../test-jar-and-pom-1.0-alpha-1-jdk14.jar | Bin .../test-jar-and-pom-1.0-alpha-1.jar | Bin .../test-jar-and-pom-1.0-alpha-1.pom | 4 +- .../test-jar/1.0/test-jar-1.0-jdk14.jar | Bin .../record/test-jar/1.0/test-jar-1.0.jar | Bin .../test-plugin/1.0/test-plugin-1.0.jar | Bin 0 -> 4402 bytes .../test-plugin/1.0/test-plugin-1.0.pom | 4 +- .../record/test-pom/1.0/test-pom-1.0.pom | 4 +- .../test-archetype/1.0/test-archetype-1.0.jar | Bin 4338 -> 0 bytes .../test-plugin/1.0/test-plugin-1.0.jar | Bin 4416 -> 0 bytes .../proxy/DefaultProxyRequestHandler.java | 10 ++-- .../proxy/ProxiedArtifactRepository.java | 2 +- .../proxy/ProxyException.java | 2 +- .../proxy/ProxyRequestHandler.java | 2 +- .../proxy/ProxyRequestHandlerTest.java | 2 +- .../proxy/WagonDelegate.java | 2 +- .../proxy/ProxyRequestHandlerTest.xml | 2 +- .../AbstractRepositoryQueryLayer.java | 2 +- .../reporting/ArtifactReportProcessor.java | 2 +- .../reporting/ArtifactReporter.java | 2 +- .../reporting/ArtifactResult.java | 2 +- .../reporting/BadMetadataReportProcessor.java | 4 +- .../reporting/Cache.java | 2 +- .../reporting/CachedRepositoryQueryLayer.java | 2 +- .../reporting/ChecksumArtifactReporter.java | 10 ++-- .../reporting/ChecksumMetadataReporter.java | 10 ++-- .../DefaultArtifactReportProcessor.java | 4 +- .../reporting/DefaultArtifactReporter.java | 4 +- .../DefaultRepositoryQueryLayer.java | 2 +- .../DefaultRepositoryQueryLayerFactory.java | 4 +- .../DuplicateArtifactFileReportProcessor.java | 28 ++++----- .../InvalidPomArtifactReportProcessor.java | 4 +- .../LocationArtifactReportProcessor.java | 9 ++- .../reporting/MetadataReportProcessor.java | 2 +- .../reporting/ReportProcessorException.java | 2 +- .../reporting/RepositoryMetadataResult.java | 2 +- .../reporting/RepositoryQueryLayer.java | 6 +- .../RepositoryQueryLayerException.java | 2 +- .../RepositoryQueryLayerFactory.java | 2 +- ...tractChecksumArtifactReporterTestCase.java | 6 +- .../AbstractRepositoryQueryLayerTestCase.java | 2 +- .../AbstractRepositoryReportsTestCase.java | 2 +- .../ArtifactReportProcessorTest.java | 2 +- .../reporting/ArtifactReporterTest.java | 2 +- .../BadMetadataReportProcessorTest.java | 2 +- .../reporting/CacheTest.java | 2 +- .../CachedRepositoryQueryLayerTest.java | 2 +- .../ChecksumArtifactReporterTest.java | 4 +- .../DefaultArtifactReporterTest.java | 2 +- ...licateArtifactFileReportProcessorTest.java | 8 +-- .../reporting/GenericMockObject.java | 2 +- ...InvalidPomArtifactReportProcessorTest.java | 2 +- .../LocationArtifactReportProcessorTest.java | 2 +- .../reporting/MockArtifact.java | 2 +- .../reporting/MockArtifactFactory.java | 2 +- .../MockArtifactReportProcessor.java | 2 +- .../reporting/MockArtifactReporter.java | 2 +- .../reporting/MockRepositoryQueryLayer.java | 2 +- .../reporting/ReportCondition.java | 2 +- ...plicateArtifactFileReportProcessorTest.xml | 8 +-- .../digest/AbstractDigester.java | 2 +- .../digest/AbstractStreamingDigester.java | 2 +- .../digest/DigestUtils.java | 2 +- .../digest/Digester.java | 3 +- .../digest/DigesterException.java | 2 +- .../digest/Md5Digester.java | 6 +- .../digest/Sha1Digester.java | 4 +- .../digest/StreamingDigester.java | 2 +- .../digest/StreamingMd5Digester.java | 4 +- .../digest/StreamingSha1Digester.java | 4 +- .../digest/DigesterTest.java | 2 +- .../manager/web/action/BrowseAction.java | 24 ++++---- .../manager/web/action/ProxyAction.java | 6 +- .../manager/web/action/SearchAction.java | 22 ++++---- .../web/action/ShowArtifactAction.java | 10 ++-- .../AbstractConfigureRepositoryAction.java | 14 ++--- .../admin/AbstractDeleteRepositoryAction.java | 15 +++-- .../web/action/admin/ConfigureAction.java | 16 +++--- .../ConfigureProxiedRepositoryAction.java | 6 +- .../admin/ConfigureRepositoryAction.java | 6 +- .../ConfigureSyncedRepositoryAction.java | 6 +- .../admin/DeleteProxiedRepositoryAction.java | 10 ++-- .../action/admin/DeleteRepositoryAction.java | 8 +-- .../admin/DeleteSyncedRepositoryAction.java | 8 +-- .../web/action/admin/RunIndexerAction.java | 6 +- .../interceptor/ConfigurationInterceptor.java | 6 +- .../web/mapper/RepositoryActionMapper.java | 2 +- .../resources/META-INF/plexus/application.xml | 2 +- ...SearchAction-checksumSearch-validation.xml | 0 .../SearchAction-quickSearch-validation.xml | 0 .../admin/ConfigureAction-validation.xml | 0 ...gureProxiedRepositoryAction-validation.xml | 0 .../ConfigureRepositoryAction-validation.xml | 0 ...addSelectedSyncedRepository-validation.xml | 0 ...igureSyncedRepositoryAction-validation.xml | 0 .../src/main/resources/webwork.properties | 2 +- .../main/webapp/WEB-INF/jsp/findArtifact.jsp | 14 ++--- .../src/main/webapp/WEB-INF/jsp/form.jspf | 53 ------------------ .../test/stub/HttpServletRequestStub.java | 2 +- .../action/test/stub/ServletRequestStub.java | 2 +- design/white-site/pom.xml | 4 +- 197 files changed, 487 insertions(+), 541 deletions(-) rename archiva-applet/src/main/java/org/apache/maven/{repository => archiva}/applet/ChecksumApplet.java (98%) rename archiva-configuration/src/main/java/org/apache/maven/{repository => archiva}/configuration/ConfigurationChangeException.java (94%) rename archiva-configuration/src/main/java/org/apache/maven/{repository => archiva}/configuration/ConfigurationChangeListener.java (96%) rename archiva-configuration/src/main/java/org/apache/maven/{repository => archiva}/configuration/ConfigurationStore.java (97%) rename archiva-configuration/src/main/java/org/apache/maven/{repository => archiva}/configuration/ConfigurationStoreException.java (95%) rename archiva-configuration/src/main/java/org/apache/maven/{repository => archiva}/configuration/DefaultConfigurationStore.java (94%) rename archiva-configuration/src/main/java/org/apache/maven/{repository => archiva}/configuration/InvalidConfigurationException.java (95%) rename archiva-configuration/src/main/java/org/apache/maven/{repository => archiva}/configuration/MavenProxyPropertyLoader.java (99%) rename archiva-configuration/src/main/resources/org/apache/maven/{repository => archiva}/configuration/SyncedRepositoryConfiguration-conversion.properties (100%) rename archiva-configuration/src/test/java/org/apache/maven/{repository => archiva}/configuration/ConfigurationStoreTest.java (99%) rename archiva-configuration/src/test/java/org/apache/maven/{repository => archiva}/configuration/MavenProxyPropertyLoaderTest.java (98%) rename archiva-configuration/src/test/resources/org/apache/maven/{repository => archiva}/configuration/ConfigurationStoreTest.xml (65%) rename archiva-converter/src/main/java/org/apache/maven/{repository => archiva}/converter/DefaultRepositoryConverter.java (98%) rename archiva-converter/src/main/java/org/apache/maven/{repository => archiva}/converter/RepositoryConversionException.java (95%) rename archiva-converter/src/main/java/org/apache/maven/{repository => archiva}/converter/RepositoryConverter.java (93%) rename archiva-converter/src/main/java/org/apache/maven/{repository => archiva}/converter/transaction/AbstractTransactionEvent.java (94%) rename archiva-converter/src/main/java/org/apache/maven/{repository => archiva}/converter/transaction/CopyFileEvent.java (96%) rename archiva-converter/src/main/java/org/apache/maven/{repository => archiva}/converter/transaction/CreateFileEvent.java (96%) rename archiva-converter/src/main/java/org/apache/maven/{repository => archiva}/converter/transaction/FileTransaction.java (94%) rename archiva-converter/src/main/java/org/apache/maven/{repository => archiva}/converter/transaction/TransactionEvent.java (95%) rename archiva-converter/src/main/resources/org/apache/maven/{repository => archiva}/converter/DefaultRepositoryConverter.properties (100%) rename archiva-converter/src/test/java/org/apache/maven/{repository => archiva}/converter/RepositoryConverterTest.java (99%) rename archiva-converter/src/test/java/org/apache/maven/{repository => archiva}/converter/transaction/CopyFileEventTest.java (94%) rename archiva-converter/src/test/java/org/apache/maven/{repository => archiva}/converter/transaction/CreateFileEventTest.java (93%) rename archiva-converter/src/test/resources/org/apache/maven/{repository => archiva}/converter/RepositoryConverterTest.xml (79%) rename archiva-core/src/main/java/org/apache/maven/{repository => archiva}/DefaultRepositoryManager.java (86%) rename archiva-core/src/main/java/org/apache/maven/{repository => archiva}/RepositoryManager.java (79%) rename archiva-core/src/main/java/org/apache/maven/{repository => archiva}/configuration/ConfiguredRepositoryFactory.java (95%) rename archiva-core/src/main/java/org/apache/maven/{repository => archiva}/configuration/DefaultConfiguredRepositoryFactory.java (94%) rename archiva-core/src/main/java/org/apache/maven/{repository => archiva}/proxy/DefaultProxyManager.java (92%) rename archiva-core/src/main/java/org/apache/maven/{repository => archiva}/proxy/ProxiedRepositoryGroup.java (96%) rename archiva-core/src/main/java/org/apache/maven/{repository => archiva}/proxy/ProxyManager.java (86%) rename archiva-core/src/main/java/org/apache/maven/{repository => archiva}/scheduler/DefaultRepositoryTaskScheduler.java (90%) rename archiva-core/src/main/java/org/apache/maven/{repository => archiva}/scheduler/IndexerTask.java (83%) rename archiva-core/src/main/java/org/apache/maven/{repository => archiva}/scheduler/RepositoryTask.java (95%) rename archiva-core/src/main/java/org/apache/maven/{repository => archiva}/scheduler/RepositoryTaskJob.java (93%) rename archiva-core/src/main/java/org/apache/maven/{repository => archiva}/scheduler/RepositoryTaskScheduler.java (95%) rename archiva-core/src/main/java/org/apache/maven/{repository => archiva}/scheduler/TaskExecutionException.java (95%) rename archiva-core/src/test/java/org/apache/maven/{repository => archiva}/RepositoryManagerTest.java (94%) rename archiva-discoverer/src/main/java/org/apache/maven/{repository => archiva}/discovery/AbstractArtifactDiscoverer.java (99%) rename archiva-discoverer/src/main/java/org/apache/maven/{repository => archiva}/discovery/AbstractDiscoverer.java (99%) rename archiva-discoverer/src/main/java/org/apache/maven/{repository => archiva}/discovery/ArtifactDiscoverer.java (98%) rename archiva-discoverer/src/main/java/org/apache/maven/{repository => archiva}/discovery/DefaultArtifactDiscoverer.java (96%) rename archiva-discoverer/src/main/java/org/apache/maven/{repository => archiva}/discovery/DefaultMetadataDiscoverer.java (98%) rename archiva-discoverer/src/main/java/org/apache/maven/{repository => archiva}/discovery/Discoverer.java (97%) rename archiva-discoverer/src/main/java/org/apache/maven/{repository => archiva}/discovery/DiscovererException.java (95%) rename archiva-discoverer/src/main/java/org/apache/maven/{repository => archiva}/discovery/DiscovererPath.java (96%) rename archiva-discoverer/src/main/java/org/apache/maven/{repository => archiva}/discovery/LegacyArtifactDiscoverer.java (95%) rename archiva-discoverer/src/main/java/org/apache/maven/{repository => archiva}/discovery/MetadataDiscoverer.java (96%) rename archiva-discoverer/src/test/java/org/apache/maven/{repository => archiva}/discovery/AbstractArtifactDiscovererTest.java (99%) rename archiva-discoverer/src/test/java/org/apache/maven/{repository => archiva}/discovery/DefaultArtifactDiscovererTest.java (99%) rename archiva-discoverer/src/test/java/org/apache/maven/{repository => archiva}/discovery/DefaultMetadataDiscovererTest.java (99%) rename archiva-discoverer/src/test/java/org/apache/maven/{repository => archiva}/discovery/LegacyArtifactDiscovererTest.java (99%) rename archiva-indexer/src/main/java/org/apache/maven/{repository => archiva}/indexing/RepositoryArtifactIndex.java (95%) rename archiva-indexer/src/main/java/org/apache/maven/{repository => archiva}/indexing/RepositoryArtifactIndexFactory.java (96%) rename archiva-indexer/src/main/java/org/apache/maven/{repository => archiva}/indexing/RepositoryIndexException.java (95%) rename archiva-indexer/src/main/java/org/apache/maven/{repository => archiva}/indexing/RepositoryIndexSearchException.java (94%) rename archiva-indexer/src/main/java/org/apache/maven/{repository => archiva}/indexing/lucene/LuceneIndexRecordConverter.java (91%) rename archiva-indexer/src/main/java/org/apache/maven/{repository => archiva}/indexing/lucene/LuceneMinimalIndexRecordConverter.java (91%) rename archiva-indexer/src/main/java/org/apache/maven/{repository => archiva}/indexing/lucene/LuceneQuery.java (90%) rename archiva-indexer/src/main/java/org/apache/maven/{repository => archiva}/indexing/lucene/LuceneRepositoryArtifactIndex.java (94%) rename archiva-indexer/src/main/java/org/apache/maven/{repository => archiva}/indexing/lucene/LuceneRepositoryArtifactIndexFactory.java (79%) rename archiva-indexer/src/main/java/org/apache/maven/{repository => archiva}/indexing/lucene/LuceneStandardIndexRecordConverter.java (96%) rename archiva-indexer/src/main/java/org/apache/maven/{repository => archiva}/indexing/query/CompoundQuery.java (98%) rename archiva-indexer/src/main/java/org/apache/maven/{repository => archiva}/indexing/query/CompoundQueryTerm.java (97%) rename archiva-indexer/src/main/java/org/apache/maven/{repository => archiva}/indexing/query/Query.java (93%) rename archiva-indexer/src/main/java/org/apache/maven/{repository => archiva}/indexing/query/QueryTerm.java (96%) rename archiva-indexer/src/main/java/org/apache/maven/{repository => archiva}/indexing/query/RangeQuery.java (94%) rename archiva-indexer/src/main/java/org/apache/maven/{repository => archiva}/indexing/query/SingleTermQuery.java (96%) rename archiva-indexer/src/main/java/org/apache/maven/{repository => archiva}/indexing/record/AbstractArtifactIndexRecordFactory.java (94%) rename archiva-indexer/src/main/java/org/apache/maven/{repository => archiva}/indexing/record/MinimalArtifactIndexRecord.java (98%) rename archiva-indexer/src/main/java/org/apache/maven/{repository => archiva}/indexing/record/MinimalArtifactIndexRecordFactory.java (92%) rename archiva-indexer/src/main/java/org/apache/maven/{repository => archiva}/indexing/record/MinimalIndexRecordFields.java (95%) rename archiva-indexer/src/main/java/org/apache/maven/{repository => archiva}/indexing/record/RepositoryIndexRecord.java (94%) rename archiva-indexer/src/main/java/org/apache/maven/{repository => archiva}/indexing/record/RepositoryIndexRecordFactory.java (91%) rename archiva-indexer/src/main/java/org/apache/maven/{repository => archiva}/indexing/record/StandardArtifactIndexRecord.java (99%) rename archiva-indexer/src/main/java/org/apache/maven/{repository => archiva}/indexing/record/StandardArtifactIndexRecordFactory.java (97%) rename archiva-indexer/src/main/java/org/apache/maven/{repository => archiva}/indexing/record/StandardIndexRecordFields.java (97%) rename archiva-indexer/src/test/java/org/apache/maven/{repository => archiva}/indexing/lucene/LuceneMinimalArtifactIndexSearchTest.java (95%) rename archiva-indexer/src/test/java/org/apache/maven/{repository => archiva}/indexing/lucene/LuceneMinimalArtifactIndexTest.java (94%) rename archiva-indexer/src/test/java/org/apache/maven/{repository => archiva}/indexing/lucene/LuceneStandardArtifactIndexSearchTest.java (97%) rename archiva-indexer/src/test/java/org/apache/maven/{repository => archiva}/indexing/lucene/LuceneStandardArtifactIndexTest.java (92%) rename archiva-indexer/src/test/java/org/apache/maven/{repository => archiva}/indexing/query/QueryTest.java (99%) rename archiva-indexer/src/test/java/org/apache/maven/{repository => archiva}/indexing/record/MinimalArtifactIndexRecordFactoryTest.java (97%) rename archiva-indexer/src/test/java/org/apache/maven/{repository => archiva}/indexing/record/StandardArtifactIndexRecordFactoryTest.java (92%) rename archiva-indexer/src/test/managed-repository/org/apache/maven/{repository => archiva}/record/parent-pom/1/parent-pom-1.pom (88%) create mode 100644 archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-archetype/1.0/test-archetype-1.0.jar rename archiva-indexer/src/test/managed-repository/org/apache/maven/{repository => archiva}/record/test-archetype/1.0/test-archetype-1.0.pom (62%) rename archiva-indexer/src/test/managed-repository/org/apache/maven/{repository => archiva}/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.jar (100%) rename archiva-indexer/src/test/managed-repository/org/apache/maven/{repository => archiva}/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.pom (86%) rename archiva-indexer/src/test/managed-repository/org/apache/maven/{repository => archiva}/record/test-corrupt-jar/1.0/test-corrupt-jar-1.0.jar (100%) rename archiva-indexer/src/test/managed-repository/org/apache/maven/{repository => archiva}/record/test-dll/1.0.1.34/test-dll-1.0.1.34.dll (100%) rename archiva-indexer/src/test/managed-repository/org/apache/maven/{repository => archiva}/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1-jdk14.jar (100%) rename archiva-indexer/src/test/managed-repository/org/apache/maven/{repository => archiva}/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.jar (100%) rename archiva-indexer/src/test/managed-repository/org/apache/maven/{repository => archiva}/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.pom (87%) rename archiva-indexer/src/test/managed-repository/org/apache/maven/{repository => archiva}/record/test-jar/1.0/test-jar-1.0-jdk14.jar (100%) rename archiva-indexer/src/test/managed-repository/org/apache/maven/{repository => archiva}/record/test-jar/1.0/test-jar-1.0.jar (100%) create mode 100644 archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-plugin/1.0/test-plugin-1.0.jar rename archiva-indexer/src/test/managed-repository/org/apache/maven/{repository => archiva}/record/test-plugin/1.0/test-plugin-1.0.pom (80%) rename archiva-indexer/src/test/managed-repository/org/apache/maven/{repository => archiva}/record/test-pom/1.0/test-pom-1.0.pom (70%) delete mode 100644 archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-archetype/1.0/test-archetype-1.0.jar delete mode 100644 archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-plugin/1.0/test-plugin-1.0.jar rename archiva-proxy/src/main/java/org/apache/maven/{repository => archiva}/proxy/DefaultProxyRequestHandler.java (98%) rename archiva-proxy/src/main/java/org/apache/maven/{repository => archiva}/proxy/ProxiedArtifactRepository.java (99%) rename archiva-proxy/src/main/java/org/apache/maven/{repository => archiva}/proxy/ProxyException.java (95%) rename archiva-proxy/src/main/java/org/apache/maven/{repository => archiva}/proxy/ProxyRequestHandler.java (99%) rename archiva-proxy/src/test/java/org/apache/maven/{repository => archiva}/proxy/ProxyRequestHandlerTest.java (99%) rename archiva-proxy/src/test/java/org/apache/maven/{repository => archiva}/proxy/WagonDelegate.java (99%) rename archiva-proxy/src/test/resources/org/apache/maven/{repository => archiva}/proxy/ProxyRequestHandlerTest.xml (92%) rename archiva-reports-standard/src/main/java/org/apache/maven/{repository => archiva}/reporting/AbstractRepositoryQueryLayer.java (98%) rename archiva-reports-standard/src/main/java/org/apache/maven/{repository => archiva}/reporting/ArtifactReportProcessor.java (96%) rename archiva-reports-standard/src/main/java/org/apache/maven/{repository => archiva}/reporting/ArtifactReporter.java (98%) rename archiva-reports-standard/src/main/java/org/apache/maven/{repository => archiva}/reporting/ArtifactResult.java (96%) rename archiva-reports-standard/src/main/java/org/apache/maven/{repository => archiva}/reporting/BadMetadataReportProcessor.java (98%) rename archiva-reports-standard/src/main/java/org/apache/maven/{repository => archiva}/reporting/Cache.java (99%) rename archiva-reports-standard/src/main/java/org/apache/maven/{repository => archiva}/reporting/CachedRepositoryQueryLayer.java (98%) rename archiva-reports-standard/src/main/java/org/apache/maven/{repository => archiva}/reporting/ChecksumArtifactReporter.java (92%) rename archiva-reports-standard/src/main/java/org/apache/maven/{repository => archiva}/reporting/ChecksumMetadataReporter.java (91%) rename archiva-reports-standard/src/main/java/org/apache/maven/{repository => archiva}/reporting/DefaultArtifactReportProcessor.java (97%) rename archiva-reports-standard/src/main/java/org/apache/maven/{repository => archiva}/reporting/DefaultArtifactReporter.java (95%) rename archiva-reports-standard/src/main/java/org/apache/maven/{repository => archiva}/reporting/DefaultRepositoryQueryLayer.java (95%) rename archiva-reports-standard/src/main/java/org/apache/maven/{repository => archiva}/reporting/DefaultRepositoryQueryLayerFactory.java (88%) rename archiva-reports-standard/src/main/java/org/apache/maven/{repository => archiva}/reporting/DuplicateArtifactFileReportProcessor.java (84%) rename archiva-reports-standard/src/main/java/org/apache/maven/{repository => archiva}/reporting/InvalidPomArtifactReportProcessor.java (95%) rename archiva-reports-standard/src/main/java/org/apache/maven/{repository => archiva}/reporting/LocationArtifactReportProcessor.java (97%) rename archiva-reports-standard/src/main/java/org/apache/maven/{repository => archiva}/reporting/MetadataReportProcessor.java (95%) rename archiva-reports-standard/src/main/java/org/apache/maven/{repository => archiva}/reporting/ReportProcessorException.java (95%) rename archiva-reports-standard/src/main/java/org/apache/maven/{repository => archiva}/reporting/RepositoryMetadataResult.java (96%) rename archiva-reports-standard/src/main/java/org/apache/maven/{repository => archiva}/reporting/RepositoryQueryLayer.java (87%) rename archiva-reports-standard/src/main/java/org/apache/maven/{repository => archiva}/reporting/RepositoryQueryLayerException.java (95%) rename archiva-reports-standard/src/main/java/org/apache/maven/{repository => archiva}/reporting/RepositoryQueryLayerFactory.java (96%) rename archiva-reports-standard/src/test/java/org/apache/maven/{repository => archiva}/reporting/AbstractChecksumArtifactReporterTestCase.java (98%) rename archiva-reports-standard/src/test/java/org/apache/maven/{repository => archiva}/reporting/AbstractRepositoryQueryLayerTestCase.java (99%) rename archiva-reports-standard/src/test/java/org/apache/maven/{repository => archiva}/reporting/AbstractRepositoryReportsTestCase.java (97%) rename archiva-reports-standard/src/test/java/org/apache/maven/{repository => archiva}/reporting/ArtifactReportProcessorTest.java (99%) rename archiva-reports-standard/src/test/java/org/apache/maven/{repository => archiva}/reporting/ArtifactReporterTest.java (99%) rename archiva-reports-standard/src/test/java/org/apache/maven/{repository => archiva}/reporting/BadMetadataReportProcessorTest.java (99%) rename archiva-reports-standard/src/test/java/org/apache/maven/{repository => archiva}/reporting/CacheTest.java (98%) rename archiva-reports-standard/src/test/java/org/apache/maven/{repository => archiva}/reporting/CachedRepositoryQueryLayerTest.java (97%) rename archiva-reports-standard/src/test/java/org/apache/maven/{repository => archiva}/reporting/ChecksumArtifactReporterTest.java (98%) rename archiva-reports-standard/src/test/java/org/apache/maven/{repository => archiva}/reporting/DefaultArtifactReporterTest.java (99%) rename archiva-reports-standard/src/test/java/org/apache/maven/{repository => archiva}/reporting/DuplicateArtifactFileReportProcessorTest.java (95%) rename archiva-reports-standard/src/test/java/org/apache/maven/{repository => archiva}/reporting/GenericMockObject.java (97%) rename archiva-reports-standard/src/test/java/org/apache/maven/{repository => archiva}/reporting/InvalidPomArtifactReportProcessorTest.java (98%) rename archiva-reports-standard/src/test/java/org/apache/maven/{repository => archiva}/reporting/LocationArtifactReportProcessorTest.java (99%) rename archiva-reports-standard/src/test/java/org/apache/maven/{repository => archiva}/reporting/MockArtifact.java (98%) rename archiva-reports-standard/src/test/java/org/apache/maven/{repository => archiva}/reporting/MockArtifactFactory.java (98%) rename archiva-reports-standard/src/test/java/org/apache/maven/{repository => archiva}/reporting/MockArtifactReportProcessor.java (98%) rename archiva-reports-standard/src/test/java/org/apache/maven/{repository => archiva}/reporting/MockArtifactReporter.java (98%) rename archiva-reports-standard/src/test/java/org/apache/maven/{repository => archiva}/reporting/MockRepositoryQueryLayer.java (97%) rename archiva-reports-standard/src/test/java/org/apache/maven/{repository => archiva}/reporting/ReportCondition.java (97%) rename archiva-reports-standard/src/test/resources/org/apache/maven/{repository => archiva}/reporting/DuplicateArtifactFileReportProcessorTest.xml (52%) rename archiva-utils/src/main/java/org/apache/maven/{repository => archiva}/digest/AbstractDigester.java (98%) rename archiva-utils/src/main/java/org/apache/maven/{repository => archiva}/digest/AbstractStreamingDigester.java (98%) rename archiva-utils/src/main/java/org/apache/maven/{repository => archiva}/digest/DigestUtils.java (97%) rename archiva-utils/src/main/java/org/apache/maven/{repository => archiva}/digest/Digester.java (95%) rename archiva-utils/src/main/java/org/apache/maven/{repository => archiva}/digest/DigesterException.java (95%) rename archiva-utils/src/main/java/org/apache/maven/{repository => archiva}/digest/Md5Digester.java (86%) rename archiva-utils/src/main/java/org/apache/maven/{repository => archiva}/digest/Sha1Digester.java (87%) rename archiva-utils/src/main/java/org/apache/maven/{repository => archiva}/digest/StreamingDigester.java (97%) rename archiva-utils/src/main/java/org/apache/maven/{repository => archiva}/digest/StreamingMd5Digester.java (87%) rename archiva-utils/src/main/java/org/apache/maven/{repository => archiva}/digest/StreamingSha1Digester.java (87%) rename archiva-utils/src/test/java/org/apache/maven/{repository => archiva}/digest/DigesterTest.java (99%) rename archiva-webapp/src/main/java/org/apache/maven/{repository => archiva}/manager/web/action/BrowseAction.java (91%) rename archiva-webapp/src/main/java/org/apache/maven/{repository => archiva}/manager/web/action/ProxyAction.java (93%) rename archiva-webapp/src/main/java/org/apache/maven/{repository => archiva}/manager/web/action/SearchAction.java (85%) rename archiva-webapp/src/main/java/org/apache/maven/{repository => archiva}/manager/web/action/ShowArtifactAction.java (91%) rename archiva-webapp/src/main/java/org/apache/maven/{repository => archiva}/manager/web/action/admin/AbstractConfigureRepositoryAction.java (88%) rename archiva-webapp/src/main/java/org/apache/maven/{repository => archiva}/manager/web/action/admin/AbstractDeleteRepositoryAction.java (84%) rename archiva-webapp/src/main/java/org/apache/maven/{repository => archiva}/manager/web/action/admin/ConfigureAction.java (81%) rename archiva-webapp/src/main/java/org/apache/maven/{repository => archiva}/manager/web/action/admin/ConfigureProxiedRepositoryAction.java (87%) rename archiva-webapp/src/main/java/org/apache/maven/{repository => archiva}/manager/web/action/admin/ConfigureRepositoryAction.java (90%) rename archiva-webapp/src/main/java/org/apache/maven/{repository => archiva}/manager/web/action/admin/ConfigureSyncedRepositoryAction.java (87%) rename archiva-webapp/src/main/java/org/apache/maven/{repository => archiva}/manager/web/action/admin/DeleteProxiedRepositoryAction.java (78%) rename archiva-webapp/src/main/java/org/apache/maven/{repository => archiva}/manager/web/action/admin/DeleteRepositoryAction.java (85%) rename archiva-webapp/src/main/java/org/apache/maven/{repository => archiva}/manager/web/action/admin/DeleteSyncedRepositoryAction.java (83%) rename archiva-webapp/src/main/java/org/apache/maven/{repository => archiva}/manager/web/action/admin/RunIndexerAction.java (84%) rename archiva-webapp/src/main/java/org/apache/maven/{repository => archiva}/manager/web/interceptor/ConfigurationInterceptor.java (92%) rename archiva-webapp/src/main/java/org/apache/maven/{repository => archiva}/manager/web/mapper/RepositoryActionMapper.java (98%) rename archiva-webapp/src/main/resources/org/apache/maven/{repository => archiva}/manager/web/action/SearchAction-checksumSearch-validation.xml (100%) rename archiva-webapp/src/main/resources/org/apache/maven/{repository => archiva}/manager/web/action/SearchAction-quickSearch-validation.xml (100%) rename archiva-webapp/src/main/resources/org/apache/maven/{repository => archiva}/manager/web/action/admin/ConfigureAction-validation.xml (100%) rename archiva-webapp/src/main/resources/org/apache/maven/{repository => archiva}/manager/web/action/admin/ConfigureProxiedRepositoryAction-validation.xml (100%) rename archiva-webapp/src/main/resources/org/apache/maven/{repository => archiva}/manager/web/action/admin/ConfigureRepositoryAction-validation.xml (100%) rename archiva-webapp/src/main/resources/org/apache/maven/{repository => archiva}/manager/web/action/admin/ConfigureSyncedRepositoryAction-addSelectedSyncedRepository-validation.xml (100%) rename archiva-webapp/src/main/resources/org/apache/maven/{repository => archiva}/manager/web/action/admin/ConfigureSyncedRepositoryAction-validation.xml (100%) delete mode 100644 archiva-webapp/src/main/webapp/WEB-INF/jsp/form.jspf rename archiva-webapp/src/test/java/org/apache/maven/{repository => archiva}/proxy/web/action/test/stub/HttpServletRequestStub.java (97%) rename archiva-webapp/src/test/java/org/apache/maven/{repository => archiva}/proxy/web/action/test/stub/ServletRequestStub.java (98%) diff --git a/archiva-applet/src/main/java/org/apache/maven/repository/applet/ChecksumApplet.java b/archiva-applet/src/main/java/org/apache/maven/archiva/applet/ChecksumApplet.java similarity index 98% rename from archiva-applet/src/main/java/org/apache/maven/repository/applet/ChecksumApplet.java rename to archiva-applet/src/main/java/org/apache/maven/archiva/applet/ChecksumApplet.java index 9b8697fd0..f84cb605d 100644 --- a/archiva-applet/src/main/java/org/apache/maven/repository/applet/ChecksumApplet.java +++ b/archiva-applet/src/main/java/org/apache/maven/archiva/applet/ChecksumApplet.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.applet; +package org.apache.maven.archiva.applet; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-configuration/pom.xml b/archiva-configuration/pom.xml index 25c939a50..6caa30b55 100644 --- a/archiva-configuration/pom.xml +++ b/archiva-configuration/pom.xml @@ -51,10 +51,10 @@ - org/apache/maven/repository/configuration/io/** - org/apache/maven/repository/configuration/*RepositoryConfiguration.* - org/apache/maven/repository/configuration/Configuration.* - org/apache/maven/repository/configuration/Proxy.* + org/apache/maven/archiva/configuration/io/** + org/apache/maven/archiva/configuration/*RepositoryConfiguration.* + org/apache/maven/archiva/configuration/Configuration.* + org/apache/maven/archiva/configuration/Proxy.* diff --git a/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationChangeException.java b/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationChangeException.java similarity index 94% rename from archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationChangeException.java rename to archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationChangeException.java index 547bff7a4..a4e90a88a 100644 --- a/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationChangeException.java +++ b/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationChangeException.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.configuration; +package org.apache.maven.archiva.configuration; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationChangeListener.java b/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationChangeListener.java similarity index 96% rename from archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationChangeListener.java rename to archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationChangeListener.java index ca01a493f..f5fce0192 100644 --- a/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationChangeListener.java +++ b/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationChangeListener.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.configuration; +package org.apache.maven.archiva.configuration; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationStore.java b/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationStore.java similarity index 97% rename from archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationStore.java rename to archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationStore.java index 968ce25d6..3b5dc477a 100644 --- a/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationStore.java +++ b/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationStore.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.configuration; +package org.apache.maven.archiva.configuration; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationStoreException.java b/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationStoreException.java similarity index 95% rename from archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationStoreException.java rename to archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationStoreException.java index 04dd8990b..bb56dcd3f 100644 --- a/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationStoreException.java +++ b/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationStoreException.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.configuration; +package org.apache.maven.archiva.configuration; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/DefaultConfigurationStore.java b/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultConfigurationStore.java similarity index 94% rename from archiva-configuration/src/main/java/org/apache/maven/repository/configuration/DefaultConfigurationStore.java rename to archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultConfigurationStore.java index ad771cba7..0279c685c 100644 --- a/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/DefaultConfigurationStore.java +++ b/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultConfigurationStore.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.configuration; +package org.apache.maven.archiva.configuration; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -16,8 +16,8 @@ package org.apache.maven.repository.configuration; * limitations under the License. */ -import org.apache.maven.repository.configuration.io.xpp3.ConfigurationXpp3Reader; -import org.apache.maven.repository.configuration.io.xpp3.ConfigurationXpp3Writer; +import org.apache.maven.archiva.configuration.io.xpp3.ConfigurationXpp3Reader; +import org.apache.maven.archiva.configuration.io.xpp3.ConfigurationXpp3Writer; import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; @@ -69,7 +69,7 @@ public class DefaultConfigurationStore if ( file == null ) { - file = new File( System.getProperty( "user.home" ), "/.m2/repository-manager.xml" ); + file = new File( System.getProperty( "user.home" ), "/.m2/archiva-manager.xml" ); } FileReader fileReader; diff --git a/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/InvalidConfigurationException.java b/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/InvalidConfigurationException.java similarity index 95% rename from archiva-configuration/src/main/java/org/apache/maven/repository/configuration/InvalidConfigurationException.java rename to archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/InvalidConfigurationException.java index 05006df96..dfb53ef21 100644 --- a/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/InvalidConfigurationException.java +++ b/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/InvalidConfigurationException.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.configuration; +package org.apache.maven.archiva.configuration; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/MavenProxyPropertyLoader.java b/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java similarity index 99% rename from archiva-configuration/src/main/java/org/apache/maven/repository/configuration/MavenProxyPropertyLoader.java rename to archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java index 814cec7b1..c8dfd2993 100644 --- a/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/MavenProxyPropertyLoader.java +++ b/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.configuration; +package org.apache.maven.archiva.configuration; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-configuration/src/main/mdo/configuration.mdo b/archiva-configuration/src/main/mdo/configuration.mdo index a2f772800..eabc96a60 100644 --- a/archiva-configuration/src/main/mdo/configuration.mdo +++ b/archiva-configuration/src/main/mdo/configuration.mdo @@ -7,7 +7,7 @@ package - org.apache.maven.repository.configuration + org.apache.maven.archiva.configuration diff --git a/archiva-configuration/src/main/resources/org/apache/maven/repository/configuration/SyncedRepositoryConfiguration-conversion.properties b/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/SyncedRepositoryConfiguration-conversion.properties similarity index 100% rename from archiva-configuration/src/main/resources/org/apache/maven/repository/configuration/SyncedRepositoryConfiguration-conversion.properties rename to archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/SyncedRepositoryConfiguration-conversion.properties diff --git a/archiva-configuration/src/test/java/org/apache/maven/repository/configuration/ConfigurationStoreTest.java b/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ConfigurationStoreTest.java similarity index 99% rename from archiva-configuration/src/test/java/org/apache/maven/repository/configuration/ConfigurationStoreTest.java rename to archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ConfigurationStoreTest.java index 34d350a68..f4f90c0a3 100644 --- a/archiva-configuration/src/test/java/org/apache/maven/repository/configuration/ConfigurationStoreTest.java +++ b/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ConfigurationStoreTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.configuration; +package org.apache.maven.archiva.configuration; import org.codehaus.plexus.PlexusTestCase; import org.easymock.MockControl; diff --git a/archiva-configuration/src/test/java/org/apache/maven/repository/configuration/MavenProxyPropertyLoaderTest.java b/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java similarity index 98% rename from archiva-configuration/src/test/java/org/apache/maven/repository/configuration/MavenProxyPropertyLoaderTest.java rename to archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java index de8fb8d01..6cfbe4a90 100644 --- a/archiva-configuration/src/test/java/org/apache/maven/repository/configuration/MavenProxyPropertyLoaderTest.java +++ b/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.configuration; +package org.apache.maven.archiva.configuration; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-configuration/src/test/resources/org/apache/maven/repository/configuration/ConfigurationStoreTest.xml b/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ConfigurationStoreTest.xml similarity index 65% rename from archiva-configuration/src/test/resources/org/apache/maven/repository/configuration/ConfigurationStoreTest.xml rename to archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ConfigurationStoreTest.xml index 39a15a996..64a1849a3 100644 --- a/archiva-configuration/src/test/resources/org/apache/maven/repository/configuration/ConfigurationStoreTest.xml +++ b/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ConfigurationStoreTest.xml @@ -17,33 +17,33 @@ - org.apache.maven.repository.configuration.ConfigurationStore + org.apache.maven.archiva.configuration.ConfigurationStore default - org.apache.maven.repository.configuration.DefaultConfigurationStore + org.apache.maven.archiva.configuration.DefaultConfigurationStore ${basedir}/src/test/conf/repository-manager.xml - org.apache.maven.repository.configuration.ConfigurationStore + org.apache.maven.archiva.configuration.ConfigurationStore corrupt-file - org.apache.maven.repository.configuration.DefaultConfigurationStore + org.apache.maven.archiva.configuration.DefaultConfigurationStore ${basedir}/src/test/conf/corrupt.xml - org.apache.maven.repository.configuration.ConfigurationStore + org.apache.maven.archiva.configuration.ConfigurationStore invalid-file - org.apache.maven.repository.configuration.DefaultConfigurationStore + org.apache.maven.archiva.configuration.DefaultConfigurationStore ${basedir}/src/test/conf/nada.txt - org.apache.maven.repository.configuration.ConfigurationStore + org.apache.maven.archiva.configuration.ConfigurationStore save-file - org.apache.maven.repository.configuration.DefaultConfigurationStore + org.apache.maven.archiva.configuration.DefaultConfigurationStore ${basedir}/target/test/test-file.xml diff --git a/archiva-converter/src/main/java/org/apache/maven/repository/converter/DefaultRepositoryConverter.java b/archiva-converter/src/main/java/org/apache/maven/archiva/converter/DefaultRepositoryConverter.java similarity index 98% rename from archiva-converter/src/main/java/org/apache/maven/repository/converter/DefaultRepositoryConverter.java rename to archiva-converter/src/main/java/org/apache/maven/archiva/converter/DefaultRepositoryConverter.java index 86078ef6b..747767f93 100644 --- a/archiva-converter/src/main/java/org/apache/maven/repository/converter/DefaultRepositoryConverter.java +++ b/archiva-converter/src/main/java/org/apache/maven/archiva/converter/DefaultRepositoryConverter.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.converter; +package org.apache.maven.archiva.converter; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -16,6 +16,10 @@ package org.apache.maven.repository.converter; * limitations under the License. */ +import org.apache.maven.archiva.converter.transaction.FileTransaction; +import org.apache.maven.archiva.digest.Digester; +import org.apache.maven.archiva.digest.DigesterException; +import org.apache.maven.archiva.reporting.ArtifactReporter; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.repository.ArtifactRepository; @@ -35,10 +39,6 @@ import org.apache.maven.model.converter.ModelConverter; import org.apache.maven.model.converter.PomTranslationException; import org.apache.maven.model.io.xpp3.MavenXpp3Writer; import org.apache.maven.model.v3_0_0.io.xpp3.MavenXpp3Reader; -import org.apache.maven.repository.converter.transaction.FileTransaction; -import org.apache.maven.repository.digest.Digester; -import org.apache.maven.repository.digest.DigesterException; -import org.apache.maven.repository.reporting.ArtifactReporter; import org.codehaus.plexus.i18n.I18N; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.IOUtil; @@ -60,7 +60,7 @@ import java.util.regex.Matcher; * Implementation of repository conversion class. * * @author Brett Porter - * @plexus.component role="org.apache.maven.repository.converter.RepositoryConverter" role-hint="default" + * @plexus.component role="org.apache.maven.archiva.converter.RepositoryConverter" role-hint="default" */ public class DefaultRepositoryConverter implements RepositoryConverter diff --git a/archiva-converter/src/main/java/org/apache/maven/repository/converter/RepositoryConversionException.java b/archiva-converter/src/main/java/org/apache/maven/archiva/converter/RepositoryConversionException.java similarity index 95% rename from archiva-converter/src/main/java/org/apache/maven/repository/converter/RepositoryConversionException.java rename to archiva-converter/src/main/java/org/apache/maven/archiva/converter/RepositoryConversionException.java index 2409235bb..c8f655c43 100644 --- a/archiva-converter/src/main/java/org/apache/maven/repository/converter/RepositoryConversionException.java +++ b/archiva-converter/src/main/java/org/apache/maven/archiva/converter/RepositoryConversionException.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.converter; +package org.apache.maven.archiva.converter; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-converter/src/main/java/org/apache/maven/repository/converter/RepositoryConverter.java b/archiva-converter/src/main/java/org/apache/maven/archiva/converter/RepositoryConverter.java similarity index 93% rename from archiva-converter/src/main/java/org/apache/maven/repository/converter/RepositoryConverter.java rename to archiva-converter/src/main/java/org/apache/maven/archiva/converter/RepositoryConverter.java index cf6e1b151..be3de802a 100644 --- a/archiva-converter/src/main/java/org/apache/maven/repository/converter/RepositoryConverter.java +++ b/archiva-converter/src/main/java/org/apache/maven/archiva/converter/RepositoryConverter.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.converter; +package org.apache.maven.archiva.converter; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -16,12 +16,11 @@ package org.apache.maven.repository.converter; * limitations under the License. */ +import org.apache.maven.archiva.reporting.ArtifactReporter; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.repository.reporting.ArtifactReporter; import java.util.List; -import java.io.File; /** * Copy a set of artifacts from one repository to the other, converting if necessary. diff --git a/archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/AbstractTransactionEvent.java b/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/AbstractTransactionEvent.java similarity index 94% rename from archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/AbstractTransactionEvent.java rename to archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/AbstractTransactionEvent.java index 521930a28..540cde6a2 100644 --- a/archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/AbstractTransactionEvent.java +++ b/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/AbstractTransactionEvent.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.converter.transaction; +package org.apache.maven.archiva.converter.transaction; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -20,9 +20,9 @@ import org.codehaus.plexus.util.FileUtils; import java.io.File; import java.io.IOException; +import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.ArrayList; /** * Abstract class for the TransactionEvents @@ -48,7 +48,7 @@ public abstract class AbstractTransactionEvent List createDirs = new ArrayList(); File parent = dir; - while( !parent.exists() || !parent.isDirectory() ) + while ( !parent.exists() || !parent.isDirectory() ) { createDirs.add( parent ); @@ -79,7 +79,7 @@ public abstract class AbstractTransactionEvent { Collections.reverse( createdDirs ); - while( !createdDirs.isEmpty() ) + while ( !createdDirs.isEmpty() ) { File dir = (File) createdDirs.remove( 0 ); diff --git a/archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/CopyFileEvent.java b/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CopyFileEvent.java similarity index 96% rename from archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/CopyFileEvent.java rename to archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CopyFileEvent.java index cddc854cc..8b4c8a45a 100644 --- a/archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/CopyFileEvent.java +++ b/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CopyFileEvent.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.converter.transaction; +package org.apache.maven.archiva.converter.transaction; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/CreateFileEvent.java b/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CreateFileEvent.java similarity index 96% rename from archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/CreateFileEvent.java rename to archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CreateFileEvent.java index 283ee60fd..d9e7325b5 100644 --- a/archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/CreateFileEvent.java +++ b/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CreateFileEvent.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.converter.transaction; +package org.apache.maven.archiva.converter.transaction; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/FileTransaction.java b/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/FileTransaction.java similarity index 94% rename from archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/FileTransaction.java rename to archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/FileTransaction.java index ceb368660..b391c57ec 100644 --- a/archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/FileTransaction.java +++ b/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/FileTransaction.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.converter.transaction; +package org.apache.maven.archiva.converter.transaction; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -16,7 +16,7 @@ package org.apache.maven.repository.converter.transaction; * limitations under the License. */ -import org.apache.maven.repository.converter.RepositoryConversionException; +import org.apache.maven.archiva.converter.RepositoryConversionException; import java.io.File; import java.io.IOException; diff --git a/archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/TransactionEvent.java b/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/TransactionEvent.java similarity index 95% rename from archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/TransactionEvent.java rename to archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/TransactionEvent.java index 2f8a528e4..6b87e3075 100644 --- a/archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/TransactionEvent.java +++ b/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/TransactionEvent.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.converter.transaction; +package org.apache.maven.archiva.converter.transaction; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-converter/src/main/resources/org/apache/maven/repository/converter/DefaultRepositoryConverter.properties b/archiva-converter/src/main/resources/org/apache/maven/archiva/converter/DefaultRepositoryConverter.properties similarity index 100% rename from archiva-converter/src/main/resources/org/apache/maven/repository/converter/DefaultRepositoryConverter.properties rename to archiva-converter/src/main/resources/org/apache/maven/archiva/converter/DefaultRepositoryConverter.properties diff --git a/archiva-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java b/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java similarity index 99% rename from archiva-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java rename to archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java index d7b83cf7e..a1fdd0f69 100644 --- a/archiva-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java +++ b/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.converter; +package org.apache.maven.archiva.converter; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -16,6 +16,9 @@ package org.apache.maven.repository.converter; * limitations under the License. */ +import org.apache.maven.archiva.reporting.ArtifactReporter; +import org.apache.maven.archiva.reporting.ArtifactResult; +import org.apache.maven.archiva.reporting.DefaultArtifactReporter; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.metadata.ArtifactMetadata; @@ -24,9 +27,6 @@ import org.apache.maven.artifact.repository.ArtifactRepositoryFactory; import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata; import org.apache.maven.artifact.repository.metadata.SnapshotArtifactRepositoryMetadata; -import org.apache.maven.repository.reporting.ArtifactReporter; -import org.apache.maven.repository.reporting.ArtifactResult; -import org.apache.maven.repository.reporting.DefaultArtifactReporter; import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.i18n.I18N; import org.codehaus.plexus.util.FileUtils; diff --git a/archiva-converter/src/test/java/org/apache/maven/repository/converter/transaction/CopyFileEventTest.java b/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CopyFileEventTest.java similarity index 94% rename from archiva-converter/src/test/java/org/apache/maven/repository/converter/transaction/CopyFileEventTest.java rename to archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CopyFileEventTest.java index 627c32cde..7b81fd269 100644 --- a/archiva-converter/src/test/java/org/apache/maven/repository/converter/transaction/CopyFileEventTest.java +++ b/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CopyFileEventTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.converter.transaction; +package org.apache.maven.archiva.converter.transaction; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -132,7 +132,7 @@ public class CopyFileEventTest { super.tearDown(); - FileUtils.deleteDirectory( new File( PlexusTestCase.getBasedir(), - "target/transaction-tests" ).getAbsolutePath() ); + FileUtils.deleteDirectory( + new File( PlexusTestCase.getBasedir(), "target/transaction-tests" ).getAbsolutePath() ); } } diff --git a/archiva-converter/src/test/java/org/apache/maven/repository/converter/transaction/CreateFileEventTest.java b/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CreateFileEventTest.java similarity index 93% rename from archiva-converter/src/test/java/org/apache/maven/repository/converter/transaction/CreateFileEventTest.java rename to archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CreateFileEventTest.java index 2018e89a2..3436383d0 100644 --- a/archiva-converter/src/test/java/org/apache/maven/repository/converter/transaction/CreateFileEventTest.java +++ b/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CreateFileEventTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.converter.transaction; +package org.apache.maven.archiva.converter.transaction; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -102,7 +102,7 @@ public class CreateFileEventTest { super.tearDown(); - FileUtils.deleteDirectory( new File( PlexusTestCase.getBasedir(), - "target/transaction-tests" ).getAbsolutePath() ); + FileUtils.deleteDirectory( + new File( PlexusTestCase.getBasedir(), "target/transaction-tests" ).getAbsolutePath() ); } } diff --git a/archiva-converter/src/test/resources/org/apache/maven/repository/converter/RepositoryConverterTest.xml b/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml similarity index 79% rename from archiva-converter/src/test/resources/org/apache/maven/repository/converter/RepositoryConverterTest.xml rename to archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml index f2caaffca..00b1a09ef 100644 --- a/archiva-converter/src/test/resources/org/apache/maven/repository/converter/RepositoryConverterTest.xml +++ b/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml @@ -17,20 +17,20 @@ - org.apache.maven.repository.converter.RepositoryConverter - org.apache.maven.repository.converter.DefaultRepositoryConverter + org.apache.maven.archiva.converter.RepositoryConverter + org.apache.maven.archiva.converter.DefaultRepositoryConverter force-repository-converter true - org.apache.maven.repository.digest.Digester + org.apache.maven.archiva.digest.Digester sha1 sha1Digester - org.apache.maven.repository.digest.Digester + org.apache.maven.archiva.digest.Digester md5 md5Digester @@ -49,20 +49,20 @@ - org.apache.maven.repository.converter.RepositoryConverter - org.apache.maven.repository.converter.DefaultRepositoryConverter + org.apache.maven.archiva.converter.RepositoryConverter + org.apache.maven.archiva.converter.DefaultRepositoryConverter dryrun-repository-converter true - org.apache.maven.repository.digest.Digester + org.apache.maven.archiva.digest.Digester sha1 sha1Digester - org.apache.maven.repository.digest.Digester + org.apache.maven.archiva.digest.Digester md5 md5Digester diff --git a/archiva-core/src/main/java/org/apache/maven/repository/DefaultRepositoryManager.java b/archiva-core/src/main/java/org/apache/maven/archiva/DefaultRepositoryManager.java similarity index 86% rename from archiva-core/src/main/java/org/apache/maven/repository/DefaultRepositoryManager.java rename to archiva-core/src/main/java/org/apache/maven/archiva/DefaultRepositoryManager.java index e753c0d3f..2e789c758 100644 --- a/archiva-core/src/main/java/org/apache/maven/repository/DefaultRepositoryManager.java +++ b/archiva-core/src/main/java/org/apache/maven/archiva/DefaultRepositoryManager.java @@ -1,13 +1,13 @@ -package org.apache.maven.repository; +package org.apache.maven.archiva; +import org.apache.maven.archiva.converter.RepositoryConversionException; +import org.apache.maven.archiva.converter.RepositoryConverter; +import org.apache.maven.archiva.discovery.ArtifactDiscoverer; +import org.apache.maven.archiva.discovery.DiscovererException; +import org.apache.maven.archiva.reporting.ArtifactReporter; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepositoryFactory; import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; -import org.apache.maven.repository.converter.RepositoryConversionException; -import org.apache.maven.repository.converter.RepositoryConverter; -import org.apache.maven.repository.discovery.ArtifactDiscoverer; -import org.apache.maven.repository.discovery.DiscovererException; -import org.apache.maven.repository.reporting.ArtifactReporter; import java.io.File; import java.net.MalformedURLException; diff --git a/archiva-core/src/main/java/org/apache/maven/repository/RepositoryManager.java b/archiva-core/src/main/java/org/apache/maven/archiva/RepositoryManager.java similarity index 79% rename from archiva-core/src/main/java/org/apache/maven/repository/RepositoryManager.java rename to archiva-core/src/main/java/org/apache/maven/archiva/RepositoryManager.java index 40d176e83..52f88bf5c 100644 --- a/archiva-core/src/main/java/org/apache/maven/repository/RepositoryManager.java +++ b/archiva-core/src/main/java/org/apache/maven/archiva/RepositoryManager.java @@ -1,7 +1,7 @@ -package org.apache.maven.repository; +package org.apache.maven.archiva; -import org.apache.maven.repository.converter.RepositoryConversionException; -import org.apache.maven.repository.discovery.DiscovererException; +import org.apache.maven.archiva.converter.RepositoryConversionException; +import org.apache.maven.archiva.discovery.DiscovererException; import java.io.File; diff --git a/archiva-core/src/main/java/org/apache/maven/repository/configuration/ConfiguredRepositoryFactory.java b/archiva-core/src/main/java/org/apache/maven/archiva/configuration/ConfiguredRepositoryFactory.java similarity index 95% rename from archiva-core/src/main/java/org/apache/maven/repository/configuration/ConfiguredRepositoryFactory.java rename to archiva-core/src/main/java/org/apache/maven/archiva/configuration/ConfiguredRepositoryFactory.java index 568e436da..683d62a39 100644 --- a/archiva-core/src/main/java/org/apache/maven/repository/configuration/ConfiguredRepositoryFactory.java +++ b/archiva-core/src/main/java/org/apache/maven/archiva/configuration/ConfiguredRepositoryFactory.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.configuration; +package org.apache.maven.archiva.configuration; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -16,8 +16,8 @@ package org.apache.maven.repository.configuration; * limitations under the License. */ +import org.apache.maven.archiva.proxy.ProxiedArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.repository.proxy.ProxiedArtifactRepository; import java.util.List; diff --git a/archiva-core/src/main/java/org/apache/maven/repository/configuration/DefaultConfiguredRepositoryFactory.java b/archiva-core/src/main/java/org/apache/maven/archiva/configuration/DefaultConfiguredRepositoryFactory.java similarity index 94% rename from archiva-core/src/main/java/org/apache/maven/repository/configuration/DefaultConfiguredRepositoryFactory.java rename to archiva-core/src/main/java/org/apache/maven/archiva/configuration/DefaultConfiguredRepositoryFactory.java index 290a52301..6485c52b6 100644 --- a/archiva-core/src/main/java/org/apache/maven/repository/configuration/DefaultConfiguredRepositoryFactory.java +++ b/archiva-core/src/main/java/org/apache/maven/archiva/configuration/DefaultConfiguredRepositoryFactory.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.configuration; +package org.apache.maven.archiva.configuration; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -16,11 +16,11 @@ package org.apache.maven.repository.configuration; * limitations under the License. */ +import org.apache.maven.archiva.proxy.ProxiedArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepositoryFactory; import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy; import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; -import org.apache.maven.repository.proxy.ProxiedArtifactRepository; import java.io.File; import java.util.ArrayList; @@ -32,13 +32,13 @@ import java.util.Map; * Create artifact repositories from a configuration. * * @author Brett Porter - * @plexus.component role="org.apache.maven.repository.configuration.ConfiguredRepositoryFactory" + * @plexus.component role="org.apache.maven.archiva.configuration.ConfiguredRepositoryFactory" */ public class DefaultConfiguredRepositoryFactory implements ConfiguredRepositoryFactory { /** - * @plexus.requirement role="org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout" + * @plexus.requirement role="org.apache.maven.artifact.archiva.layout.ArtifactRepositoryLayout" */ private Map repositoryLayouts; diff --git a/archiva-core/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java b/archiva-core/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyManager.java similarity index 92% rename from archiva-core/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java rename to archiva-core/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyManager.java index 5389fe5c7..fa95db5fa 100644 --- a/archiva-core/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java +++ b/archiva-core/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyManager.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.proxy; +package org.apache.maven.archiva.proxy; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -16,14 +16,14 @@ package org.apache.maven.repository.proxy; * limitations under the License. */ +import org.apache.maven.archiva.configuration.Configuration; +import org.apache.maven.archiva.configuration.ConfigurationStore; +import org.apache.maven.archiva.configuration.ConfigurationStoreException; +import org.apache.maven.archiva.configuration.ConfiguredRepositoryFactory; +import org.apache.maven.archiva.configuration.ProxiedRepositoryConfiguration; +import org.apache.maven.archiva.configuration.Proxy; +import org.apache.maven.archiva.configuration.RepositoryConfiguration; import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.repository.configuration.Configuration; -import org.apache.maven.repository.configuration.ConfigurationStore; -import org.apache.maven.repository.configuration.ConfigurationStoreException; -import org.apache.maven.repository.configuration.ConfiguredRepositoryFactory; -import org.apache.maven.repository.configuration.ProxiedRepositoryConfiguration; -import org.apache.maven.repository.configuration.Proxy; -import org.apache.maven.repository.configuration.RepositoryConfiguration; import org.apache.maven.wagon.ResourceDoesNotExistException; import org.apache.maven.wagon.proxy.ProxyInfo; import org.codehaus.plexus.util.StringUtils; @@ -52,7 +52,7 @@ public class DefaultProxyManager private ConfigurationStore configurationStore; /** - * @plexus.requirement role="org.apache.maven.repository.proxy.ProxyRequestHandler" + * @plexus.requirement role="org.apache.maven.archiva.proxy.ProxyRequestHandler" * @todo seems to be a bug in qdox that the role above is required */ private ProxyRequestHandler requestHandler; diff --git a/archiva-core/src/main/java/org/apache/maven/repository/proxy/ProxiedRepositoryGroup.java b/archiva-core/src/main/java/org/apache/maven/archiva/proxy/ProxiedRepositoryGroup.java similarity index 96% rename from archiva-core/src/main/java/org/apache/maven/repository/proxy/ProxiedRepositoryGroup.java rename to archiva-core/src/main/java/org/apache/maven/archiva/proxy/ProxiedRepositoryGroup.java index 326646c6f..46373ffb5 100644 --- a/archiva-core/src/main/java/org/apache/maven/repository/proxy/ProxiedRepositoryGroup.java +++ b/archiva-core/src/main/java/org/apache/maven/archiva/proxy/ProxiedRepositoryGroup.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.proxy; +package org.apache.maven.archiva.proxy; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -19,9 +19,7 @@ package org.apache.maven.repository.proxy; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.wagon.proxy.ProxyInfo; -import java.util.HashSet; import java.util.List; -import java.util.Set; /** * A set of information to store for a group of proxies. diff --git a/archiva-core/src/main/java/org/apache/maven/repository/proxy/ProxyManager.java b/archiva-core/src/main/java/org/apache/maven/archiva/proxy/ProxyManager.java similarity index 86% rename from archiva-core/src/main/java/org/apache/maven/repository/proxy/ProxyManager.java rename to archiva-core/src/main/java/org/apache/maven/archiva/proxy/ProxyManager.java index 7973013a2..fe30225d9 100644 --- a/archiva-core/src/main/java/org/apache/maven/repository/proxy/ProxyManager.java +++ b/archiva-core/src/main/java/org/apache/maven/archiva/proxy/ProxyManager.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.proxy; +package org.apache.maven.archiva.proxy; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -28,7 +28,9 @@ import java.io.File; */ public interface ProxyManager { - /** The Plexus role for the component. */ + /** + * The Plexus role for the component. + */ String ROLE = ProxyManager.class.getName(); /** @@ -36,9 +38,10 @@ public interface ProxyManager * * @param path the expected repository path * @return File object referencing the requested path in the cache - * @throws ProxyException when an exception occurred during the retrieval of the requested path - * @throws org.apache.maven.wagon.ResourceDoesNotExistException when the requested object can't be found in any of the - * configured repositories + * @throws ProxyException when an exception occurred during the retrieval of the requested path + * @throws org.apache.maven.wagon.ResourceDoesNotExistException + * when the requested object can't be found in any of the + * configured repositories */ File get( String path ) throws ProxyException, ResourceDoesNotExistException; diff --git a/archiva-core/src/main/java/org/apache/maven/repository/scheduler/DefaultRepositoryTaskScheduler.java b/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/DefaultRepositoryTaskScheduler.java similarity index 90% rename from archiva-core/src/main/java/org/apache/maven/repository/scheduler/DefaultRepositoryTaskScheduler.java rename to archiva-core/src/main/java/org/apache/maven/archiva/scheduler/DefaultRepositoryTaskScheduler.java index 4e145b890..ac709a8c8 100644 --- a/archiva-core/src/main/java/org/apache/maven/repository/scheduler/DefaultRepositoryTaskScheduler.java +++ b/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/DefaultRepositoryTaskScheduler.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.scheduler; +package org.apache.maven.archiva.scheduler; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -16,12 +16,12 @@ package org.apache.maven.repository.scheduler; * limitations under the License. */ -import org.apache.maven.repository.configuration.Configuration; -import org.apache.maven.repository.configuration.ConfigurationChangeException; -import org.apache.maven.repository.configuration.ConfigurationChangeListener; -import org.apache.maven.repository.configuration.ConfigurationStore; -import org.apache.maven.repository.configuration.ConfigurationStoreException; -import org.apache.maven.repository.configuration.InvalidConfigurationException; +import org.apache.maven.archiva.configuration.Configuration; +import org.apache.maven.archiva.configuration.ConfigurationChangeException; +import org.apache.maven.archiva.configuration.ConfigurationChangeListener; +import org.apache.maven.archiva.configuration.ConfigurationStore; +import org.apache.maven.archiva.configuration.ConfigurationStoreException; +import org.apache.maven.archiva.configuration.InvalidConfigurationException; import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.personality.plexus.lifecycle.phase.Startable; import org.codehaus.plexus.personality.plexus.lifecycle.phase.StartingException; @@ -40,7 +40,7 @@ import java.text.ParseException; * * @author Brett Porter * @todo should we use plexus-taskqueue instead of or in addition to this? - * @plexus.component role="org.apache.maven.repository.scheduler.RepositoryTaskScheduler" + * @plexus.component role="org.apache.maven.archiva.scheduler.RepositoryTaskScheduler" */ public class DefaultRepositoryTaskScheduler extends AbstractLogEnabled diff --git a/archiva-core/src/main/java/org/apache/maven/repository/scheduler/IndexerTask.java b/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/IndexerTask.java similarity index 83% rename from archiva-core/src/main/java/org/apache/maven/repository/scheduler/IndexerTask.java rename to archiva-core/src/main/java/org/apache/maven/archiva/scheduler/IndexerTask.java index 38b43a0ac..a23f69f42 100644 --- a/archiva-core/src/main/java/org/apache/maven/repository/scheduler/IndexerTask.java +++ b/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/IndexerTask.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.scheduler; +package org.apache.maven.archiva.scheduler; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -16,19 +16,19 @@ package org.apache.maven.repository.scheduler; * limitations under the License. */ +import org.apache.maven.archiva.configuration.Configuration; +import org.apache.maven.archiva.configuration.ConfigurationStore; +import org.apache.maven.archiva.configuration.ConfigurationStoreException; +import org.apache.maven.archiva.configuration.ConfiguredRepositoryFactory; +import org.apache.maven.archiva.configuration.RepositoryConfiguration; +import org.apache.maven.archiva.discovery.ArtifactDiscoverer; +import org.apache.maven.archiva.discovery.DiscovererException; +import org.apache.maven.archiva.indexing.RepositoryArtifactIndex; +import org.apache.maven.archiva.indexing.RepositoryArtifactIndexFactory; +import org.apache.maven.archiva.indexing.RepositoryIndexException; +import org.apache.maven.archiva.indexing.record.RepositoryIndexRecordFactory; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.repository.configuration.Configuration; -import org.apache.maven.repository.configuration.ConfigurationStore; -import org.apache.maven.repository.configuration.ConfigurationStoreException; -import org.apache.maven.repository.configuration.ConfiguredRepositoryFactory; -import org.apache.maven.repository.configuration.RepositoryConfiguration; -import org.apache.maven.repository.discovery.ArtifactDiscoverer; -import org.apache.maven.repository.discovery.DiscovererException; -import org.apache.maven.repository.indexing.RepositoryArtifactIndex; -import org.apache.maven.repository.indexing.RepositoryArtifactIndexFactory; -import org.apache.maven.repository.indexing.RepositoryIndexException; -import org.apache.maven.repository.indexing.record.RepositoryIndexRecordFactory; import org.codehaus.plexus.logging.AbstractLogEnabled; import java.io.File; @@ -41,7 +41,7 @@ import java.util.Map; * Task for discovering changes in the repository. * * @author Brett Porter - * @plexus.component role="org.apache.maven.repository.scheduler.RepositoryTask" role-hint="indexer" + * @plexus.component role="org.apache.maven.archiva.scheduler.RepositoryTask" role-hint="indexer" */ public class IndexerTask extends AbstractLogEnabled @@ -65,7 +65,7 @@ public class IndexerTask private ConfiguredRepositoryFactory repoFactory; /** - * @plexus.requirement role="org.apache.maven.repository.discovery.ArtifactDiscoverer" + * @plexus.requirement role="org.apache.maven.archiva.discovery.ArtifactDiscoverer" */ private Map artifactDiscoverers; diff --git a/archiva-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTask.java b/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/RepositoryTask.java similarity index 95% rename from archiva-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTask.java rename to archiva-core/src/main/java/org/apache/maven/archiva/scheduler/RepositoryTask.java index 92b6f93cd..bcff08153 100644 --- a/archiva-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTask.java +++ b/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/RepositoryTask.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.scheduler; +package org.apache.maven.archiva.scheduler; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTaskJob.java b/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/RepositoryTaskJob.java similarity index 93% rename from archiva-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTaskJob.java rename to archiva-core/src/main/java/org/apache/maven/archiva/scheduler/RepositoryTaskJob.java index 874f6bcf2..cf6bab31f 100644 --- a/archiva-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTaskJob.java +++ b/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/RepositoryTaskJob.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.scheduler; +package org.apache.maven.archiva.scheduler; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTaskScheduler.java b/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/RepositoryTaskScheduler.java similarity index 95% rename from archiva-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTaskScheduler.java rename to archiva-core/src/main/java/org/apache/maven/archiva/scheduler/RepositoryTaskScheduler.java index 46db976b3..9b78aba5c 100644 --- a/archiva-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTaskScheduler.java +++ b/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/RepositoryTaskScheduler.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.scheduler; +package org.apache.maven.archiva.scheduler; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-core/src/main/java/org/apache/maven/repository/scheduler/TaskExecutionException.java b/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/TaskExecutionException.java similarity index 95% rename from archiva-core/src/main/java/org/apache/maven/repository/scheduler/TaskExecutionException.java rename to archiva-core/src/main/java/org/apache/maven/archiva/scheduler/TaskExecutionException.java index 7ab229021..0abf106c3 100644 --- a/archiva-core/src/main/java/org/apache/maven/repository/scheduler/TaskExecutionException.java +++ b/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/TaskExecutionException.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.scheduler; +package org.apache.maven.archiva.scheduler; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-core/src/test/java/org/apache/maven/repository/RepositoryManagerTest.java b/archiva-core/src/test/java/org/apache/maven/archiva/RepositoryManagerTest.java similarity index 94% rename from archiva-core/src/test/java/org/apache/maven/repository/RepositoryManagerTest.java rename to archiva-core/src/test/java/org/apache/maven/archiva/RepositoryManagerTest.java index 5fb084590..e5621ea91 100644 --- a/archiva-core/src/test/java/org/apache/maven/repository/RepositoryManagerTest.java +++ b/archiva-core/src/test/java/org/apache/maven/archiva/RepositoryManagerTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository; +package org.apache.maven.archiva; import org.codehaus.plexus.PlexusTestCase; diff --git a/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/AbstractArtifactDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/AbstractArtifactDiscoverer.java similarity index 99% rename from archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/AbstractArtifactDiscoverer.java rename to archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/AbstractArtifactDiscoverer.java index 3faa8bd47..5c184cd7c 100644 --- a/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/AbstractArtifactDiscoverer.java +++ b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/AbstractArtifactDiscoverer.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.discovery; +package org.apache.maven.archiva.discovery; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/AbstractDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/AbstractDiscoverer.java similarity index 99% rename from archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/AbstractDiscoverer.java rename to archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/AbstractDiscoverer.java index 6888b23a9..34abf41eb 100644 --- a/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/AbstractDiscoverer.java +++ b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/AbstractDiscoverer.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.discovery; +package org.apache.maven.archiva.discovery; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/ArtifactDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/ArtifactDiscoverer.java similarity index 98% rename from archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/ArtifactDiscoverer.java rename to archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/ArtifactDiscoverer.java index ec9698cdf..b818adb14 100644 --- a/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/ArtifactDiscoverer.java +++ b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/ArtifactDiscoverer.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.discovery; +package org.apache.maven.archiva.discovery; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/DefaultArtifactDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/DefaultArtifactDiscoverer.java similarity index 96% rename from archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/DefaultArtifactDiscoverer.java rename to archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/DefaultArtifactDiscoverer.java index f7dabe3fc..9cde7cf4a 100644 --- a/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/DefaultArtifactDiscoverer.java +++ b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/DefaultArtifactDiscoverer.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.discovery; +package org.apache.maven.archiva.discovery; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -29,13 +29,13 @@ import java.util.StringTokenizer; * * @author John Casey * @author Brett Porter - * @plexus.component role="org.apache.maven.repository.discovery.ArtifactDiscoverer" role-hint="default" + * @plexus.component role="org.apache.maven.archiva.discovery.ArtifactDiscoverer" role-hint="default" */ public class DefaultArtifactDiscoverer extends AbstractArtifactDiscoverer { /** - * @see org.apache.maven.repository.discovery.ArtifactDiscoverer#buildArtifact(String) + * @see org.apache.maven.archiva.discovery.ArtifactDiscoverer#buildArtifact(String) */ public Artifact buildArtifact( String path ) throws DiscovererException diff --git a/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/DefaultMetadataDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/DefaultMetadataDiscoverer.java similarity index 98% rename from archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/DefaultMetadataDiscoverer.java rename to archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/DefaultMetadataDiscoverer.java index 6aad837df..10ab005b5 100644 --- a/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/DefaultMetadataDiscoverer.java +++ b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/DefaultMetadataDiscoverer.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.discovery; +package org.apache.maven.archiva.discovery; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -47,7 +47,7 @@ import java.util.StringTokenizer; /** * This class gets all the paths that contain the metadata files. * - * @plexus.component role="org.apache.maven.repository.discovery.MetadataDiscoverer" role-hint="default" + * @plexus.component role="org.apache.maven.archiva.discovery.MetadataDiscoverer" role-hint="default" */ public class DefaultMetadataDiscoverer extends AbstractDiscoverer diff --git a/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/Discoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/Discoverer.java similarity index 97% rename from archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/Discoverer.java rename to archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/Discoverer.java index b0896bcad..8b7d17111 100644 --- a/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/Discoverer.java +++ b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/Discoverer.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.discovery; +package org.apache.maven.archiva.discovery; import org.apache.maven.artifact.repository.ArtifactRepository; diff --git a/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/DiscovererException.java b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/DiscovererException.java similarity index 95% rename from archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/DiscovererException.java rename to archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/DiscovererException.java index 02e45e699..104f03e8b 100644 --- a/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/DiscovererException.java +++ b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/DiscovererException.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.discovery; +package org.apache.maven.archiva.discovery; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/DiscovererPath.java b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/DiscovererPath.java similarity index 96% rename from archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/DiscovererPath.java rename to archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/DiscovererPath.java index ae2ecee73..0af7dd671 100644 --- a/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/DiscovererPath.java +++ b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/DiscovererPath.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.discovery; +package org.apache.maven.archiva.discovery; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/LegacyArtifactDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/LegacyArtifactDiscoverer.java similarity index 95% rename from archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/LegacyArtifactDiscoverer.java rename to archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/LegacyArtifactDiscoverer.java index 9a8f7fc22..1ccadbed6 100644 --- a/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/LegacyArtifactDiscoverer.java +++ b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/LegacyArtifactDiscoverer.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.discovery; +package org.apache.maven.archiva.discovery; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -32,13 +32,13 @@ import java.util.StringTokenizer; * * @author John Casey * @author Brett Porter - * @plexus.component role="org.apache.maven.repository.discovery.ArtifactDiscoverer" role-hint="legacy" + * @plexus.component role="org.apache.maven.archiva.discovery.ArtifactDiscoverer" role-hint="legacy" */ public class LegacyArtifactDiscoverer extends AbstractArtifactDiscoverer { /** - * @see org.apache.maven.repository.discovery.ArtifactDiscoverer#buildArtifact(String) + * @see org.apache.maven.archiva.discovery.ArtifactDiscoverer#buildArtifact(String) */ public Artifact buildArtifact( String path ) throws DiscovererException @@ -208,8 +208,7 @@ public class LegacyArtifactDiscoverer { // if everything is kosher, then pop off all the classifier and // version tokens, leaving the naked artifact id in the list. - avceTokenList = - new LinkedList( avceTokenList.subList( 0, avceTokenList.size() - tokensIterated ) ); + avceTokenList = new LinkedList( avceTokenList.subList( 0, avceTokenList.size() - tokensIterated ) ); } StringBuffer artifactIdBuffer = new StringBuffer(); @@ -247,8 +246,7 @@ public class LegacyArtifactDiscoverer { if ( classifierBuffer.length() > 0 ) { - result = artifactFactory.createArtifactWithClassifier( groupId, artifactId, version, - type, + result = artifactFactory.createArtifactWithClassifier( groupId, artifactId, version, type, classifierBuffer.toString() ); } else diff --git a/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/MetadataDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/MetadataDiscoverer.java similarity index 96% rename from archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/MetadataDiscoverer.java rename to archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/MetadataDiscoverer.java index 3877c7723..1492c0742 100644 --- a/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/MetadataDiscoverer.java +++ b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/MetadataDiscoverer.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.discovery; +package org.apache.maven.archiva.discovery; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-discoverer/src/site/apt/design.apt b/archiva-discoverer/src/site/apt/design.apt index 6a482e0ab..1c4c00bf5 100644 --- a/archiva-discoverer/src/site/apt/design.apt +++ b/archiva-discoverer/src/site/apt/design.apt @@ -13,9 +13,9 @@ Discoverer Design There are two plexus components available: - * {{{../apidocs/org/apache/maven/repository/discovery/ArtifactDiscoverer.html} ArtifactDiscoverer}} + * {{{../apidocs/org/apache/maven/archiva/discoverer/ArtifactDiscoverer.html} ArtifactDiscoverer}} - * {{{../apidocs/org/apache/maven/repository/discovery/MetadataDiscoverer.html} MetadataDiscoverer}} + * {{{../apidocs/org/apache/maven/archiva/discoverer/MetadataDiscoverer.html} MetadataDiscoverer}} Each of these components currently have an implementation for the both <<>> and <<>> repository layouts. diff --git a/archiva-discoverer/src/test/java/org/apache/maven/repository/discovery/AbstractArtifactDiscovererTest.java b/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/AbstractArtifactDiscovererTest.java similarity index 99% rename from archiva-discoverer/src/test/java/org/apache/maven/repository/discovery/AbstractArtifactDiscovererTest.java rename to archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/AbstractArtifactDiscovererTest.java index c016fe0bc..c448b3d9f 100644 --- a/archiva-discoverer/src/test/java/org/apache/maven/repository/discovery/AbstractArtifactDiscovererTest.java +++ b/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/AbstractArtifactDiscovererTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.discovery; +package org.apache.maven.archiva.discovery; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-discoverer/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java b/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/DefaultArtifactDiscovererTest.java similarity index 99% rename from archiva-discoverer/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java rename to archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/DefaultArtifactDiscovererTest.java index 7832c4d68..f4ea7c0a7 100644 --- a/archiva-discoverer/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java +++ b/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/DefaultArtifactDiscovererTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.discovery; +package org.apache.maven.archiva.discovery; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-discoverer/src/test/java/org/apache/maven/repository/discovery/DefaultMetadataDiscovererTest.java b/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/DefaultMetadataDiscovererTest.java similarity index 99% rename from archiva-discoverer/src/test/java/org/apache/maven/repository/discovery/DefaultMetadataDiscovererTest.java rename to archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/DefaultMetadataDiscovererTest.java index 52471ab25..cdc5596e4 100644 --- a/archiva-discoverer/src/test/java/org/apache/maven/repository/discovery/DefaultMetadataDiscovererTest.java +++ b/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/DefaultMetadataDiscovererTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.discovery; +package org.apache.maven.archiva.discovery; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-discoverer/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java b/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/LegacyArtifactDiscovererTest.java similarity index 99% rename from archiva-discoverer/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java rename to archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/LegacyArtifactDiscovererTest.java index 88cc07ad1..e622372c0 100644 --- a/archiva-discoverer/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java +++ b/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/LegacyArtifactDiscovererTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.discovery; +package org.apache.maven.archiva.discovery; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryArtifactIndex.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/RepositoryArtifactIndex.java similarity index 95% rename from archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryArtifactIndex.java rename to archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/RepositoryArtifactIndex.java index 03803ed53..b02ce2884 100644 --- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryArtifactIndex.java +++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/RepositoryArtifactIndex.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.indexing; +package org.apache.maven.archiva.indexing; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -16,7 +16,7 @@ package org.apache.maven.repository.indexing; * limitations under the License. */ -import org.apache.maven.repository.indexing.query.Query; +import org.apache.maven.archiva.indexing.query.Query; import java.util.Collection; import java.util.List; diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryArtifactIndexFactory.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/RepositoryArtifactIndexFactory.java similarity index 96% rename from archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryArtifactIndexFactory.java rename to archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/RepositoryArtifactIndexFactory.java index ed0100527..df9f08d55 100644 --- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryArtifactIndexFactory.java +++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/RepositoryArtifactIndexFactory.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.indexing; +package org.apache.maven.archiva.indexing; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexException.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/RepositoryIndexException.java similarity index 95% rename from archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexException.java rename to archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/RepositoryIndexException.java index fe16c022c..b44560777 100644 --- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexException.java +++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/RepositoryIndexException.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.indexing; +package org.apache.maven.archiva.indexing; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexSearchException.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/RepositoryIndexSearchException.java similarity index 94% rename from archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexSearchException.java rename to archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/RepositoryIndexSearchException.java index cd84bde19..590efb66e 100644 --- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexSearchException.java +++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/RepositoryIndexSearchException.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.indexing; +package org.apache.maven.archiva.indexing; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneIndexRecordConverter.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneIndexRecordConverter.java similarity index 91% rename from archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneIndexRecordConverter.java rename to archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneIndexRecordConverter.java index 7aaf123e3..225862910 100644 --- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneIndexRecordConverter.java +++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneIndexRecordConverter.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.indexing.lucene; +package org.apache.maven.archiva.indexing.lucene; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -17,7 +17,7 @@ package org.apache.maven.repository.indexing.lucene; */ import org.apache.lucene.document.Document; -import org.apache.maven.repository.indexing.record.RepositoryIndexRecord; +import org.apache.maven.archiva.indexing.record.RepositoryIndexRecord; import java.text.ParseException; diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalIndexRecordConverter.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneMinimalIndexRecordConverter.java similarity index 91% rename from archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalIndexRecordConverter.java rename to archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneMinimalIndexRecordConverter.java index 02def2dbd..d67b4bfaf 100644 --- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalIndexRecordConverter.java +++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneMinimalIndexRecordConverter.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.indexing.lucene; +package org.apache.maven.archiva.indexing.lucene; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -20,9 +20,9 @@ import org.apache.lucene.document.DateTools; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.NumberTools; -import org.apache.maven.repository.indexing.record.MinimalArtifactIndexRecord; -import org.apache.maven.repository.indexing.record.MinimalIndexRecordFields; -import org.apache.maven.repository.indexing.record.RepositoryIndexRecord; +import org.apache.maven.archiva.indexing.record.MinimalArtifactIndexRecord; +import org.apache.maven.archiva.indexing.record.MinimalIndexRecordFields; +import org.apache.maven.archiva.indexing.record.RepositoryIndexRecord; import org.codehaus.plexus.util.StringUtils; import java.text.ParseException; diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneQuery.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneQuery.java similarity index 90% rename from archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneQuery.java rename to archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneQuery.java index 13fdcaf5c..63c665913 100644 --- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneQuery.java +++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneQuery.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.indexing.lucene; +package org.apache.maven.archiva.indexing.lucene; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -16,7 +16,7 @@ package org.apache.maven.repository.indexing.lucene; * limitations under the License. */ -import org.apache.maven.repository.indexing.query.Query; +import org.apache.maven.archiva.indexing.query.Query; /** * A holder for a lucene query to pass to the indexer API. diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneRepositoryArtifactIndex.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneRepositoryArtifactIndex.java similarity index 94% rename from archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneRepositoryArtifactIndex.java rename to archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneRepositoryArtifactIndex.java index dff648ec5..12803681d 100644 --- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneRepositoryArtifactIndex.java +++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneRepositoryArtifactIndex.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.indexing.lucene; +package org.apache.maven.archiva.indexing.lucene; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -25,11 +25,11 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.Hits; import org.apache.lucene.search.IndexSearcher; -import org.apache.maven.repository.indexing.RepositoryArtifactIndex; -import org.apache.maven.repository.indexing.RepositoryIndexException; -import org.apache.maven.repository.indexing.RepositoryIndexSearchException; -import org.apache.maven.repository.indexing.query.Query; -import org.apache.maven.repository.indexing.record.RepositoryIndexRecord; +import org.apache.maven.archiva.indexing.RepositoryArtifactIndex; +import org.apache.maven.archiva.indexing.RepositoryIndexException; +import org.apache.maven.archiva.indexing.RepositoryIndexSearchException; +import org.apache.maven.archiva.indexing.query.Query; +import org.apache.maven.archiva.indexing.record.RepositoryIndexRecord; import java.io.File; import java.io.IOException; diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneRepositoryArtifactIndexFactory.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneRepositoryArtifactIndexFactory.java similarity index 79% rename from archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneRepositoryArtifactIndexFactory.java rename to archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneRepositoryArtifactIndexFactory.java index 97278b009..42b23c475 100644 --- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneRepositoryArtifactIndexFactory.java +++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneRepositoryArtifactIndexFactory.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.indexing.lucene; +package org.apache.maven.archiva.indexing.lucene; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -16,8 +16,8 @@ package org.apache.maven.repository.indexing.lucene; * limitations under the License. */ -import org.apache.maven.repository.indexing.RepositoryArtifactIndex; -import org.apache.maven.repository.indexing.RepositoryArtifactIndexFactory; +import org.apache.maven.archiva.indexing.RepositoryArtifactIndex; +import org.apache.maven.archiva.indexing.RepositoryArtifactIndexFactory; import java.io.File; @@ -25,7 +25,7 @@ import java.io.File; * Factory for Lucene artifact index instances. * * @author Brett Porter - * @plexus.component role="org.apache.maven.repository.indexing.RepositoryArtifactIndexFactory" role-hint="lucene" + * @plexus.component role="org.apache.maven.archiva.indexing.RepositoryArtifactIndexFactory" role-hint="lucene" */ public class LuceneRepositoryArtifactIndexFactory implements RepositoryArtifactIndexFactory diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneStandardIndexRecordConverter.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneStandardIndexRecordConverter.java similarity index 96% rename from archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneStandardIndexRecordConverter.java rename to archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneStandardIndexRecordConverter.java index f8f6a53b2..dafc01500 100644 --- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneStandardIndexRecordConverter.java +++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneStandardIndexRecordConverter.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.indexing.lucene; +package org.apache.maven.archiva.indexing.lucene; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -20,9 +20,9 @@ import org.apache.lucene.document.DateTools; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.NumberTools; -import org.apache.maven.repository.indexing.record.RepositoryIndexRecord; -import org.apache.maven.repository.indexing.record.StandardArtifactIndexRecord; -import org.apache.maven.repository.indexing.record.StandardIndexRecordFields; +import org.apache.maven.archiva.indexing.record.RepositoryIndexRecord; +import org.apache.maven.archiva.indexing.record.StandardArtifactIndexRecord; +import org.apache.maven.archiva.indexing.record.StandardIndexRecordFields; import org.codehaus.plexus.util.StringUtils; import java.text.ParseException; diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/CompoundQuery.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/CompoundQuery.java similarity index 98% rename from archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/CompoundQuery.java rename to archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/CompoundQuery.java index 85760b621..54f68de0c 100644 --- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/CompoundQuery.java +++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/CompoundQuery.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.indexing.query; +package org.apache.maven.archiva.indexing.query; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/CompoundQueryTerm.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/CompoundQueryTerm.java similarity index 97% rename from archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/CompoundQueryTerm.java rename to archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/CompoundQueryTerm.java index abc99bd13..2538bb01a 100644 --- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/CompoundQueryTerm.java +++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/CompoundQueryTerm.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.indexing.query; +package org.apache.maven.archiva.indexing.query; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/Query.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/Query.java similarity index 93% rename from archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/Query.java rename to archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/Query.java index 2c6ac6137..c3d410b2a 100644 --- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/Query.java +++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/Query.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.indexing.query; +package org.apache.maven.archiva.indexing.query; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/QueryTerm.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/QueryTerm.java similarity index 96% rename from archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/QueryTerm.java rename to archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/QueryTerm.java index 6db240b3a..bc949dcd2 100644 --- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/QueryTerm.java +++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/QueryTerm.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.indexing.query; +package org.apache.maven.archiva.indexing.query; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/RangeQuery.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/RangeQuery.java similarity index 94% rename from archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/RangeQuery.java rename to archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/RangeQuery.java index 68e6d4a6a..c44303b27 100644 --- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/RangeQuery.java +++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/RangeQuery.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.indexing.query; +package org.apache.maven.archiva.indexing.query; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/SingleTermQuery.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/SingleTermQuery.java similarity index 96% rename from archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/SingleTermQuery.java rename to archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/SingleTermQuery.java index f7ae019fa..cb42007d5 100644 --- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/SingleTermQuery.java +++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/SingleTermQuery.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.indexing.query; +package org.apache.maven.archiva.indexing.query; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/AbstractArtifactIndexRecordFactory.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/AbstractArtifactIndexRecordFactory.java similarity index 94% rename from archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/AbstractArtifactIndexRecordFactory.java rename to archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/AbstractArtifactIndexRecordFactory.java index 8a9a8cc91..0325e2ebc 100644 --- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/AbstractArtifactIndexRecordFactory.java +++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/AbstractArtifactIndexRecordFactory.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.indexing.record; +package org.apache.maven.archiva.indexing.record; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -16,8 +16,8 @@ package org.apache.maven.repository.indexing.record; * limitations under the License. */ -import org.apache.maven.repository.digest.Digester; -import org.apache.maven.repository.digest.DigesterException; +import org.apache.maven.archiva.digest.Digester; +import org.apache.maven.archiva.digest.DigesterException; import org.codehaus.plexus.logging.AbstractLogEnabled; import java.io.File; diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecord.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/MinimalArtifactIndexRecord.java similarity index 98% rename from archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecord.java rename to archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/MinimalArtifactIndexRecord.java index 4c212520c..747f7ab95 100644 --- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecord.java +++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/MinimalArtifactIndexRecord.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.indexing.record; +package org.apache.maven.archiva.indexing.record; import java.util.Date; import java.util.List; diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecordFactory.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/MinimalArtifactIndexRecordFactory.java similarity index 92% rename from archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecordFactory.java rename to archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/MinimalArtifactIndexRecordFactory.java index 7f007747c..138094206 100644 --- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecordFactory.java +++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/MinimalArtifactIndexRecordFactory.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.indexing.record; +package org.apache.maven.archiva.indexing.record; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -16,8 +16,8 @@ package org.apache.maven.repository.indexing.record; * limitations under the License. */ +import org.apache.maven.archiva.digest.Digester; import org.apache.maven.artifact.Artifact; -import org.apache.maven.repository.digest.Digester; import java.io.File; import java.io.IOException; @@ -33,17 +33,19 @@ import java.util.Set; * * @author Edwin Punzalan * @author Brett Porter - * @plexus.component role="org.apache.maven.repository.indexing.record.RepositoryIndexRecordFactory" role-hint="minimal" + * @plexus.component role="org.apache.maven.archiva.indexing.record.RepositoryIndexRecordFactory" role-hint="minimal" */ public class MinimalArtifactIndexRecordFactory extends AbstractArtifactIndexRecordFactory { /* List of types to index. */ private static final Set INDEXED_TYPES = new HashSet( Arrays.asList( new String[]{"jar", "maven-plugin"} ) ); + /** * @plexus.requirement role-hint="sha1" */ protected Digester sha1Digester; + /** * @plexus.requirement role-hint="md5" */ diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalIndexRecordFields.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/MinimalIndexRecordFields.java similarity index 95% rename from archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalIndexRecordFields.java rename to archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/MinimalIndexRecordFields.java index 5bb8add24..adb2d76a7 100644 --- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalIndexRecordFields.java +++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/MinimalIndexRecordFields.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.indexing.record; +package org.apache.maven.archiva.indexing.record; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/RepositoryIndexRecord.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/RepositoryIndexRecord.java similarity index 94% rename from archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/RepositoryIndexRecord.java rename to archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/RepositoryIndexRecord.java index 10c99f1a3..64c69ee92 100644 --- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/RepositoryIndexRecord.java +++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/RepositoryIndexRecord.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.indexing.record; +package org.apache.maven.archiva.indexing.record; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/RepositoryIndexRecordFactory.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/RepositoryIndexRecordFactory.java similarity index 91% rename from archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/RepositoryIndexRecordFactory.java rename to archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/RepositoryIndexRecordFactory.java index 2dde9674d..d3031439d 100644 --- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/RepositoryIndexRecordFactory.java +++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/RepositoryIndexRecordFactory.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.indexing.record; +package org.apache.maven.archiva.indexing.record; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -16,8 +16,8 @@ package org.apache.maven.repository.indexing.record; * limitations under the License. */ +import org.apache.maven.archiva.indexing.RepositoryIndexException; import org.apache.maven.artifact.Artifact; -import org.apache.maven.repository.indexing.RepositoryIndexException; /** * The layout of a record in a repository index. diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecord.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/StandardArtifactIndexRecord.java similarity index 99% rename from archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecord.java rename to archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/StandardArtifactIndexRecord.java index d2e97a4b2..9b543f3f8 100644 --- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecord.java +++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/StandardArtifactIndexRecord.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.indexing.record; +package org.apache.maven.archiva.indexing.record; import java.util.List; diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecordFactory.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/StandardArtifactIndexRecordFactory.java similarity index 97% rename from archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecordFactory.java rename to archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/StandardArtifactIndexRecordFactory.java index ec20288b2..27748050b 100644 --- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecordFactory.java +++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/StandardArtifactIndexRecordFactory.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.indexing.record; +package org.apache.maven.archiva.indexing.record; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -16,6 +16,8 @@ package org.apache.maven.repository.indexing.record; * limitations under the License. */ +import org.apache.maven.archiva.digest.Digester; +import org.apache.maven.archiva.indexing.RepositoryIndexException; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.repository.ArtifactRepository; @@ -23,8 +25,6 @@ import org.apache.maven.model.Model; import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectBuilder; import org.apache.maven.project.ProjectBuildingException; -import org.apache.maven.repository.digest.Digester; -import org.apache.maven.repository.indexing.RepositoryIndexException; import org.codehaus.plexus.util.xml.Xpp3Dom; import org.codehaus.plexus.util.xml.Xpp3DomBuilder; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; @@ -48,7 +48,7 @@ import java.util.zip.ZipFile; * * @author Edwin Punzalan * @author Brett Porter - * @plexus.component role="org.apache.maven.repository.indexing.record.RepositoryIndexRecordFactory" role-hint="standard" + * @plexus.component role="org.apache.maven.archiva.indexing.record.RepositoryIndexRecordFactory" role-hint="standard" */ public class StandardArtifactIndexRecordFactory extends AbstractArtifactIndexRecordFactory @@ -94,13 +94,13 @@ public class StandardArtifactIndexRecordFactory StandardArtifactIndexRecord record = null; File file = artifact.getFile(); - + // TODO: is this condition really a possibility? if ( file != null && file.exists() ) { String md5 = readChecksum( file, md5Digester ); String sha1 = readChecksum( file, sha1Digester ); - + List files = null; boolean archive = ARCHIVE_TYPES.contains( artifact.getType() ); try diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardIndexRecordFields.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/StandardIndexRecordFields.java similarity index 97% rename from archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardIndexRecordFields.java rename to archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/StandardIndexRecordFields.java index 5bfdf3347..5515a8b62 100644 --- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardIndexRecordFields.java +++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/StandardIndexRecordFields.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.indexing.record; +package org.apache.maven.archiva.indexing.record; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-indexer/src/site/apt/design.apt b/archiva-indexer/src/site/apt/design.apt index d083789e3..c442f57d8 100644 --- a/archiva-indexer/src/site/apt/design.apt +++ b/archiva-indexer/src/site/apt/design.apt @@ -88,7 +88,7 @@ Indexer Design * Reduced Size Index An additional index is maintained by the repository manager in the - {{{../apidocs/org/apache/maven/repository/indexing/MinimalArtifactIndexRecord.html} MinimalIndex}} class. This + {{{../apidocs/org/apache/maven/archiva/indexing/MinimalArtifactIndexRecord.html} MinimalIndex}} class. This indexes all of the same artifacts as the first index, but stores them with shorter field names and less information to maintain a smaller size. This index is appropriate for use by certain clients such as IDE integration for fast searching. For a fuller interface to the repository information, the integration should use the XMLRPC interface. diff --git a/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalArtifactIndexSearchTest.java b/archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/lucene/LuceneMinimalArtifactIndexSearchTest.java similarity index 95% rename from archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalArtifactIndexSearchTest.java rename to archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/lucene/LuceneMinimalArtifactIndexSearchTest.java index 63198db55..caac994b7 100644 --- a/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalArtifactIndexSearchTest.java +++ b/archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/lucene/LuceneMinimalArtifactIndexSearchTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.indexing.lucene; +package org.apache.maven.archiva.indexing.lucene; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -19,17 +19,17 @@ package org.apache.maven.repository.indexing.lucene; import org.apache.lucene.index.Term; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; +import org.apache.maven.archiva.indexing.RepositoryArtifactIndex; +import org.apache.maven.archiva.indexing.RepositoryArtifactIndexFactory; +import org.apache.maven.archiva.indexing.RepositoryIndexSearchException; +import org.apache.maven.archiva.indexing.record.MinimalIndexRecordFields; +import org.apache.maven.archiva.indexing.record.RepositoryIndexRecordFactory; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepositoryFactory; import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; import org.apache.maven.artifact.versioning.VersionRange; -import org.apache.maven.repository.indexing.RepositoryArtifactIndex; -import org.apache.maven.repository.indexing.RepositoryArtifactIndexFactory; -import org.apache.maven.repository.indexing.RepositoryIndexSearchException; -import org.apache.maven.repository.indexing.record.MinimalIndexRecordFields; -import org.apache.maven.repository.indexing.record.RepositoryIndexRecordFactory; import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.util.FileUtils; @@ -207,7 +207,7 @@ public class LuceneMinimalArtifactIndexSearchTest private Artifact createArtifact( String artifactId, String version, String type, String classifier ) { - Artifact artifact = artifactFactory.createDependencyArtifact( "org.apache.maven.repository.record", artifactId, + Artifact artifact = artifactFactory.createDependencyArtifact( "org.apache.maven.archiva.record", artifactId, VersionRange.createFromVersion( version ), type, classifier, Artifact.SCOPE_RUNTIME ); artifact.isSnapshot(); diff --git a/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalArtifactIndexTest.java b/archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/lucene/LuceneMinimalArtifactIndexTest.java similarity index 94% rename from archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalArtifactIndexTest.java rename to archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/lucene/LuceneMinimalArtifactIndexTest.java index a08d181ac..5fddc326c 100644 --- a/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalArtifactIndexTest.java +++ b/archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/lucene/LuceneMinimalArtifactIndexTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.indexing.lucene; +package org.apache.maven.archiva.indexing.lucene; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -21,17 +21,17 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.NumberTools; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; +import org.apache.maven.archiva.indexing.RepositoryArtifactIndex; +import org.apache.maven.archiva.indexing.RepositoryArtifactIndexFactory; +import org.apache.maven.archiva.indexing.RepositoryIndexException; +import org.apache.maven.archiva.indexing.record.MinimalIndexRecordFields; +import org.apache.maven.archiva.indexing.record.RepositoryIndexRecord; +import org.apache.maven.archiva.indexing.record.RepositoryIndexRecordFactory; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepositoryFactory; import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; -import org.apache.maven.repository.indexing.RepositoryArtifactIndex; -import org.apache.maven.repository.indexing.RepositoryArtifactIndexFactory; -import org.apache.maven.repository.indexing.RepositoryIndexException; -import org.apache.maven.repository.indexing.record.MinimalIndexRecordFields; -import org.apache.maven.repository.indexing.record.RepositoryIndexRecord; -import org.apache.maven.repository.indexing.record.RepositoryIndexRecordFactory; import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; @@ -287,8 +287,8 @@ public class LuceneMinimalArtifactIndexTest try { Document document = reader.document( 0 ); - assertRecord( document, artifact, "06f6fe25e46c4d4fb5be4f56a9bab0ee", - "org.apache.maven.repository.record.MyMojo" ); + assertRecord( document, artifact, "3530896791670ebb45e17708e5d52c40", + "org.apache.maven.archiva.record.MyMojo" ); assertEquals( "Check index size", 1, reader.numDocs() ); } finally @@ -305,7 +305,7 @@ public class LuceneMinimalArtifactIndexTest private Artifact createArtifact( String artifactId, String version, String type ) { Artifact artifact = - artifactFactory.createBuildArtifact( "org.apache.maven.repository.record", artifactId, version, type ); + artifactFactory.createBuildArtifact( "org.apache.maven.archiva.record", artifactId, version, type ); artifact.setFile( new File( repository.getBasedir(), repository.pathOf( artifact ) ) ); artifact.setRepository( repository ); return artifact; diff --git a/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneStandardArtifactIndexSearchTest.java b/archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/lucene/LuceneStandardArtifactIndexSearchTest.java similarity index 97% rename from archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneStandardArtifactIndexSearchTest.java rename to archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/lucene/LuceneStandardArtifactIndexSearchTest.java index 19ff16439..bac0e3d32 100644 --- a/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneStandardArtifactIndexSearchTest.java +++ b/archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/lucene/LuceneStandardArtifactIndexSearchTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.indexing.lucene; +package org.apache.maven.archiva.indexing.lucene; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -22,17 +22,17 @@ import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; +import org.apache.maven.archiva.indexing.RepositoryArtifactIndex; +import org.apache.maven.archiva.indexing.RepositoryArtifactIndexFactory; +import org.apache.maven.archiva.indexing.RepositoryIndexSearchException; +import org.apache.maven.archiva.indexing.record.RepositoryIndexRecordFactory; +import org.apache.maven.archiva.indexing.record.StandardIndexRecordFields; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepositoryFactory; import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; import org.apache.maven.artifact.versioning.VersionRange; -import org.apache.maven.repository.indexing.RepositoryArtifactIndex; -import org.apache.maven.repository.indexing.RepositoryArtifactIndexFactory; -import org.apache.maven.repository.indexing.RepositoryIndexSearchException; -import org.apache.maven.repository.indexing.record.RepositoryIndexRecordFactory; -import org.apache.maven.repository.indexing.record.StandardIndexRecordFields; import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.util.FileUtils; @@ -173,7 +173,7 @@ public class LuceneStandardArtifactIndexSearchTest throws RepositoryIndexSearchException { Query query = - new TermQuery( new Term( StandardIndexRecordFields.GROUPID_EXACT, "org.apache.maven.repository.record" ) ); + new TermQuery( new Term( StandardIndexRecordFields.GROUPID_EXACT, "org.apache.maven.archiva.record" ) ); List results = index.search( new LuceneQuery( query ) ); assertEquals( "Check results size", 10, results.size() ); @@ -408,8 +408,7 @@ public class LuceneStandardArtifactIndexSearchTest public void testMatchGroupId() throws RepositoryIndexSearchException { - Query query = - new TermQuery( new Term( StandardIndexRecordFields.GROUPID, "org.apache.maven.repository.record" ) ); + Query query = new TermQuery( new Term( StandardIndexRecordFields.GROUPID, "org.apache.maven.archiva.record" ) ); List results = index.search( new LuceneQuery( query ) ); assertEquals( "Check results size", 10, results.size() ); @@ -689,7 +688,7 @@ public class LuceneStandardArtifactIndexSearchTest private Artifact createArtifact( String artifactId, String version, String type, String classifier ) { - Artifact artifact = artifactFactory.createDependencyArtifact( "org.apache.maven.repository.record", artifactId, + Artifact artifact = artifactFactory.createDependencyArtifact( "org.apache.maven.archiva.record", artifactId, VersionRange.createFromVersion( version ), type, classifier, Artifact.SCOPE_RUNTIME ); artifact.isSnapshot(); diff --git a/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneStandardArtifactIndexTest.java b/archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/lucene/LuceneStandardArtifactIndexTest.java similarity index 92% rename from archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneStandardArtifactIndexTest.java rename to archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/lucene/LuceneStandardArtifactIndexTest.java index 4329dc452..8c25109a3 100644 --- a/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneStandardArtifactIndexTest.java +++ b/archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/lucene/LuceneStandardArtifactIndexTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.indexing.lucene; +package org.apache.maven.archiva.indexing.lucene; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -21,17 +21,17 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.NumberTools; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; +import org.apache.maven.archiva.indexing.RepositoryArtifactIndex; +import org.apache.maven.archiva.indexing.RepositoryArtifactIndexFactory; +import org.apache.maven.archiva.indexing.RepositoryIndexException; +import org.apache.maven.archiva.indexing.record.RepositoryIndexRecord; +import org.apache.maven.archiva.indexing.record.RepositoryIndexRecordFactory; +import org.apache.maven.archiva.indexing.record.StandardIndexRecordFields; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepositoryFactory; import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; -import org.apache.maven.repository.indexing.RepositoryArtifactIndex; -import org.apache.maven.repository.indexing.RepositoryArtifactIndexFactory; -import org.apache.maven.repository.indexing.RepositoryIndexException; -import org.apache.maven.repository.indexing.record.RepositoryIndexRecord; -import org.apache.maven.repository.indexing.record.RepositoryIndexRecordFactory; -import org.apache.maven.repository.indexing.record.StandardIndexRecordFields; import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; @@ -305,7 +305,7 @@ public class LuceneStandardArtifactIndexTest private Artifact createArtifact( String artifactId, String version, String type ) { Artifact artifact = - artifactFactory.createBuildArtifact( "org.apache.maven.repository.record", artifactId, version, type ); + artifactFactory.createBuildArtifact( "org.apache.maven.archiva.record", artifactId, version, type ); artifact.setFile( new File( repository.getBasedir(), repository.pathOf( artifact ) ) ); artifact.setRepository( repository ); return artifact; @@ -335,7 +335,7 @@ public class LuceneStandardArtifactIndexTest { assertEquals( "Check document filename", repository.pathOf( artifact ), document.get( StandardIndexRecordFields.FILENAME ) ); - assertEquals( "Check document groupId", "org.apache.maven.repository.record", + assertEquals( "Check document groupId", "org.apache.maven.archiva.record", document.get( StandardIndexRecordFields.GROUPID ) ); assertEquals( "Check document artifactId", expectedArtifactId, document.get( StandardIndexRecordFields.ARTIFACTID ) ); @@ -353,8 +353,8 @@ public class LuceneStandardArtifactIndexTest private void assertPomRecord( Artifact artifact, Document document ) { - assertRecord( artifact, document, "test-pom", "pom", "32dbef7ff11eb933bd8b7e7bcab85406", - "c3b374e394607e1e705e71c227f62641e8621ebe" ); + assertRecord( artifact, document, "test-pom", "pom", "103d11ac601a42ccf2a2ae54d308c362", + "4c4d237c5366df877c3a636d5b6241822d090355" ); assertNull( "Check document classes", document.get( StandardIndexRecordFields.CLASSES ) ); assertNull( "Check document files", document.get( StandardIndexRecordFields.FILES ) ); assertNull( "Check document pluginPrefix", document.get( StandardIndexRecordFields.PLUGIN_PREFIX ) ); @@ -382,15 +382,14 @@ public class LuceneStandardArtifactIndexTest private void assertPluginRecord( Artifact artifact, Document document ) { - assertRecord( artifact, document, "test-plugin", "maven-plugin", "06f6fe25e46c4d4fb5be4f56a9bab0ee", - "382c1ebfb5d0c7d6061c2f8569fb53f8fc00fec2" ); - assertEquals( "Check document classes", "org.apache.maven.repository.record.MyMojo", + assertRecord( artifact, document, "test-plugin", "maven-plugin", "3530896791670ebb45e17708e5d52c40", + "2cd2619d59a684e82e97471d2c2e004144c8f24e" ); + assertEquals( "Check document classes", "org.apache.maven.archiva.record.MyMojo", document.get( StandardIndexRecordFields.CLASSES ) ); - assertEquals( "Check document files", "META-INF/MANIFEST.MF\n" + "META-INF/maven/plugin.xml\n" + - "org/apache/maven/repository/record/MyMojo.class\n" + - "META-INF/maven/org.apache.maven.repository.record/test-plugin/pom.xml\n" + - "META-INF/maven/org.apache.maven.repository.record/test-plugin/pom.properties", - document.get( StandardIndexRecordFields.FILES ) ); + assertEquals( "Check document files", "META-INF/MANIFEST.MF\n" + + "META-INF/maven/org.apache.maven.archiva.record/test-plugin/pom.properties\n" + + "META-INF/maven/org.apache.maven.archiva.record/test-plugin/pom.xml\n" + "META-INF/maven/plugin.xml\n" + + "org/apache/maven/archiva/record/MyMojo.class", document.get( StandardIndexRecordFields.FILES ) ); assertEquals( "Check document pluginPrefix", "test", document.get( StandardIndexRecordFields.PLUGIN_PREFIX ) ); assertEquals( "Check document packaging", "maven-plugin", document.get( StandardIndexRecordFields.PACKAGING ) ); assertNull( "Check document inceptionYear", document.get( StandardIndexRecordFields.INCEPTION_YEAR ) ); diff --git a/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/query/QueryTest.java b/archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/query/QueryTest.java similarity index 99% rename from archiva-indexer/src/test/java/org/apache/maven/repository/indexing/query/QueryTest.java rename to archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/query/QueryTest.java index 17364046f..2e90f10e6 100644 --- a/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/query/QueryTest.java +++ b/archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/query/QueryTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.indexing.query; +package org.apache.maven.archiva.indexing.query; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecordFactoryTest.java b/archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/record/MinimalArtifactIndexRecordFactoryTest.java similarity index 97% rename from archiva-indexer/src/test/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecordFactoryTest.java rename to archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/record/MinimalArtifactIndexRecordFactoryTest.java index 32d97b329..9f35d9440 100644 --- a/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecordFactoryTest.java +++ b/archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/record/MinimalArtifactIndexRecordFactoryTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.indexing.record; +package org.apache.maven.archiva.indexing.record; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -16,13 +16,13 @@ package org.apache.maven.repository.indexing.record; * limitations under the License. */ +import org.apache.maven.archiva.indexing.RepositoryIndexException; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepositoryFactory; import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; import org.apache.maven.artifact.versioning.VersionRange; -import org.apache.maven.repository.indexing.RepositoryIndexException; import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; @@ -46,7 +46,7 @@ public class MinimalArtifactIndexRecordFactoryTest private ArtifactFactory artifactFactory; - private static final String TEST_GROUP_ID = "org.apache.maven.repository.record"; + private static final String TEST_GROUP_ID = "org.apache.maven.archiva.record"; private static final List JAR_CLASS_LIST = Arrays.asList( new String[]{"A", "b.B", "b.c.C"} ); @@ -178,11 +178,11 @@ public class MinimalArtifactIndexRecordFactoryTest RepositoryIndexRecord record = factory.createRecord( artifact ); MinimalArtifactIndexRecord expectedRecord = new MinimalArtifactIndexRecord(); - expectedRecord.setMd5Checksum( "06f6fe25e46c4d4fb5be4f56a9bab0ee" ); + expectedRecord.setMd5Checksum( "3530896791670ebb45e17708e5d52c40" ); expectedRecord.setFilename( repository.pathOf( artifact ) ); expectedRecord.setLastModified( artifact.getFile().lastModified() ); expectedRecord.setSize( artifact.getFile().length() ); - expectedRecord.setClasses( Collections.singletonList( "org.apache.maven.repository.record.MyMojo" ) ); + expectedRecord.setClasses( Collections.singletonList( "org.apache.maven.archiva.record.MyMojo" ) ); assertEquals( "check record", expectedRecord, record ); } diff --git a/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecordFactoryTest.java b/archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/record/StandardArtifactIndexRecordFactoryTest.java similarity index 92% rename from archiva-indexer/src/test/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecordFactoryTest.java rename to archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/record/StandardArtifactIndexRecordFactoryTest.java index 790c2bed4..842228cb3 100644 --- a/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecordFactoryTest.java +++ b/archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/record/StandardArtifactIndexRecordFactoryTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.indexing.record; +package org.apache.maven.archiva.indexing.record; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -16,13 +16,13 @@ package org.apache.maven.repository.indexing.record; * limitations under the License. */ +import org.apache.maven.archiva.indexing.RepositoryIndexException; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepositoryFactory; import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; import org.apache.maven.artifact.versioning.VersionRange; -import org.apache.maven.repository.indexing.RepositoryIndexException; import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; @@ -45,7 +45,7 @@ public class StandardArtifactIndexRecordFactoryTest private ArtifactFactory artifactFactory; - private static final String TEST_GROUP_ID = "org.apache.maven.repository.record"; + private static final String TEST_GROUP_ID = "org.apache.maven.archiva.record"; private static final List JAR_CLASS_LIST = Arrays.asList( new String[]{"A", "b.B", "b.c.C"} ); @@ -214,7 +214,7 @@ public class StandardArtifactIndexRecordFactoryTest RepositoryIndexRecord record = factory.createRecord( artifact ); StandardArtifactIndexRecord expectedRecord = new StandardArtifactIndexRecord(); - expectedRecord.setMd5Checksum( "32dbef7ff11eb933bd8b7e7bcab85406" ); + expectedRecord.setMd5Checksum( "103d11ac601a42ccf2a2ae54d308c362" ); expectedRecord.setFilename( repository.pathOf( artifact ) ); expectedRecord.setLastModified( artifact.getFile().lastModified() ); expectedRecord.setSize( artifact.getFile().length() ); @@ -222,7 +222,7 @@ public class StandardArtifactIndexRecordFactoryTest expectedRecord.setGroupId( TEST_GROUP_ID ); expectedRecord.setBaseVersion( "1.0" ); expectedRecord.setVersion( "1.0" ); - expectedRecord.setSha1Checksum( "c3b374e394607e1e705e71c227f62641e8621ebe" ); + expectedRecord.setSha1Checksum( "4c4d237c5366df877c3a636d5b6241822d090355" ); expectedRecord.setType( "pom" ); expectedRecord.setRepository( "test" ); expectedRecord.setPackaging( "pom" ); @@ -264,7 +264,7 @@ public class StandardArtifactIndexRecordFactoryTest RepositoryIndexRecord record = factory.createRecord( artifact ); StandardArtifactIndexRecord expectedRecord = new StandardArtifactIndexRecord(); - expectedRecord.setMd5Checksum( "06f6fe25e46c4d4fb5be4f56a9bab0ee" ); + expectedRecord.setMd5Checksum( "3530896791670ebb45e17708e5d52c40" ); expectedRecord.setFilename( repository.pathOf( artifact ) ); expectedRecord.setLastModified( artifact.getFile().lastModified() ); expectedRecord.setSize( artifact.getFile().length() ); @@ -272,14 +272,14 @@ public class StandardArtifactIndexRecordFactoryTest expectedRecord.setGroupId( TEST_GROUP_ID ); expectedRecord.setBaseVersion( "1.0" ); expectedRecord.setVersion( "1.0" ); - expectedRecord.setSha1Checksum( "382c1ebfb5d0c7d6061c2f8569fb53f8fc00fec2" ); + expectedRecord.setSha1Checksum( "2cd2619d59a684e82e97471d2c2e004144c8f24e" ); expectedRecord.setType( "maven-plugin" ); expectedRecord.setRepository( "test" ); - expectedRecord.setClasses( Arrays.asList( new String[]{"org.apache.maven.repository.record.MyMojo"} ) ); - expectedRecord.setFiles( Arrays.asList( new String[]{"META-INF/MANIFEST.MF", "META-INF/maven/plugin.xml", - "org/apache/maven/repository/record/MyMojo.class", - "META-INF/maven/org.apache.maven.repository.record/test-plugin/pom.xml", - "META-INF/maven/org.apache.maven.repository.record/test-plugin/pom.properties"} ) ); + expectedRecord.setClasses( Arrays.asList( new String[]{"org.apache.maven.archiva.record.MyMojo"} ) ); + expectedRecord.setFiles( Arrays.asList( new String[]{"META-INF/MANIFEST.MF", + "META-INF/maven/org.apache.maven.archiva.record/test-plugin/pom.properties", + "META-INF/maven/org.apache.maven.archiva.record/test-plugin/pom.xml", "META-INF/maven/plugin.xml", + "org/apache/maven/archiva/record/MyMojo.class"} ) ); expectedRecord.setPackaging( "maven-plugin" ); expectedRecord.setProjectName( "Maven Mojo Archetype" ); expectedRecord.setPluginPrefix( "test" ); @@ -295,7 +295,7 @@ public class StandardArtifactIndexRecordFactoryTest RepositoryIndexRecord record = factory.createRecord( artifact ); StandardArtifactIndexRecord expectedRecord = new StandardArtifactIndexRecord(); - expectedRecord.setMd5Checksum( "ecefd4674c75a175119572b19edc45f1" ); + expectedRecord.setMd5Checksum( "52b7ea4b53818b8a5f4c329d88fd60d9" ); expectedRecord.setFilename( repository.pathOf( artifact ) ); expectedRecord.setLastModified( artifact.getFile().lastModified() ); expectedRecord.setSize( artifact.getFile().length() ); @@ -303,13 +303,13 @@ public class StandardArtifactIndexRecordFactoryTest expectedRecord.setGroupId( TEST_GROUP_ID ); expectedRecord.setBaseVersion( "1.0" ); expectedRecord.setVersion( "1.0" ); - expectedRecord.setSha1Checksum( "5ebabafdbcd6684ae434c06e22c32844df284b05" ); + expectedRecord.setSha1Checksum( "05841f5e51c124f1729d86c1687438c36b9255d9" ); expectedRecord.setType( "maven-archetype" ); expectedRecord.setRepository( "test" ); - expectedRecord.setFiles( Arrays.asList( new String[]{"META-INF/MANIFEST.MF", "archetype-resources/pom.xml", - "archetype-resources/src/main/java/App.java", "archetype-resources/src/test/java/AppTest.java", - "META-INF/maven/archetype.xml", "META-INF/maven/org.apache.maven.repository.record/test-archetype/pom.xml", - "META-INF/maven/org.apache.maven.repository.record/test-archetype/pom.properties"} ) ); + expectedRecord.setFiles( Arrays.asList( new String[]{"META-INF/MANIFEST.MF", "META-INF/maven/archetype.xml", + "META-INF/maven/org.apache.maven.archiva.record/test-archetype/pom.properties", + "META-INF/maven/org.apache.maven.archiva.record/test-archetype/pom.xml", "archetype-resources/pom.xml", + "archetype-resources/src/main/java/App.java", "archetype-resources/src/test/java/AppTest.java"} ) ); expectedRecord.setPackaging( "jar" ); expectedRecord.setProjectName( "Archetype - test-archetype" ); diff --git a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/parent-pom/1/parent-pom-1.pom b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/parent-pom/1/parent-pom-1.pom similarity index 88% rename from archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/parent-pom/1/parent-pom-1.pom rename to archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/parent-pom/1/parent-pom-1.pom index 162f02ac6..c7348595f 100644 --- a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/parent-pom/1/parent-pom-1.pom +++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/parent-pom/1/parent-pom-1.pom @@ -14,9 +14,9 @@ ~ limitations under the License. --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.apache.maven.repository.record + org.apache.maven.archiva.record parent-pom 1 pom diff --git a/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-archetype/1.0/test-archetype-1.0.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-archetype/1.0/test-archetype-1.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..6b5db4295628cddf9b2353c3b28b199e983b92ce GIT binary patch literal 4371 zcmb_f2{@E%8y?wrX+j$5NT?XoZ*3}BGGUCQv81Aj!PsVe3`&j?MNu>fk@{_s<&dOE z*_RRxlI=u_$X0~ZkMn(W%$Sar>p#z2-*tU6*ZbV>^E~hKKKDJQSauFLj0gNAo{?08 zF&Qt61BTPb>nItTV3cPc!(i+%Q!F@=^^>qz-W~gSB?p^?Cgi|!c(W$pMcw^qJsaPAc$w^ZT{w8^|=G(Vom#-v? z4Ji2bZ5$+x0UrRi`8e*iqNx~g7wCcF;G2)hizNwR<~ZC4-b8n0M$pbIixJ;0CIEI$ zM6Y8MBGT8*HP2AdsNO&+UC|)_b+4IePOWk77DF(XVE&GN_TUn;%IOsS+VsjJLh&w^ zhc0JckBf=Dc|FSNO4_KE=?(6qt^Il_rRa&s{PvS|!c`tJ3)PcNm#+Ax(ghy~mD|Hh_}-H;T3Od$eZB%g1Ir}ar#`y>P&1eU3sf3k#G;<*v)*R2; zYo^+xmaMrZCB;hf`3cYcJ^BR9prQZNdEL8Os(54dT-u8JK^pC21;H&q>-H!m8hjVj z{8>qy&VFD@!QjK_Bi4fI|0_v@4OeV|B{!o)9*%EGEGEYv7P;{l7aSylIC(229{7OH zJ79Uit*u^nZl`zrS(;)_N?JkPc-(Z=I&RyU%wqtDTMRrp19vq`R0My;7$2QcM3!zL zTUu_juzty&KYd=dG+*&lfbh!c3{|X3m>hZ(PijlsOGHwmMD_dG8m}UBl6N<;Z@+|R zk1DK4^ZBT=``}&qW;8u8*JYG{Qilx_S?kAVrZ=0dAwOt8(uMYI$j(3U`pFK=>JiDR z4*QXg8q9v*hC}---kpuNfpZ_w%WXR1M(=A0M^(a8P*=s&2#NRP_XN^+V58%lQ-_A@ z`g9|O^-En*=wWfdxAT7QO10zWmao%|+4R&c)F$cEO7zvOfxuCLd+L3pDz1lGyf>Z; zDcl_6locch$kjxqT56h4H_+BK+Tl$i4_m7SOA=SnDR~O07Ongm@8$p`z^n0mqEbt8 zm$CDy&?#e)*-G0QQb}PkElJIH%S*g**bv9Io{iR=!$t>$hqF(Qo;c{`G1J?X+EFXV zBVbIZ*G{=@5q4TjTotP^$KIkUIeDSmad;vjzN^pn{qb}u6sBCv`vu;xyfc?j&Wpgm z9#9KZ@Qi5L-Mzl%f?n(>uZH`?R1fS?NNHx>CY}u5>X7h+;iM03KJlFb&uWK-9R>*U zp#j+y6w_+~NymQAu{gZ`4HoA@5!cpxcY(_})bowsb;8<;;oZOs4~>wxjVo2k4bE~2 zRcO~?l8lbNvIa2H0Gqo+c8Ha@TL$TUUZmfjcUO7*Pt|5`Zr-y=#FwBEj`Qy{8f>hN z)>M|%Rx5_N)pXB=!8JW%%yFHUn#Ph2#<+XPIR2rUPAl$M%|*R-qkdD{r~C-_ydmnO zoL}fZ1fnpcvB2z;;1^ElE*P5R_QirsP{7MPsiIj107L|fgF*=)dXlMt9nq6%WUzXy zUB&|%1mK+rzqHTgGzuQv#r;KC#$PSeMf!|=*-Le&7lC#|SwU~IQ=4UF)7t}fg`-{n zn^W-Qe%JlC9J=Ap_jGGHXV3s;kAdP^RJN5M-_~+pUV{$ymu?!q!8|e_v>mc&0bWh2 zX$QDQLL=Y-kFabu4VY3anYJbPrn%hT9s>zNJ8g?l)DOSkm9EuTh}ssAEi zO=7#LoRhu%`dNOsE$I~6%3pm{#?~u3HOVfpHzjk;?UMY}@V)jqTL*iEUqAFYPSF}5 zy%%SPH+Y}Qs(zq<&cN)%gOPIu!}66A56-~YjZXH69y0A~C*mEb7acdwP;cg3Ctj?< z#cAW{*pFe2gK~t?d+HHWqlvyT)kdFEn~WvS?cecxlKbrZu@KwMA0XIZFf;IImM0L2 zWs2+x*fB8$EA2>q$IFdCTHw|Nl8IsI1DPMWIupDJOkKh1zxk*9btn`h1f&$cRk&=u zNU)FSYiKs0v5Us?Iai9|Z(qdf=LWty0Z zLotu+wzjaqJ0Fv|>NN+8E~xZ(Cte$WKlY}X;OE-mDb{i}Pc*q);uT^AWpa}ReWW5N zJ$@)FaLq6fxHa-{-LQ~>obJJaop(qls*@dGy^z)YjkYB=wZ(RBLhz1W<)iqhX*THg z+`aU$C;`mr8Tc%JOy4Uw#KBBw75fVXpLb;`IIBPMI|XO>g9XQfam*LpKeE)l3?*=8 zH0raE){yCDrOxW$&@V!#cWOJ~YPk&GXrf5%MGc00dI$CK8_nmsW*?z#e58+S`%+XD zhN%U6sLk?sjP@63$Y=3v-!qe#{q8ZMc*B_~C&3JZnyy{xIgmh z+Ui87F4DSy`_Vy&T8E&B)GNo5RZGN_bz1l8akeP#Niavc&o+h4C?&i)uJW|k2Om3i zxXe=Jo&oX-|H+%xZK`#(v06<=qr5`3Iz58=hK_Ayz21c$5Xf{WR06MR;rvx)TLFhH zRpQ{!^9CvLrM4)oAzf~YUFyoLjG^(%u$|!RqAQashY4OC_FAfsnR@}sl9{9-S;{ap`@gX>%c-$)`O@~oa4n|= z80CTxm?;cW0}S(B2H~qV_+A4+jK{D)x&Jwo1^#1n3Tqoe1DRo~z<8!yX7VGbuj86gDF~05MIeS`*oB|M`N=ff + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.apache.maven.repository.record + org.apache.maven.archiva.record test-archetype 1.0 Archetype - test-archetype diff --git a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.jar similarity index 100% rename from archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.jar rename to archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.jar diff --git a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.pom b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.pom similarity index 86% rename from archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.pom rename to archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.pom index b247e7aa3..1bf63afc2 100644 --- a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.pom +++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.pom @@ -15,10 +15,10 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.apache.maven.repository.record + org.apache.maven.archiva.record parent-pom 1 diff --git a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-corrupt-jar/1.0/test-corrupt-jar-1.0.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-corrupt-jar/1.0/test-corrupt-jar-1.0.jar similarity index 100% rename from archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-corrupt-jar/1.0/test-corrupt-jar-1.0.jar rename to archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-corrupt-jar/1.0/test-corrupt-jar-1.0.jar diff --git a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-dll/1.0.1.34/test-dll-1.0.1.34.dll b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-dll/1.0.1.34/test-dll-1.0.1.34.dll similarity index 100% rename from archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-dll/1.0.1.34/test-dll-1.0.1.34.dll rename to archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-dll/1.0.1.34/test-dll-1.0.1.34.dll diff --git a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1-jdk14.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1-jdk14.jar similarity index 100% rename from archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1-jdk14.jar rename to archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1-jdk14.jar diff --git a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.jar similarity index 100% rename from archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.jar rename to archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.jar diff --git a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.pom b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.pom similarity index 87% rename from archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.pom rename to archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.pom index 6d2d2a78a..dce711522 100644 --- a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.pom +++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.pom @@ -15,9 +15,9 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.apache.maven.repository.record + org.apache.maven.archiva.record test-jar-and-pom 1.0-alpha-1 Test JAR and POM diff --git a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar/1.0/test-jar-1.0-jdk14.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar/1.0/test-jar-1.0-jdk14.jar similarity index 100% rename from archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar/1.0/test-jar-1.0-jdk14.jar rename to archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar/1.0/test-jar-1.0-jdk14.jar diff --git a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar/1.0/test-jar-1.0.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar/1.0/test-jar-1.0.jar similarity index 100% rename from archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar/1.0/test-jar-1.0.jar rename to archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar/1.0/test-jar-1.0.jar diff --git a/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-plugin/1.0/test-plugin-1.0.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-plugin/1.0/test-plugin-1.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..1c0b105fe104533d7a743f776cfabce0d6694c74 GIT binary patch literal 4402 zcmbtXc{r497oRL6%%HLr8KENE*hxrsW8cP}8G9Nt#u}3nCPX1bC~L~{*`+M;CbA`j z>=F%cMdS@x`exGCjCr^3z25U&&viY2oZmU;e(rOh-~BUz(bBO4_7a~d{2@62g)su? z0ESu?>f(Av+LGHH001q(1jewJ_m^BU_*5yJ#8&>3kgH*&xT!{1~74n zUNB7j#EY(;N;BvynWMcoj{tuP2T4`?6liF zZ9^LC(uQst`~1LUp+SvPvB~nXON!fZM&17~9f99Eu67Bh+MxKTr&qkuT=eDY!C)?y3$TZ@skaqDRGC1)XF}bE>5#f2>ts`z3*3t_m zeoo^LB;F^-Cus&R;@^bI$QCajb6J$1Yq;gYF*7uA}@jaq=2v3b`(g(Z; zt*>BJ-Dvq6)9D+DPBlpe8b;*Zx1;5Y%ER`MV+UNtjikrGGv=`GGI4QKA z-rDHTRVd^`p0K_w#a4(8=k+{EUl>y`?hQ##M1rnKwR5}2qbx3ussxmOu>qyOSLwn) zyo%qasZd?^u?7z1PG{=BzvW3;JckGLcfYJpq8mL00Mr0hq@8(yU zKD=7r#-_txvw8MF#glGl(;i2fEaS-640HJEg%byX~Cuap|5m1g!s_AXiUGnG99=dF3g-@{nr7W<7KD`x6?%Xmvp z2Rva@#%J>a%bLYo2JZVe^N!s&`?O(C;|NTQ^6wSmgM?O3Psq+|%7r>Q6ckn#d^~4= z8E7*ltzhvG4z9l7VakJY>u=~|IeqV$MJewBduKAfK2t38*%C5+R-#j*N}-y4fq!W5 zEui`H3i2G1-e~*5$>)-ZbsZZ;nzdz7MjuSxgb4-NK_Br(;^zg|KHAa7Y^hj*Y!3cL ze-?>LU>t$tE!+2ddFpMjCJc(Ct%qgYaUHJva52D052v`PX1b=$RJ5%|I%+Ef3u8vg0PV1drD607F&xyX-a>L!ppK4 znFU0wE#{q-LAi6aBQ+Bnx=!f6B5G zQ=aQhZh9=Ik`#NpHW7J*MZKx_RhF}=HfRZIc@r7QTE(XX@}EdX=UcNlo6>AFS*H`E zRF6Lagiq2{u$2dEmSq+;1Cx-<*JXzU(m@v$#}VLmZ4M>yE3dYu#W`I>nOlf7;hSkf zqIbbrCFQ~KuStiW^$gC{a6jN?63&^g0L@l!z;jneZle5xccYMZ~FJf znobH3X1$C$1R-L*t1}ELl2R!_IPFY%KI|b@jVtk5ZdcidGJG{IXFp9vchi(KGpCr| zlF}0S%3i=BpsFX8<7InlUC+z&{$}csWz0TX-*?egqZ~!@yu}6)$FIo{aQ41~LsOmg zFX#uf&M!$S9A$_RjTW7&sJd;By4_O7Jn5hP`ug_PN89a^;Ln}Lfdx4IRx8))maP=z zt@&jI$)ptI1*2o4U96=#@a%qIxQT*I+otfhJ*2KGyosx3C3e*vdP)ward2v(R}p!X zf-9*#n16WeFfD~+9~JlQ+wJ&wgih*bQsy6Vciew4I7Jrfa`^uWMnU{L{7j7&`#;cz z7Yxzo&=St)5x%~07AW%raQ0Ad-3o+5nPy((*DID@dxh*uN)9<{m0f1^@WEhs-Q_#M zViDtA-P%i~E39k7X-3lKZY$}KP18)(K(2jZ0bdb4DuhP_CBm3*&xG-%Z@=+52v0>v z@0qFd;mbW{#@(Oel$9D*GH@3(CY#VKen9PQP4wAMMPbUog+sOOIb7=?{ounx$TQdU z4ydF`Ls3rJQ|DhY@swa*nD>Ecf78x-SpTsedtR~(66~)e5r5|sPBLTvTt{3nqY#9S zC$Xi1&^bHkZCO}gRBa?=$6{a5_)ge(l)*`QZ22}#?(AvQh|yD@hj|U}>k}JGTm(IW zPad~aFyRT9H9Y#7CABv`qz@ID#~eyvWwy0XoAh-RT%oz^m~$+iDLkc4YpeS7H+ZC) zxuY=0c$Wstdni0S1)Cqhrg-4E*ty%0>L8mn&Pkiv8#c_WP*JDDal$VTyNcpNvIFkE zO)z$QrTiJlXS)Vw26BpvA#|t4MBLeg@674vPK>PJ?1tnZa$%u5dudHmAHPM96lE`O zb`M*X9OGbBE49eNI~>i7|AdL72ipZjRB&=IcUt%6t8j9!Pr{F2K29>#pGDz2e4f4* z7hkP+dmXDiqtrc~2{!Jnzr7Kh+R@et89Fc!*adTLxSLR0R6jpt`$l%gh*f$et!zJ7 zHZZR;L^t5Q`pucDeh=MC8crXogpX&{K6=|W1}_}lgl~7M8~{rF64IWzlB=_ww5by> z>8x6T7u{TC0PGc7!I{BK2(@OR#+~m@)ZSY@92MC6g}%d&&aqibUo@cUsQq;s@Xd^u zF6B`|Af)=Xu~0`Y%5N(SbZe&aV&0%m@n6sF0uTWL#IY=1|1w;@(I;Zb2U}FFjg0-S|K^bVsmt?iSChaZ0+f)U+%*+MPs3n zo?Xxm-dqW&cVxn?vZn)WZ|}=7p9&Q@_louWGud+MQKhE7$4U%wFa!_$0_~MFxKEtz z6=h@0VYTIwM)ey)tHEotIgfR=zt18qpb$)h7654dK8yCyumg6>8seDxZX{W=+kWa4 zlE^WE?S@jy43elJn+oysCzL|skRmVv{#=fbBRr#w@V{9`22&3fk~|^XGV$|g`W^7! zixqNk>RUERu8>V_&p!^nTfC5eB1yhbUi3-wg>0$+F41l=L%DaP^-*4WNGgJCQN(We zhd+;UeWbL+8xdtb(p8F*4oTEQw$H?-q{>IWSWz|%^`7tURXw8m-eFSmMp7e4TuL^t zABdmKN(TNBw~~QLyMce-ox2zO^pD_V<|S7_T|Pg#1mf4%zY6n{iOJ1IibgpINL)-d gMaI9l4*ZBl$;>7&dLRkSLVR?HJ261KJOcp#1u^s?KL7v# literal 0 HcmV?d00001 diff --git a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-plugin/1.0/test-plugin-1.0.pom b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-plugin/1.0/test-plugin-1.0.pom similarity index 80% rename from archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-plugin/1.0/test-plugin-1.0.pom rename to archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-plugin/1.0/test-plugin-1.0.pom index 7baa980d2..a7bdb5c0b 100644 --- a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-plugin/1.0/test-plugin-1.0.pom +++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-plugin/1.0/test-plugin-1.0.pom @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.apache.maven.repository.record + org.apache.maven.archiva.record test-plugin maven-plugin 1.0 diff --git a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-pom/1.0/test-pom-1.0.pom b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-pom/1.0/test-pom-1.0.pom similarity index 70% rename from archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-pom/1.0/test-pom-1.0.pom rename to archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-pom/1.0/test-pom-1.0.pom index 34b9e1f3f..ea517e7ad 100644 --- a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-pom/1.0/test-pom-1.0.pom +++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-pom/1.0/test-pom-1.0.pom @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.apache.maven.repository.record + org.apache.maven.archiva.record test-pom 1.0 Maven Repository Manager Test POM diff --git a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-archetype/1.0/test-archetype-1.0.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-archetype/1.0/test-archetype-1.0.jar deleted file mode 100644 index e1686a206c4d0aefd9007986e94be8ab80ab51b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4338 zcmb_e3tWrs8(x%^l+rLdp_EjsSd79}$~vspq)_OzT2#wgC3J3dn2xm0qCzJfi1t-< z_;f<&gU*RaB8m*I?Cdgb5E5ACC6^5f2mbB@CgjIu7?hrtrp7@-7)Fy4Qnb8O5keV9 zc5hS&#fggK=Jh3FPYaB9jG=vP<*Mv$dyXghBj_Hl9X+;=j0INy<0J5{OE|BZBokOi zc2S$?izrjo{4ALKY?(k(bH9b561EX_2wtLN5Zv-HsFmXhv2IZPoX(qAxmM+<7Tl2a z1^tizp!ZPw;C=~wy?8Ik7Z1mQ=h2Ahn#eBC)?q;zu{jQlsWLd2lPn2%vYR7bo`iQI zI+HB%PV=l6TR>S@IFT&bSc$T+vNyMNU}L)Jccv%JUCi0ovvWT$)RiYma zj}-|t;48`tg>%pvOaw-D82E4AC^O~ur8@Um95V4fek?X#(EntTUh%OeBOBWjeMwHc z%knLh(SO5V96(l!d~hfzk=-v40N!>gb0R7B2I}cHM}5EKiF0>gg*g@hp)E>P8$HhZ zZz5LN)wKq0m%jYM%t{}7>M>$?J0V3I;pv?-bzTgHJ)gogXx60hkTzL* zA|{xhXW8A{QklldFxi7R)sm7bs?a`aLHAJcUw-R|F7e9(Z3>E8EMIQYkd)bb-1Sk% zSVZ61?qp8BT+S-4XNgbp91N{5>93XPbiSE=6(3TGiA7@Sbv{uW-b$Gh=?$Ud!`IJ5 zRcKG#Xw-!U9#ox@-1mLST#3)*)oE0GV*-%RMqqAbkyl2+PM6;FCZZf2VT>1fj1qsT z;)+g*{*^Z@64y0=$rhHw#a>X|^%VcR_rmYqQu`WzdCcmqTu*#(ePP`Z1dhCZ-P6WF z4jYw0LUed7ghpB)=q^ivT*BeJe1iDAdofC%E`H8&kl@k}>E(;^k|~K^mplPUH8aMQ zn-ZjY%Dg;OQM4rSu6O*hX;lG4GSt>-O?khSF_$$@0=&O_ejaS4(^lbJC8b9x058)Z?+< zR>%#D%5Uo;H>-+kW(%hJC`au0MhrP}?-Kg-WN&DiaK)xmJ*UMy=`=r)N=Z)fn~`Ud zo66QGpq^pW-Hhb2;OT~@-)^q^BCJ~W**fjT_Fg6iv@oYdn zrDXT#u)KD!Co9Ws*Pz!p7;%UCK2*B1Mod*I$M|(RLr+o7$wTnUobG(Vi=MttDU$^_b8*wRc5J zsH-BzA<2}HE<#O9Tf;-w4+-k7{pH4I(Se;V)bXm$`(g1nJ|xhupFh2MPu5s2#g1ZYQOXRwUn?KfG@dr0gy2jAXooe2t_MoYd%asHE z@;xCj0de5LctFPnd+D%?!52}c;zBu!x@1Bxaz(NoIZbNKZAqI?4cu5(FRvF|!>D-s4c`SjY#vnXFPwj5te45UF*O0ES-x+{G4w0JmwR%ePoxXoY5 z11NfbVCw&=;&&tw9q}ZxE#7JM6BM9B1(5ab8(g6S?VovV#imD<=3Yj+Ah!azJF=gx^|C&5MTS}BXNm$#*&*gjWXRo_!EpQ*c%5%dKZ#$~p)=&~ z%wQmh0=Mt45N5kfohhrX0=#d zF2r4^;F!2~Ia%W}v-P8%TZp|-qcE{y%NAvBeq$Jlg^9HI1Ti$l%wW`iTm%&0|E&GA9pSg=man0*T2DI?+ql9otRqZ0!xBc$9K}?&Ou271$&q71 zuG~3t6v`4x{AUtVTW$O7{@;0i$Mekh`}rR4?|nb-#{f!3P75Fm!%OevKE8aq(cquD zU=uZoGkOpygHLAE00X?4MNF1$68`T|{KfXUnXa1N83@?eL{b+LnNUpoP?|GhLv@^A zD$$6CyQF;Tx`8+I#veCDm*ftRcgT@d31;8dt##H~`+ zha7y|FF<$nk2U{%i4!Zi0y#`3&tn2+tz(0iU9qWSv_*xVT^T-Ka=+x5!NEugDJCOV`lRVYChixUth9ysW)QPbL5pG$ppH>d#$XePHtp7Ee%{outizj{r*AMB z|L(tTiCeY1cV0~;z`g%ZZvDqn4`yJEZqY-E$LH0`u9G1vD4a7FdVpcdasETsGHM(R@0PTbe+pX7ESQP_;1Y7PP6PBMP$Z7I5HRweB#8ZQFpptvlDV`XD zyAJ_|zrPC1e7viWrqHs^Yyd(CMR`%543q^~PWntWx^j0vx~a5lJ@O7!cU#SP*27V+ zpwXA+XErSmiSyhvn1*3cQ(i0Nx16{4xgs?#b`PNRJ<)3{07UW3{A!i=9(yaVEt;(q` zsmgP???gq%`gE_n?|LTrbQWPP(q)b^WCs>Lxv%l`dJ-)e>nV&wVCF7hf2C1>+*81m zf=~@I0H6i`9ZCJO4^cNz7vYAGba1!x@rgI_FlL3Zp**!q?5v73F_G`WOwUsbT4J$B zt-(c?Xk5I#yttiDb})!XjCFQF-rQef+I*IwCu{7qc8zb_Fk9K5<4~yIJG&=JbJcSS zbE7^_#`Q1muJc-nOvc2J%+z}G<_jBfKFzbeo*s(r&!r!gOKOy0Rhh1cv3Y$r^fcx2 z(JJRWjxBnf3p|7N>c5>~RZ5qY_OOLax_8rZVZCt1y$odQkn5FoOLa(hsUp4$zbZ&3 z=DZG;%3_&sk1wPVuvmy>nZyTu;!F@!ai(7b5y2RJO9CtC^(vv#K7$ zdQIMynEID>=mxB#fXjuSPne!E;PRW*6&hkp?@0{m^@zmKq2`$AEY4+2_`n6$NOP_8 zgcE7QQ)|H=%2jt^kt)X4B8SI1H5gw?!@^UMH~pAFtS7|XG9%UK%{SR6%&QX2>6oN} zwmk77-8^t$RL~8--038Jr@qsFQu11CGSE@7ONiTPPmYQ@GmGTR>*S9QuLWBU%Ja#G zqO_>V4AX0-5yN+HtZsKbJBt-Q%%pPPuCZ(e{hqqa_ZQOJTRZp$S^NDvp$_%ANmY02 z76vVz%gyL9$*yG-u`tN_V@iXx{a&gi&y+oN(Y~l*`>IUj#PzD`>DE!$osn(WPKOdJ zrOd;i$JuN7T02*_wGyQqluM$3+Z$8>YQeQ&BdEb#l@Ut6v$`FNqXp^h)pqm++w(nqKZMe!&6I{<2DC~S7~^8i#{y)_C{ z@lZQ1SRh$g2FyF&BJ8xj7mvy+wm~gHaO1+}Y+jAl4$1y{{F=;UzuwpJ+$OolT#_FN zNs`Dg_}4FZ;%hwRe}(4@_wkk3~FqgH^ev=>o+3G0d``6R|sk&D|X%+rt%@DoEFIHGuWC}1YFU1 zu#0zPpM@2xKki62&&(D)RxK8B&MIen`_0zc)Qs5e;Q|J)v_H~V1tmL7nPeSgwj4(8AV8Wp#MrfK5Of`_bSYl0c z<_u=TY5vWrrf}2ofTb?V`bu1DbnRV@yrmn=2VxD4U)DvJ7A6EtZ>Z=+T9v^|S+7X4O zyN_&yo(~zxdT;~>bdM!F&|Ih%0?i5o3WgVkm2lM#P86OvsFQ>(pjMf3aUyrQ-f*4S z7)Kfxni#@0qy1FWz*G@iQ;*Pzl@Wg@=#ZsWVMyw^G1NTlEaToDl>S_Kz-&+^ggZc_ zoA;O%?c;Vt!^ZKKPj78R<=Y;`MPbMlbhPAH9x_h~NpC%PfH*t{DRYW8((5xNZrENh?Y%+# zJ~iZ2UWi9~@KV-}YV_^QvzH`1k2Twb%f&R!1YJY*Hb2)ya(P=uk9^R4#ZA8;eTl)7 z9|ytGy_kfggiXw`6me=F9{?u@1aI}DgPumP&Ta++-qRNByDBsiz!Xn_SLW)?BC0&Wg({1JDAl283_34>rp~*I; zR9j$VTA+&U05Er8VucRwFPk%6FOe_klfL1{r5&1mo9KB>wv4|FX8c zkO(h0($^L4b2z@3w&@rf*uU{2vn(u*F7vmHX0#W+VMT59PH#_za*Vq-kPe7xAMo1}W*-t0 zN{=U%gE`!*izsM_d42l?ON24OPYpo~e(LNV&}S8X%Iov org.apache.maven.wagon.Wagon test - org.apache.maven.repository.proxy.WagonDelegate + org.apache.maven.archiva.proxy.WagonDelegate org.codehaus.plexus.logging.LoggerManager diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/AbstractRepositoryQueryLayer.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/AbstractRepositoryQueryLayer.java similarity index 98% rename from archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/AbstractRepositoryQueryLayer.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/AbstractRepositoryQueryLayer.java index 997597c77..8d9bc6e3e 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/AbstractRepositoryQueryLayer.java +++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/AbstractRepositoryQueryLayer.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ArtifactReportProcessor.java similarity index 96% rename from archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactReportProcessor.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ArtifactReportProcessor.java index 773b2c7f5..0379626d1 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactReportProcessor.java +++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ArtifactReportProcessor.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactReporter.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ArtifactReporter.java similarity index 98% rename from archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactReporter.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ArtifactReporter.java index a48476491..af5b539d8 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactReporter.java +++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ArtifactReporter.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactResult.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ArtifactResult.java similarity index 96% rename from archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactResult.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ArtifactResult.java index 6c0aba900..d3685c29a 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactResult.java +++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ArtifactResult.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/BadMetadataReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/BadMetadataReportProcessor.java similarity index 98% rename from archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/BadMetadataReportProcessor.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/BadMetadataReportProcessor.java index fdba18d39..919940c80 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/BadMetadataReportProcessor.java +++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/BadMetadataReportProcessor.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -38,7 +38,7 @@ import java.util.Map; * This class will report on bad metadata files. These include invalid version declarations and incomplete version * information inside the metadata file. Plugin metadata will be checked for validity of the latest plugin artifacts. * - * @plexus.component role="org.apache.maven.repository.reporting.MetadataReportProcessor" role-hint="bad-metadata" + * @plexus.component role="org.apache.maven.archiva.reporting.MetadataReportProcessor" role-hint="bad-metadata" */ public class BadMetadataReportProcessor implements MetadataReportProcessor diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/Cache.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/Cache.java similarity index 99% rename from archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/Cache.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/Cache.java index 8f695f91d..2559cf2e2 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/Cache.java +++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/Cache.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/CachedRepositoryQueryLayer.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/CachedRepositoryQueryLayer.java similarity index 98% rename from archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/CachedRepositoryQueryLayer.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/CachedRepositoryQueryLayer.java index b0c1eac27..7b455899a 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/CachedRepositoryQueryLayer.java +++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/CachedRepositoryQueryLayer.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumArtifactReporter.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ChecksumArtifactReporter.java similarity index 92% rename from archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumArtifactReporter.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ChecksumArtifactReporter.java index 51b4a8772..ef23c9226 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumArtifactReporter.java +++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ChecksumArtifactReporter.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -16,11 +16,11 @@ package org.apache.maven.repository.reporting; * limitations under the License. */ +import org.apache.maven.archiva.digest.Digester; +import org.apache.maven.archiva.digest.DigesterException; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.model.Model; -import org.apache.maven.repository.digest.Digester; -import org.apache.maven.repository.digest.DigesterException; import org.codehaus.plexus.util.FileUtils; import java.io.File; @@ -30,7 +30,7 @@ import java.io.IOException; * This class reports invalid and mismatched checksums of artifacts and metadata files. * It validates MD5 and SHA-1 checksums. * - * @plexus.component role="org.apache.maven.repository.reporting.ArtifactReportProcessor" role-hint="checksum" + * @plexus.component role="org.apache.maven.archiva.reporting.ArtifactReportProcessor" role-hint="checksum" */ public class ChecksumArtifactReporter implements ArtifactReportProcessor @@ -44,7 +44,7 @@ public class ChecksumArtifactReporter * @plexus.requirement role-hint="md5" */ private Digester md5Digester; - + /** * Validate the checksum of the specified artifact. * diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumMetadataReporter.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ChecksumMetadataReporter.java similarity index 91% rename from archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumMetadataReporter.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ChecksumMetadataReporter.java index df732f656..2e2f41a04 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumMetadataReporter.java +++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ChecksumMetadataReporter.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -16,10 +16,10 @@ package org.apache.maven.repository.reporting; * limitations under the License. */ +import org.apache.maven.archiva.digest.Digester; +import org.apache.maven.archiva.digest.DigesterException; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.metadata.RepositoryMetadata; -import org.apache.maven.repository.digest.Digester; -import org.apache.maven.repository.digest.DigesterException; import org.codehaus.plexus.util.FileUtils; import java.io.File; @@ -29,7 +29,7 @@ import java.io.IOException; * This class reports invalid and mismatched checksums of artifacts and metadata files. * It validates MD5 and SHA-1 checksums. * - * @plexus.component role="org.apache.maven.repository.reporting.MetadataReportProcessor" role-hint="checksum-metadata" + * @plexus.component role="org.apache.maven.archiva.reporting.MetadataReportProcessor" role-hint="checksum-metadata" */ public class ChecksumMetadataReporter implements MetadataReportProcessor @@ -43,7 +43,7 @@ public class ChecksumMetadataReporter * @plexus.requirement role-hint="md5" */ private Digester md5Digester; - + /** * Validate the checksums of the metadata. Get the metadata file from the * repository then validate the checksum. diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultArtifactReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DefaultArtifactReportProcessor.java similarity index 97% rename from archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultArtifactReportProcessor.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DefaultArtifactReportProcessor.java index b869e7e49..040113af6 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultArtifactReportProcessor.java +++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DefaultArtifactReportProcessor.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -26,7 +26,7 @@ import java.util.Iterator; import java.util.List; /** - * @plexus.component role="org.apache.maven.repository.reporting.ArtifactReportProcessor" role-hint="default" + * @plexus.component role="org.apache.maven.archiva.reporting.ArtifactReportProcessor" role-hint="default" */ public class DefaultArtifactReportProcessor implements ArtifactReportProcessor diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultArtifactReporter.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DefaultArtifactReporter.java similarity index 95% rename from archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultArtifactReporter.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DefaultArtifactReporter.java index 32b4cd755..9d944a86f 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultArtifactReporter.java +++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DefaultArtifactReporter.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -24,7 +24,7 @@ import java.util.Iterator; import java.util.List; /** - * @plexus.component role="org.apache.maven.repository.reporting.ArtifactReporter" role-hint="default" + * @plexus.component role="org.apache.maven.archiva.reporting.ArtifactReporter" role-hint="default" */ public class DefaultArtifactReporter implements ArtifactReporter diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultRepositoryQueryLayer.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DefaultRepositoryQueryLayer.java similarity index 95% rename from archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultRepositoryQueryLayer.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DefaultRepositoryQueryLayer.java index 5570666dd..4b000fbe6 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultRepositoryQueryLayer.java +++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DefaultRepositoryQueryLayer.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultRepositoryQueryLayerFactory.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DefaultRepositoryQueryLayerFactory.java similarity index 88% rename from archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultRepositoryQueryLayerFactory.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DefaultRepositoryQueryLayerFactory.java index 56f9826dc..ec607b6f1 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultRepositoryQueryLayerFactory.java +++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DefaultRepositoryQueryLayerFactory.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -23,7 +23,7 @@ import org.apache.maven.artifact.repository.ArtifactRepository; * * @author Brett Porter * @version $Id$ - * @plexus.component role="org.apache.maven.repository.reporting.RepositoryQueryLayerFactory" + * @plexus.component role="org.apache.maven.archiva.reporting.RepositoryQueryLayerFactory" */ public class DefaultRepositoryQueryLayerFactory implements RepositoryQueryLayerFactory diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessor.java similarity index 84% rename from archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessor.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessor.java index df8c81a85..89f393d2b 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessor.java +++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessor.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -16,29 +16,29 @@ package org.apache.maven.repository.reporting; * limitations under the License. */ -import java.io.File; -import java.util.Iterator; -import java.util.List; - import org.apache.lucene.index.Term; import org.apache.lucene.search.TermQuery; +import org.apache.maven.archiva.digest.Digester; +import org.apache.maven.archiva.digest.DigesterException; +import org.apache.maven.archiva.indexing.RepositoryArtifactIndex; +import org.apache.maven.archiva.indexing.RepositoryArtifactIndexFactory; +import org.apache.maven.archiva.indexing.RepositoryIndexSearchException; +import org.apache.maven.archiva.indexing.lucene.LuceneQuery; +import org.apache.maven.archiva.indexing.record.StandardArtifactIndexRecord; +import org.apache.maven.archiva.indexing.record.StandardIndexRecordFields; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.model.Model; -import org.apache.maven.repository.digest.Digester; -import org.apache.maven.repository.digest.DigesterException; -import org.apache.maven.repository.indexing.RepositoryArtifactIndex; -import org.apache.maven.repository.indexing.RepositoryArtifactIndexFactory; -import org.apache.maven.repository.indexing.RepositoryIndexSearchException; -import org.apache.maven.repository.indexing.lucene.LuceneQuery; -import org.apache.maven.repository.indexing.record.StandardArtifactIndexRecord; -import org.apache.maven.repository.indexing.record.StandardIndexRecordFields; + +import java.io.File; +import java.util.Iterator; +import java.util.List; /** * Validates an artifact file for duplicates within the same groupId based from what's available in a repository index. * * @author Edwin Punzalan - * @plexus.component role="org.apache.maven.repository.reporting.ArtifactReportProcessor" role-hint="duplicate" + * @plexus.component role="org.apache.maven.archiva.reporting.ArtifactReportProcessor" role-hint="duplicate" */ public class DuplicateArtifactFileReportProcessor implements ArtifactReportProcessor diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/InvalidPomArtifactReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/InvalidPomArtifactReportProcessor.java similarity index 95% rename from archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/InvalidPomArtifactReportProcessor.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/InvalidPomArtifactReportProcessor.java index a11f35754..eeb5a6b4b 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/InvalidPomArtifactReportProcessor.java +++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/InvalidPomArtifactReportProcessor.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -32,7 +32,7 @@ import java.io.Reader; /** * This class validates well-formedness of pom xml file. * - * @plexus.component role="org.apache.maven.repository.reporting.ArtifactReportProcessor" role-hint="invalid-pom" + * @plexus.component role="org.apache.maven.archiva.reporting.ArtifactReportProcessor" role-hint="invalid-pom" */ public class InvalidPomArtifactReportProcessor implements ArtifactReportProcessor diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/LocationArtifactReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/LocationArtifactReportProcessor.java similarity index 97% rename from archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/LocationArtifactReportProcessor.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/LocationArtifactReportProcessor.java index 140425656..e49ef8298 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/LocationArtifactReportProcessor.java +++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/LocationArtifactReportProcessor.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -36,12 +36,15 @@ import java.util.jar.JarFile; * Validate the location of the artifact based on the values indicated * in its pom (both the pom packaged with the artifact & the pom in the * file system). - * @plexus.component role="org.apache.maven.repository.reporting.ArtifactReportProcessor" role-hint="artifact-location" + * + * @plexus.component role="org.apache.maven.archiva.reporting.ArtifactReportProcessor" role-hint="artifact-location" */ public class LocationArtifactReportProcessor implements ArtifactReportProcessor { - /** @plexus.requirement */ + /** + * @plexus.requirement + */ private ArtifactFactory artifactFactory; /** diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/MetadataReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/MetadataReportProcessor.java similarity index 95% rename from archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/MetadataReportProcessor.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/MetadataReportProcessor.java index 0431a8adf..712cb260e 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/MetadataReportProcessor.java +++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/MetadataReportProcessor.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ReportProcessorException.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ReportProcessorException.java similarity index 95% rename from archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ReportProcessorException.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ReportProcessorException.java index 5f73dbdc0..783f888c6 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ReportProcessorException.java +++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ReportProcessorException.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryMetadataResult.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/RepositoryMetadataResult.java similarity index 96% rename from archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryMetadataResult.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/RepositoryMetadataResult.java index 4c962986a..1c84623a9 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryMetadataResult.java +++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/RepositoryMetadataResult.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayer.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/RepositoryQueryLayer.java similarity index 87% rename from archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayer.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/RepositoryQueryLayer.java index 950f7a252..19a7956dd 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayer.java +++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/RepositoryQueryLayer.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -30,7 +30,9 @@ public interface RepositoryQueryLayer boolean containsArtifact( Artifact artifact ); - /** @todo I believe we can remove this [BP] - artifact should contain all the necessary version info */ + /** + * @todo I believe we can remove this [BP] - artifact should contain all the necessary version info + */ boolean containsArtifact( Artifact artifact, Snapshot snapshot ); List getVersions( Artifact artifact ) diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayerException.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/RepositoryQueryLayerException.java similarity index 95% rename from archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayerException.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/RepositoryQueryLayerException.java index ae7f77947..a95415398 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayerException.java +++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/RepositoryQueryLayerException.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayerFactory.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/RepositoryQueryLayerFactory.java similarity index 96% rename from archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayerFactory.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/RepositoryQueryLayerFactory.java index 00f42b30d..e69527b5e 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayerFactory.java +++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/RepositoryQueryLayerFactory.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractChecksumArtifactReporterTestCase.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/AbstractChecksumArtifactReporterTestCase.java similarity index 98% rename from archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractChecksumArtifactReporterTestCase.java rename to archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/AbstractChecksumArtifactReporterTestCase.java index 93b9b2e6e..a7e6a764f 100644 --- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractChecksumArtifactReporterTestCase.java +++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/AbstractChecksumArtifactReporterTestCase.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -16,8 +16,8 @@ package org.apache.maven.repository.reporting; * limitations under the License. */ -import org.apache.maven.repository.digest.Digester; -import org.apache.maven.repository.digest.DigesterException; +import org.apache.maven.archiva.digest.Digester; +import org.apache.maven.archiva.digest.DigesterException; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.IOUtil; diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractRepositoryQueryLayerTestCase.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/AbstractRepositoryQueryLayerTestCase.java similarity index 99% rename from archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractRepositoryQueryLayerTestCase.java rename to archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/AbstractRepositoryQueryLayerTestCase.java index 6de998c8f..0774095d5 100644 --- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractRepositoryQueryLayerTestCase.java +++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/AbstractRepositoryQueryLayerTestCase.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractRepositoryReportsTestCase.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/AbstractRepositoryReportsTestCase.java similarity index 97% rename from archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractRepositoryReportsTestCase.java rename to archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/AbstractRepositoryReportsTestCase.java index 45f12964e..f56d82e94 100644 --- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractRepositoryReportsTestCase.java +++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/AbstractRepositoryReportsTestCase.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReportProcessorTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/ArtifactReportProcessorTest.java similarity index 99% rename from archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReportProcessorTest.java rename to archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/ArtifactReportProcessorTest.java index 4d6c697f3..17b4723fd 100644 --- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReportProcessorTest.java +++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/ArtifactReportProcessorTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReporterTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/ArtifactReporterTest.java similarity index 99% rename from archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReporterTest.java rename to archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/ArtifactReporterTest.java index e3fc97f6b..e6a7e9ad5 100644 --- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReporterTest.java +++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/ArtifactReporterTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/BadMetadataReportProcessorTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/BadMetadataReportProcessorTest.java similarity index 99% rename from archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/BadMetadataReportProcessorTest.java rename to archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/BadMetadataReportProcessorTest.java index 828b27274..4a189b62a 100644 --- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/BadMetadataReportProcessorTest.java +++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/BadMetadataReportProcessorTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/CacheTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/CacheTest.java similarity index 98% rename from archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/CacheTest.java rename to archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/CacheTest.java index cfc83b309..123e92f30 100644 --- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/CacheTest.java +++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/CacheTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/CachedRepositoryQueryLayerTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/CachedRepositoryQueryLayerTest.java similarity index 97% rename from archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/CachedRepositoryQueryLayerTest.java rename to archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/CachedRepositoryQueryLayerTest.java index 11c0b8e95..44e3d3108 100644 --- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/CachedRepositoryQueryLayerTest.java +++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/CachedRepositoryQueryLayerTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ChecksumArtifactReporterTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/ChecksumArtifactReporterTest.java similarity index 98% rename from archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ChecksumArtifactReporterTest.java rename to archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/ChecksumArtifactReporterTest.java index 64585c52d..1cc7d12dd 100644 --- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ChecksumArtifactReporterTest.java +++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/ChecksumArtifactReporterTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -16,6 +16,7 @@ package org.apache.maven.repository.reporting; * limitations under the License. */ +import org.apache.maven.archiva.digest.DigesterException; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.DefaultArtifact; import org.apache.maven.artifact.handler.ArtifactHandler; @@ -25,7 +26,6 @@ import org.apache.maven.artifact.repository.metadata.GroupRepositoryMetadata; import org.apache.maven.artifact.repository.metadata.RepositoryMetadata; import org.apache.maven.artifact.repository.metadata.SnapshotArtifactRepositoryMetadata; import org.apache.maven.artifact.versioning.VersionRange; -import org.apache.maven.repository.digest.DigesterException; import java.io.File; import java.io.IOException; diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/DefaultArtifactReporterTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/DefaultArtifactReporterTest.java similarity index 99% rename from archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/DefaultArtifactReporterTest.java rename to archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/DefaultArtifactReporterTest.java index ac19ab3e0..fb4bb274f 100644 --- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/DefaultArtifactReporterTest.java +++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/DefaultArtifactReporterTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessorTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.java similarity index 95% rename from archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessorTest.java rename to archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.java index 31dec3015..3491e5cc5 100644 --- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessorTest.java +++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -16,12 +16,12 @@ package org.apache.maven.repository.reporting; * limitations under the License. */ +import org.apache.maven.archiva.indexing.RepositoryArtifactIndex; +import org.apache.maven.archiva.indexing.RepositoryArtifactIndexFactory; +import org.apache.maven.archiva.indexing.record.RepositoryIndexRecordFactory; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.model.Model; -import org.apache.maven.repository.indexing.RepositoryArtifactIndex; -import org.apache.maven.repository.indexing.RepositoryArtifactIndexFactory; -import org.apache.maven.repository.indexing.record.RepositoryIndexRecordFactory; import org.codehaus.plexus.util.FileUtils; import java.io.File; diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/GenericMockObject.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/GenericMockObject.java similarity index 97% rename from archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/GenericMockObject.java rename to archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/GenericMockObject.java index 7ab3de250..8e8a49c15 100644 --- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/GenericMockObject.java +++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/GenericMockObject.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/InvalidPomArtifactReportProcessorTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/InvalidPomArtifactReportProcessorTest.java similarity index 98% rename from archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/InvalidPomArtifactReportProcessorTest.java rename to archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/InvalidPomArtifactReportProcessorTest.java index 71c53d8bd..fd1fe91b3 100644 --- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/InvalidPomArtifactReportProcessorTest.java +++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/InvalidPomArtifactReportProcessorTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/LocationArtifactReportProcessorTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/LocationArtifactReportProcessorTest.java similarity index 99% rename from archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/LocationArtifactReportProcessorTest.java rename to archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/LocationArtifactReportProcessorTest.java index d892dd3a6..ddd83a7a2 100644 --- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/LocationArtifactReportProcessorTest.java +++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/LocationArtifactReportProcessorTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifact.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/MockArtifact.java similarity index 98% rename from archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifact.java rename to archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/MockArtifact.java index a9f3cd3f2..9e4482137 100644 --- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifact.java +++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/MockArtifact.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactFactory.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/MockArtifactFactory.java similarity index 98% rename from archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactFactory.java rename to archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/MockArtifactFactory.java index 7bdc708a9..bf4cb5382 100644 --- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactFactory.java +++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/MockArtifactFactory.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReportProcessor.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/MockArtifactReportProcessor.java similarity index 98% rename from archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReportProcessor.java rename to archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/MockArtifactReportProcessor.java index 00bdc23ae..54697973f 100644 --- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReportProcessor.java +++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/MockArtifactReportProcessor.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReporter.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/MockArtifactReporter.java similarity index 98% rename from archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReporter.java rename to archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/MockArtifactReporter.java index f13e660cf..0666b95c6 100755 --- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReporter.java +++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/MockArtifactReporter.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockRepositoryQueryLayer.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/MockRepositoryQueryLayer.java similarity index 97% rename from archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockRepositoryQueryLayer.java rename to archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/MockRepositoryQueryLayer.java index e6ec4eef3..6657a29a0 100644 --- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockRepositoryQueryLayer.java +++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/MockRepositoryQueryLayer.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ReportCondition.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/ReportCondition.java similarity index 97% rename from archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ReportCondition.java rename to archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/ReportCondition.java index 98df89646..fcabbbd78 100644 --- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ReportCondition.java +++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/ReportCondition.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.reporting; +package org.apache.maven.archiva.reporting; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-reports-standard/src/test/resources/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessorTest.xml b/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.xml similarity index 52% rename from archiva-reports-standard/src/test/resources/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessorTest.xml rename to archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.xml index d8b910c2e..e1311bb8b 100644 --- a/archiva-reports-standard/src/test/resources/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessorTest.xml +++ b/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.xml @@ -1,16 +1,16 @@ - org.apache.maven.repository.reporting.ArtifactReportProcessor + org.apache.maven.archiva.reporting.ArtifactReportProcessor duplicate - org.apache.maven.repository.reporting.DuplicateArtifactFileReportProcessor + org.apache.maven.archiva.reporting.DuplicateArtifactFileReportProcessor - org.apache.maven.repository.digest.Digester + org.apache.maven.archiva.digest.Digester md5 - org.apache.maven.repository.indexing.RepositoryArtifactIndexFactory + org.apache.maven.archiva.indexing.RepositoryArtifactIndexFactory diff --git a/archiva-utils/src/main/java/org/apache/maven/repository/digest/AbstractDigester.java b/archiva-utils/src/main/java/org/apache/maven/archiva/digest/AbstractDigester.java similarity index 98% rename from archiva-utils/src/main/java/org/apache/maven/repository/digest/AbstractDigester.java rename to archiva-utils/src/main/java/org/apache/maven/archiva/digest/AbstractDigester.java index c4c8cc7b1..3abc041d8 100644 --- a/archiva-utils/src/main/java/org/apache/maven/repository/digest/AbstractDigester.java +++ b/archiva-utils/src/main/java/org/apache/maven/archiva/digest/AbstractDigester.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.digest; +package org.apache.maven.archiva.digest; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-utils/src/main/java/org/apache/maven/repository/digest/AbstractStreamingDigester.java b/archiva-utils/src/main/java/org/apache/maven/archiva/digest/AbstractStreamingDigester.java similarity index 98% rename from archiva-utils/src/main/java/org/apache/maven/repository/digest/AbstractStreamingDigester.java rename to archiva-utils/src/main/java/org/apache/maven/archiva/digest/AbstractStreamingDigester.java index 7d148f657..4852f6043 100644 --- a/archiva-utils/src/main/java/org/apache/maven/repository/digest/AbstractStreamingDigester.java +++ b/archiva-utils/src/main/java/org/apache/maven/archiva/digest/AbstractStreamingDigester.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.digest; +package org.apache.maven.archiva.digest; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-utils/src/main/java/org/apache/maven/repository/digest/DigestUtils.java b/archiva-utils/src/main/java/org/apache/maven/archiva/digest/DigestUtils.java similarity index 97% rename from archiva-utils/src/main/java/org/apache/maven/repository/digest/DigestUtils.java rename to archiva-utils/src/main/java/org/apache/maven/archiva/digest/DigestUtils.java index 8bc76b8d2..e006284f1 100644 --- a/archiva-utils/src/main/java/org/apache/maven/repository/digest/DigestUtils.java +++ b/archiva-utils/src/main/java/org/apache/maven/archiva/digest/DigestUtils.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.digest; +package org.apache.maven.archiva.digest; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-utils/src/main/java/org/apache/maven/repository/digest/Digester.java b/archiva-utils/src/main/java/org/apache/maven/archiva/digest/Digester.java similarity index 95% rename from archiva-utils/src/main/java/org/apache/maven/repository/digest/Digester.java rename to archiva-utils/src/main/java/org/apache/maven/archiva/digest/Digester.java index 70fb8f6ee..231fa5527 100644 --- a/archiva-utils/src/main/java/org/apache/maven/repository/digest/Digester.java +++ b/archiva-utils/src/main/java/org/apache/maven/archiva/digest/Digester.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.digest; +package org.apache.maven.archiva.digest; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -17,7 +17,6 @@ package org.apache.maven.repository.digest; */ import java.io.File; -import java.io.InputStream; /** * Create a digest for a file. diff --git a/archiva-utils/src/main/java/org/apache/maven/repository/digest/DigesterException.java b/archiva-utils/src/main/java/org/apache/maven/archiva/digest/DigesterException.java similarity index 95% rename from archiva-utils/src/main/java/org/apache/maven/repository/digest/DigesterException.java rename to archiva-utils/src/main/java/org/apache/maven/archiva/digest/DigesterException.java index 789957b84..6391d8c8b 100644 --- a/archiva-utils/src/main/java/org/apache/maven/repository/digest/DigesterException.java +++ b/archiva-utils/src/main/java/org/apache/maven/archiva/digest/DigesterException.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.digest; +package org.apache.maven.archiva.digest; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-utils/src/main/java/org/apache/maven/repository/digest/Md5Digester.java b/archiva-utils/src/main/java/org/apache/maven/archiva/digest/Md5Digester.java similarity index 86% rename from archiva-utils/src/main/java/org/apache/maven/repository/digest/Md5Digester.java rename to archiva-utils/src/main/java/org/apache/maven/archiva/digest/Md5Digester.java index 3ac6a04b2..22e4a008b 100644 --- a/archiva-utils/src/main/java/org/apache/maven/repository/digest/Md5Digester.java +++ b/archiva-utils/src/main/java/org/apache/maven/archiva/digest/Md5Digester.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.digest; +package org.apache.maven.archiva.digest; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -20,8 +20,8 @@ import java.security.NoSuchAlgorithmException; /** * Digester that does MD5 Message Digesting Only. - * - * @plexus.component role="org.apache.maven.repository.digest.Digester" role-hint="md5" + * + * @plexus.component role="org.apache.maven.archiva.digest.Digester" role-hint="md5" */ public class Md5Digester extends AbstractDigester diff --git a/archiva-utils/src/main/java/org/apache/maven/repository/digest/Sha1Digester.java b/archiva-utils/src/main/java/org/apache/maven/archiva/digest/Sha1Digester.java similarity index 87% rename from archiva-utils/src/main/java/org/apache/maven/repository/digest/Sha1Digester.java rename to archiva-utils/src/main/java/org/apache/maven/archiva/digest/Sha1Digester.java index f0383a0c1..4c883479e 100644 --- a/archiva-utils/src/main/java/org/apache/maven/repository/digest/Sha1Digester.java +++ b/archiva-utils/src/main/java/org/apache/maven/archiva/digest/Sha1Digester.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.digest; +package org.apache.maven.archiva.digest; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -21,7 +21,7 @@ import java.security.NoSuchAlgorithmException; /** * Digester that does SHA1 Message Digesting Only. * - * @plexus.component role="org.apache.maven.repository.digest.Digester" role-hint="sha1" + * @plexus.component role="org.apache.maven.archiva.digest.Digester" role-hint="sha1" */ public class Sha1Digester extends AbstractDigester diff --git a/archiva-utils/src/main/java/org/apache/maven/repository/digest/StreamingDigester.java b/archiva-utils/src/main/java/org/apache/maven/archiva/digest/StreamingDigester.java similarity index 97% rename from archiva-utils/src/main/java/org/apache/maven/repository/digest/StreamingDigester.java rename to archiva-utils/src/main/java/org/apache/maven/archiva/digest/StreamingDigester.java index ec0c5a4b7..d2cf2886d 100644 --- a/archiva-utils/src/main/java/org/apache/maven/repository/digest/StreamingDigester.java +++ b/archiva-utils/src/main/java/org/apache/maven/archiva/digest/StreamingDigester.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.digest; +package org.apache.maven.archiva.digest; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-utils/src/main/java/org/apache/maven/repository/digest/StreamingMd5Digester.java b/archiva-utils/src/main/java/org/apache/maven/archiva/digest/StreamingMd5Digester.java similarity index 87% rename from archiva-utils/src/main/java/org/apache/maven/repository/digest/StreamingMd5Digester.java rename to archiva-utils/src/main/java/org/apache/maven/archiva/digest/StreamingMd5Digester.java index 2fc11e45c..10c0ba14e 100644 --- a/archiva-utils/src/main/java/org/apache/maven/repository/digest/StreamingMd5Digester.java +++ b/archiva-utils/src/main/java/org/apache/maven/archiva/digest/StreamingMd5Digester.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.digest; +package org.apache.maven.archiva.digest; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -22,7 +22,7 @@ import java.security.NoSuchAlgorithmException; * An MD5 implementation of the streaming digester. * * @author Brett Porter - * @plexus.component role="org.apache.maven.repository.digest.StreamingDigester" role-hint="md5" + * @plexus.component role="org.apache.maven.archiva.digest.StreamingDigester" role-hint="md5" */ public class StreamingMd5Digester extends AbstractStreamingDigester diff --git a/archiva-utils/src/main/java/org/apache/maven/repository/digest/StreamingSha1Digester.java b/archiva-utils/src/main/java/org/apache/maven/archiva/digest/StreamingSha1Digester.java similarity index 87% rename from archiva-utils/src/main/java/org/apache/maven/repository/digest/StreamingSha1Digester.java rename to archiva-utils/src/main/java/org/apache/maven/archiva/digest/StreamingSha1Digester.java index 845989eca..253a83133 100644 --- a/archiva-utils/src/main/java/org/apache/maven/repository/digest/StreamingSha1Digester.java +++ b/archiva-utils/src/main/java/org/apache/maven/archiva/digest/StreamingSha1Digester.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.digest; +package org.apache.maven.archiva.digest; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -22,7 +22,7 @@ import java.security.NoSuchAlgorithmException; * An SHA-1 implementation of the streaming digester. * * @author Brett Porter - * @plexus.component role="org.apache.maven.repository.digest.StreamingDigester" role-hint="sha1" + * @plexus.component role="org.apache.maven.archiva.digest.StreamingDigester" role-hint="sha1" */ public class StreamingSha1Digester extends AbstractStreamingDigester diff --git a/archiva-utils/src/test/java/org/apache/maven/repository/digest/DigesterTest.java b/archiva-utils/src/test/java/org/apache/maven/archiva/digest/DigesterTest.java similarity index 99% rename from archiva-utils/src/test/java/org/apache/maven/repository/digest/DigesterTest.java rename to archiva-utils/src/test/java/org/apache/maven/archiva/digest/DigesterTest.java index 97477d142..4e9a9782a 100644 --- a/archiva-utils/src/test/java/org/apache/maven/repository/digest/DigesterTest.java +++ b/archiva-utils/src/test/java/org/apache/maven/archiva/digest/DigesterTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.digest; +package org.apache.maven.archiva.digest; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/BrowseAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/BrowseAction.java similarity index 91% rename from archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/BrowseAction.java rename to archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/BrowseAction.java index ad7e9cbb5..eb5b7af71 100644 --- a/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/BrowseAction.java +++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/BrowseAction.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.manager.web.action; +package org.apache.maven.archiva.manager.web.action; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -22,17 +22,17 @@ import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.TermQuery; -import org.apache.maven.repository.configuration.Configuration; -import org.apache.maven.repository.configuration.ConfigurationStore; -import org.apache.maven.repository.configuration.ConfigurationStoreException; -import org.apache.maven.repository.configuration.ConfiguredRepositoryFactory; -import org.apache.maven.repository.indexing.RepositoryArtifactIndex; -import org.apache.maven.repository.indexing.RepositoryArtifactIndexFactory; -import org.apache.maven.repository.indexing.RepositoryIndexException; -import org.apache.maven.repository.indexing.RepositoryIndexSearchException; -import org.apache.maven.repository.indexing.lucene.LuceneQuery; -import org.apache.maven.repository.indexing.record.StandardArtifactIndexRecord; -import org.apache.maven.repository.indexing.record.StandardIndexRecordFields; +import org.apache.maven.archiva.configuration.Configuration; +import org.apache.maven.archiva.configuration.ConfigurationStore; +import org.apache.maven.archiva.configuration.ConfigurationStoreException; +import org.apache.maven.archiva.configuration.ConfiguredRepositoryFactory; +import org.apache.maven.archiva.indexing.RepositoryArtifactIndex; +import org.apache.maven.archiva.indexing.RepositoryArtifactIndexFactory; +import org.apache.maven.archiva.indexing.RepositoryIndexException; +import org.apache.maven.archiva.indexing.RepositoryIndexSearchException; +import org.apache.maven.archiva.indexing.lucene.LuceneQuery; +import org.apache.maven.archiva.indexing.record.StandardArtifactIndexRecord; +import org.apache.maven.archiva.indexing.record.StandardIndexRecordFields; import org.codehaus.plexus.util.StringUtils; import java.io.File; diff --git a/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/ProxyAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/ProxyAction.java similarity index 93% rename from archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/ProxyAction.java rename to archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/ProxyAction.java index 246463d5d..761e9e785 100644 --- a/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/ProxyAction.java +++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/ProxyAction.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.manager.web.action; +package org.apache.maven.archiva.manager.web.action; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -17,8 +17,8 @@ package org.apache.maven.repository.manager.web.action; */ import com.opensymphony.xwork.ActionSupport; -import org.apache.maven.repository.proxy.ProxyException; -import org.apache.maven.repository.proxy.ProxyManager; +import org.apache.maven.archiva.proxy.ProxyException; +import org.apache.maven.archiva.proxy.ProxyManager; import org.apache.maven.wagon.ResourceDoesNotExistException; import java.io.File; diff --git a/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/SearchAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/SearchAction.java similarity index 85% rename from archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/SearchAction.java rename to archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/SearchAction.java index d17b19349..dac179a7a 100644 --- a/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/SearchAction.java +++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/SearchAction.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.manager.web.action; +package org.apache.maven.archiva.manager.web.action; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -22,16 +22,16 @@ import org.apache.lucene.index.Term; import org.apache.lucene.queryParser.MultiFieldQueryParser; import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.search.TermQuery; -import org.apache.maven.repository.configuration.Configuration; -import org.apache.maven.repository.configuration.ConfigurationStore; -import org.apache.maven.repository.configuration.ConfigurationStoreException; -import org.apache.maven.repository.configuration.ConfiguredRepositoryFactory; -import org.apache.maven.repository.indexing.RepositoryArtifactIndex; -import org.apache.maven.repository.indexing.RepositoryArtifactIndexFactory; -import org.apache.maven.repository.indexing.RepositoryIndexException; -import org.apache.maven.repository.indexing.RepositoryIndexSearchException; -import org.apache.maven.repository.indexing.lucene.LuceneQuery; -import org.apache.maven.repository.indexing.record.StandardIndexRecordFields; +import org.apache.maven.archiva.configuration.Configuration; +import org.apache.maven.archiva.configuration.ConfigurationStore; +import org.apache.maven.archiva.configuration.ConfigurationStoreException; +import org.apache.maven.archiva.configuration.ConfiguredRepositoryFactory; +import org.apache.maven.archiva.indexing.RepositoryArtifactIndex; +import org.apache.maven.archiva.indexing.RepositoryArtifactIndexFactory; +import org.apache.maven.archiva.indexing.RepositoryIndexException; +import org.apache.maven.archiva.indexing.RepositoryIndexSearchException; +import org.apache.maven.archiva.indexing.lucene.LuceneQuery; +import org.apache.maven.archiva.indexing.record.StandardIndexRecordFields; import java.io.File; import java.net.MalformedURLException; diff --git a/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/ShowArtifactAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/ShowArtifactAction.java similarity index 91% rename from archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/ShowArtifactAction.java rename to archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/ShowArtifactAction.java index b739f6aa9..43a83c478 100644 --- a/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/ShowArtifactAction.java +++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/ShowArtifactAction.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.manager.web.action; +package org.apache.maven.archiva.manager.web.action; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -17,6 +17,10 @@ package org.apache.maven.repository.manager.web.action; */ import com.opensymphony.xwork.ActionSupport; +import org.apache.maven.archiva.configuration.Configuration; +import org.apache.maven.archiva.configuration.ConfigurationStore; +import org.apache.maven.archiva.configuration.ConfigurationStoreException; +import org.apache.maven.archiva.configuration.ConfiguredRepositoryFactory; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.repository.ArtifactRepository; @@ -24,10 +28,6 @@ import org.apache.maven.model.Model; import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectBuilder; import org.apache.maven.project.ProjectBuildingException; -import org.apache.maven.repository.configuration.Configuration; -import org.apache.maven.repository.configuration.ConfigurationStore; -import org.apache.maven.repository.configuration.ConfigurationStoreException; -import org.apache.maven.repository.configuration.ConfiguredRepositoryFactory; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; diff --git a/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/AbstractConfigureRepositoryAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/admin/AbstractConfigureRepositoryAction.java similarity index 88% rename from archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/AbstractConfigureRepositoryAction.java rename to archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/admin/AbstractConfigureRepositoryAction.java index 223136b74..0df9a3c4c 100644 --- a/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/AbstractConfigureRepositoryAction.java +++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/admin/AbstractConfigureRepositoryAction.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.manager.web.action.admin; +package org.apache.maven.archiva.manager.web.action.admin; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -19,12 +19,12 @@ package org.apache.maven.repository.manager.web.action.admin; import com.opensymphony.xwork.ActionSupport; import com.opensymphony.xwork.ModelDriven; import com.opensymphony.xwork.Preparable; -import org.apache.maven.repository.configuration.AbstractRepositoryConfiguration; -import org.apache.maven.repository.configuration.Configuration; -import org.apache.maven.repository.configuration.ConfigurationChangeException; -import org.apache.maven.repository.configuration.ConfigurationStore; -import org.apache.maven.repository.configuration.ConfigurationStoreException; -import org.apache.maven.repository.configuration.InvalidConfigurationException; +import org.apache.maven.archiva.configuration.AbstractRepositoryConfiguration; +import org.apache.maven.archiva.configuration.Configuration; +import org.apache.maven.archiva.configuration.ConfigurationChangeException; +import org.apache.maven.archiva.configuration.ConfigurationStore; +import org.apache.maven.archiva.configuration.ConfigurationStoreException; +import org.apache.maven.archiva.configuration.InvalidConfigurationException; import java.io.IOException; diff --git a/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/AbstractDeleteRepositoryAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/admin/AbstractDeleteRepositoryAction.java similarity index 84% rename from archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/AbstractDeleteRepositoryAction.java rename to archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/admin/AbstractDeleteRepositoryAction.java index 31244c227..134cf516b 100644 --- a/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/AbstractDeleteRepositoryAction.java +++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/admin/AbstractDeleteRepositoryAction.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.manager.web.action.admin; +package org.apache.maven.archiva.manager.web.action.admin; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -16,13 +16,12 @@ package org.apache.maven.repository.manager.web.action.admin; * limitations under the License. */ -import org.apache.maven.repository.configuration.AbstractRepositoryConfiguration; -import org.apache.maven.repository.configuration.Configuration; -import org.apache.maven.repository.configuration.ConfigurationChangeException; -import org.apache.maven.repository.configuration.ConfigurationStore; -import org.apache.maven.repository.configuration.ConfigurationStoreException; -import org.apache.maven.repository.configuration.InvalidConfigurationException; -import org.apache.maven.repository.configuration.RepositoryConfiguration; +import org.apache.maven.archiva.configuration.AbstractRepositoryConfiguration; +import org.apache.maven.archiva.configuration.Configuration; +import org.apache.maven.archiva.configuration.ConfigurationChangeException; +import org.apache.maven.archiva.configuration.ConfigurationStore; +import org.apache.maven.archiva.configuration.ConfigurationStoreException; +import org.apache.maven.archiva.configuration.InvalidConfigurationException; import org.codehaus.plexus.xwork.action.PlexusActionSupport; import java.io.IOException; diff --git a/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/admin/ConfigureAction.java similarity index 81% rename from archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureAction.java rename to archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/admin/ConfigureAction.java index 5077365bb..b6688a9c5 100644 --- a/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureAction.java +++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/admin/ConfigureAction.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.manager.web.action.admin; +package org.apache.maven.archiva.manager.web.action.admin; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -19,13 +19,13 @@ package org.apache.maven.repository.manager.web.action.admin; import com.opensymphony.xwork.ActionSupport; import com.opensymphony.xwork.ModelDriven; import com.opensymphony.xwork.Preparable; -import org.apache.maven.repository.configuration.Configuration; -import org.apache.maven.repository.configuration.ConfigurationChangeException; -import org.apache.maven.repository.configuration.ConfigurationStore; -import org.apache.maven.repository.configuration.ConfigurationStoreException; -import org.apache.maven.repository.configuration.InvalidConfigurationException; -import org.apache.maven.repository.indexing.RepositoryIndexException; -import org.apache.maven.repository.indexing.RepositoryIndexSearchException; +import org.apache.maven.archiva.configuration.Configuration; +import org.apache.maven.archiva.configuration.ConfigurationChangeException; +import org.apache.maven.archiva.configuration.ConfigurationStore; +import org.apache.maven.archiva.configuration.ConfigurationStoreException; +import org.apache.maven.archiva.configuration.InvalidConfigurationException; +import org.apache.maven.archiva.indexing.RepositoryIndexException; +import org.apache.maven.archiva.indexing.RepositoryIndexSearchException; import java.io.File; import java.io.IOException; diff --git a/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureProxiedRepositoryAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/admin/ConfigureProxiedRepositoryAction.java similarity index 87% rename from archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureProxiedRepositoryAction.java rename to archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/admin/ConfigureProxiedRepositoryAction.java index 82607f814..f9798ad79 100644 --- a/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureProxiedRepositoryAction.java +++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/admin/ConfigureProxiedRepositoryAction.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.manager.web.action.admin; +package org.apache.maven.archiva.manager.web.action.admin; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -16,8 +16,8 @@ package org.apache.maven.repository.manager.web.action.admin; * limitations under the License. */ -import org.apache.maven.repository.configuration.AbstractRepositoryConfiguration; -import org.apache.maven.repository.configuration.ProxiedRepositoryConfiguration; +import org.apache.maven.archiva.configuration.AbstractRepositoryConfiguration; +import org.apache.maven.archiva.configuration.ProxiedRepositoryConfiguration; import java.io.IOException; diff --git a/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureRepositoryAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/admin/ConfigureRepositoryAction.java similarity index 90% rename from archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureRepositoryAction.java rename to archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/admin/ConfigureRepositoryAction.java index 9c00b52a0..43fed553f 100644 --- a/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureRepositoryAction.java +++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/admin/ConfigureRepositoryAction.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.manager.web.action.admin; +package org.apache.maven.archiva.manager.web.action.admin; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -16,8 +16,8 @@ package org.apache.maven.repository.manager.web.action.admin; * limitations under the License. */ -import org.apache.maven.repository.configuration.RepositoryConfiguration; -import org.apache.maven.repository.configuration.AbstractRepositoryConfiguration; +import org.apache.maven.archiva.configuration.AbstractRepositoryConfiguration; +import org.apache.maven.archiva.configuration.RepositoryConfiguration; import java.io.File; import java.io.IOException; diff --git a/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureSyncedRepositoryAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/admin/ConfigureSyncedRepositoryAction.java similarity index 87% rename from archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureSyncedRepositoryAction.java rename to archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/admin/ConfigureSyncedRepositoryAction.java index 7546238bc..863412f5f 100644 --- a/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureSyncedRepositoryAction.java +++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/admin/ConfigureSyncedRepositoryAction.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.manager.web.action.admin; +package org.apache.maven.archiva.manager.web.action.admin; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -16,8 +16,8 @@ package org.apache.maven.repository.manager.web.action.admin; * limitations under the License. */ -import org.apache.maven.repository.configuration.AbstractRepositoryConfiguration; -import org.apache.maven.repository.configuration.SyncedRepositoryConfiguration; +import org.apache.maven.archiva.configuration.AbstractRepositoryConfiguration; +import org.apache.maven.archiva.configuration.SyncedRepositoryConfiguration; import java.io.IOException; diff --git a/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteProxiedRepositoryAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/admin/DeleteProxiedRepositoryAction.java similarity index 78% rename from archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteProxiedRepositoryAction.java rename to archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/admin/DeleteProxiedRepositoryAction.java index 69a7500fe..d6faf051b 100644 --- a/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteProxiedRepositoryAction.java +++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/admin/DeleteProxiedRepositoryAction.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.manager.web.action.admin; +package org.apache.maven.archiva.manager.web.action.admin; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -16,11 +16,9 @@ package org.apache.maven.repository.manager.web.action.admin; * limitations under the License. */ -import org.apache.maven.repository.configuration.AbstractRepositoryConfiguration; -import org.apache.maven.repository.configuration.Configuration; -import org.apache.maven.repository.configuration.ProxiedRepositoryConfiguration; -import org.apache.maven.repository.configuration.RepositoryConfiguration; -import org.codehaus.plexus.util.FileUtils; +import org.apache.maven.archiva.configuration.AbstractRepositoryConfiguration; +import org.apache.maven.archiva.configuration.Configuration; +import org.apache.maven.archiva.configuration.ProxiedRepositoryConfiguration; import java.io.IOException; diff --git a/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteRepositoryAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/admin/DeleteRepositoryAction.java similarity index 85% rename from archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteRepositoryAction.java rename to archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/admin/DeleteRepositoryAction.java index 0823afc61..127bc642d 100644 --- a/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteRepositoryAction.java +++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/admin/DeleteRepositoryAction.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.manager.web.action.admin; +package org.apache.maven.archiva.manager.web.action.admin; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -16,9 +16,9 @@ package org.apache.maven.repository.manager.web.action.admin; * limitations under the License. */ -import org.apache.maven.repository.configuration.AbstractRepositoryConfiguration; -import org.apache.maven.repository.configuration.Configuration; -import org.apache.maven.repository.configuration.RepositoryConfiguration; +import org.apache.maven.archiva.configuration.AbstractRepositoryConfiguration; +import org.apache.maven.archiva.configuration.Configuration; +import org.apache.maven.archiva.configuration.RepositoryConfiguration; import org.codehaus.plexus.util.FileUtils; import java.io.IOException; diff --git a/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteSyncedRepositoryAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/admin/DeleteSyncedRepositoryAction.java similarity index 83% rename from archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteSyncedRepositoryAction.java rename to archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/admin/DeleteSyncedRepositoryAction.java index f12fe09e3..c22ca2395 100644 --- a/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteSyncedRepositoryAction.java +++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/admin/DeleteSyncedRepositoryAction.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.manager.web.action.admin; +package org.apache.maven.archiva.manager.web.action.admin; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -16,9 +16,9 @@ package org.apache.maven.repository.manager.web.action.admin; * limitations under the License. */ -import org.apache.maven.repository.configuration.AbstractRepositoryConfiguration; -import org.apache.maven.repository.configuration.SyncedRepositoryConfiguration; -import org.apache.maven.repository.configuration.Configuration; +import org.apache.maven.archiva.configuration.AbstractRepositoryConfiguration; +import org.apache.maven.archiva.configuration.Configuration; +import org.apache.maven.archiva.configuration.SyncedRepositoryConfiguration; import java.io.IOException; diff --git a/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/RunIndexerAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/admin/RunIndexerAction.java similarity index 84% rename from archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/RunIndexerAction.java rename to archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/admin/RunIndexerAction.java index 244346081..955e1e29b 100644 --- a/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/RunIndexerAction.java +++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/action/admin/RunIndexerAction.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.manager.web.action.admin; +package org.apache.maven.archiva.manager.web.action.admin; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -17,8 +17,8 @@ package org.apache.maven.repository.manager.web.action.admin; */ import com.opensymphony.xwork.ActionSupport; -import org.apache.maven.repository.scheduler.RepositoryTaskScheduler; -import org.apache.maven.repository.scheduler.TaskExecutionException; +import org.apache.maven.archiva.scheduler.RepositoryTaskScheduler; +import org.apache.maven.archiva.scheduler.TaskExecutionException; /** * Configures the application. diff --git a/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/interceptor/ConfigurationInterceptor.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/interceptor/ConfigurationInterceptor.java similarity index 92% rename from archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/interceptor/ConfigurationInterceptor.java rename to archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/interceptor/ConfigurationInterceptor.java index 388c7222a..0542c1a2b 100644 --- a/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/interceptor/ConfigurationInterceptor.java +++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/interceptor/ConfigurationInterceptor.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.manager.web.interceptor; +package org.apache.maven.archiva.manager.web.interceptor; /* * Copyright 2005-2006 The Apache Software Foundation. @@ -18,8 +18,8 @@ package org.apache.maven.repository.manager.web.interceptor; import com.opensymphony.xwork.ActionInvocation; import com.opensymphony.xwork.interceptor.Interceptor; -import org.apache.maven.repository.configuration.Configuration; -import org.apache.maven.repository.configuration.ConfigurationStore; +import org.apache.maven.archiva.configuration.Configuration; +import org.apache.maven.archiva.configuration.ConfigurationStore; import org.codehaus.plexus.logging.AbstractLogEnabled; /** diff --git a/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/mapper/RepositoryActionMapper.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/mapper/RepositoryActionMapper.java similarity index 98% rename from archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/mapper/RepositoryActionMapper.java rename to archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/mapper/RepositoryActionMapper.java index ae89c3704..29ba96ebf 100644 --- a/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/mapper/RepositoryActionMapper.java +++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/manager/web/mapper/RepositoryActionMapper.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.manager.web.mapper; +package org.apache.maven.archiva.manager.web.mapper; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-webapp/src/main/resources/META-INF/plexus/application.xml b/archiva-webapp/src/main/resources/META-INF/plexus/application.xml index 89bfd4b7e..4ce70d697 100644 --- a/archiva-webapp/src/main/resources/META-INF/plexus/application.xml +++ b/archiva-webapp/src/main/resources/META-INF/plexus/application.xml @@ -94,7 +94,7 @@ - org.apache.maven.repository.scheduler.RepositoryTaskScheduler + org.apache.maven.archiva.scheduler.RepositoryTaskScheduler diff --git a/archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/SearchAction-checksumSearch-validation.xml b/archiva-webapp/src/main/resources/org/apache/maven/archiva/manager/web/action/SearchAction-checksumSearch-validation.xml similarity index 100% rename from archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/SearchAction-checksumSearch-validation.xml rename to archiva-webapp/src/main/resources/org/apache/maven/archiva/manager/web/action/SearchAction-checksumSearch-validation.xml diff --git a/archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/SearchAction-quickSearch-validation.xml b/archiva-webapp/src/main/resources/org/apache/maven/archiva/manager/web/action/SearchAction-quickSearch-validation.xml similarity index 100% rename from archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/SearchAction-quickSearch-validation.xml rename to archiva-webapp/src/main/resources/org/apache/maven/archiva/manager/web/action/SearchAction-quickSearch-validation.xml diff --git a/archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureAction-validation.xml b/archiva-webapp/src/main/resources/org/apache/maven/archiva/manager/web/action/admin/ConfigureAction-validation.xml similarity index 100% rename from archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureAction-validation.xml rename to archiva-webapp/src/main/resources/org/apache/maven/archiva/manager/web/action/admin/ConfigureAction-validation.xml diff --git a/archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureProxiedRepositoryAction-validation.xml b/archiva-webapp/src/main/resources/org/apache/maven/archiva/manager/web/action/admin/ConfigureProxiedRepositoryAction-validation.xml similarity index 100% rename from archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureProxiedRepositoryAction-validation.xml rename to archiva-webapp/src/main/resources/org/apache/maven/archiva/manager/web/action/admin/ConfigureProxiedRepositoryAction-validation.xml diff --git a/archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureRepositoryAction-validation.xml b/archiva-webapp/src/main/resources/org/apache/maven/archiva/manager/web/action/admin/ConfigureRepositoryAction-validation.xml similarity index 100% rename from archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureRepositoryAction-validation.xml rename to archiva-webapp/src/main/resources/org/apache/maven/archiva/manager/web/action/admin/ConfigureRepositoryAction-validation.xml diff --git a/archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureSyncedRepositoryAction-addSelectedSyncedRepository-validation.xml b/archiva-webapp/src/main/resources/org/apache/maven/archiva/manager/web/action/admin/ConfigureSyncedRepositoryAction-addSelectedSyncedRepository-validation.xml similarity index 100% rename from archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureSyncedRepositoryAction-addSelectedSyncedRepository-validation.xml rename to archiva-webapp/src/main/resources/org/apache/maven/archiva/manager/web/action/admin/ConfigureSyncedRepositoryAction-addSelectedSyncedRepository-validation.xml diff --git a/archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureSyncedRepositoryAction-validation.xml b/archiva-webapp/src/main/resources/org/apache/maven/archiva/manager/web/action/admin/ConfigureSyncedRepositoryAction-validation.xml similarity index 100% rename from archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureSyncedRepositoryAction-validation.xml rename to archiva-webapp/src/main/resources/org/apache/maven/archiva/manager/web/action/admin/ConfigureSyncedRepositoryAction-validation.xml diff --git a/archiva-webapp/src/main/resources/webwork.properties b/archiva-webapp/src/main/resources/webwork.properties index 6837803ce..7da0abe60 100644 --- a/archiva-webapp/src/main/resources/webwork.properties +++ b/archiva-webapp/src/main/resources/webwork.properties @@ -1,5 +1,5 @@ # define our own action mapper here -webwork.mapper.class=org.apache.maven.repository.manager.web.mapper.RepositoryActionMapper +webwork.mapper.class=org.apache.maven.archiva.manager.web.mapper.RepositoryActionMapper webwork.objectFactory = org.codehaus.plexus.xwork.PlexusObjectFactory # TODO: package up a theme and share with Continuum. Should contain everything from xhtml, and set templateDir to WEB-INF/themes \ No newline at end of file diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp index bfc1b0959..f0106fbde 100644 --- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp +++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp @@ -19,7 +19,7 @@ Find Artifact - + @@ -56,11 +56,11 @@ - + - - + +

@@ -69,12 +69,12 @@ not be uploaded to the server. See the progress bar below for progress of locally creating a checksum that is uploaded to the server after you hit "Go!". - +

-

diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/form.jspf b/archiva-webapp/src/main/webapp/WEB-INF/jsp/form.jspf deleted file mode 100644 index 6049fe788..000000000 --- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/form.jspf +++ /dev/null @@ -1,53 +0,0 @@ -<%-- - ~ Copyright 2005-2006 The Apache Software Foundation. - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --%> - - - -

Search by MD5 (select an artifact):

- -
- - - -
- -

- - -

- -

Search:

- -
- - -
- -

Search by Java Package:

- -
- - -
- - diff --git a/archiva-webapp/src/test/java/org/apache/maven/repository/proxy/web/action/test/stub/HttpServletRequestStub.java b/archiva-webapp/src/test/java/org/apache/maven/archiva/proxy/web/action/test/stub/HttpServletRequestStub.java similarity index 97% rename from archiva-webapp/src/test/java/org/apache/maven/repository/proxy/web/action/test/stub/HttpServletRequestStub.java rename to archiva-webapp/src/test/java/org/apache/maven/archiva/proxy/web/action/test/stub/HttpServletRequestStub.java index 02c8fe5a7..fece70f3b 100644 --- a/archiva-webapp/src/test/java/org/apache/maven/repository/proxy/web/action/test/stub/HttpServletRequestStub.java +++ b/archiva-webapp/src/test/java/org/apache/maven/archiva/proxy/web/action/test/stub/HttpServletRequestStub.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.proxy.web.action.test.stub; +package org.apache.maven.archiva.proxy.web.action.test.stub; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-webapp/src/test/java/org/apache/maven/repository/proxy/web/action/test/stub/ServletRequestStub.java b/archiva-webapp/src/test/java/org/apache/maven/archiva/proxy/web/action/test/stub/ServletRequestStub.java similarity index 98% rename from archiva-webapp/src/test/java/org/apache/maven/repository/proxy/web/action/test/stub/ServletRequestStub.java rename to archiva-webapp/src/test/java/org/apache/maven/archiva/proxy/web/action/test/stub/ServletRequestStub.java index e5919d19b..be928468a 100644 --- a/archiva-webapp/src/test/java/org/apache/maven/repository/proxy/web/action/test/stub/ServletRequestStub.java +++ b/archiva-webapp/src/test/java/org/apache/maven/archiva/proxy/web/action/test/stub/ServletRequestStub.java @@ -1,4 +1,4 @@ -package org.apache.maven.repository.proxy.web.action.test.stub; +package org.apache.maven.archiva.proxy.web.action.test.stub; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/design/white-site/pom.xml b/design/white-site/pom.xml index a902cd665..5139e8210 100644 --- a/design/white-site/pom.xml +++ b/design/white-site/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.apache.maven.repository + org.apache.maven.archiva maven-repository-manager-white-site 1.0-SNAPSHOT Maven Repository Manager White Site -- 2.39.5