From a0c5e5a0b0ad6502b0e3c82862bf57287c6a1c15 Mon Sep 17 00:00:00 2001 From: Martin Schreier Date: Sun, 9 Jan 2022 23:14:44 +0100 Subject: [PATCH] Splitting configuration module. Adding mapper interface. --- .../apache/archiva/common/ModelMapper.java | 78 ++++++++ .../archiva/common/ModelMapperFactory.java | 40 ++++ .../archiva-configuration-model/pom.xml | 44 +++++ .../AbstractRepositoryConfiguration.java | 5 +- ...tractRepositoryConnectorConfiguration.java | 5 +- .../model}/ArchivaDefaultConfiguration.java | 5 +- .../model}/ArchivaRuntimeConfiguration.java | 5 +- .../model}/CacheConfiguration.java | 5 +- .../configuration/model}/Configuration.java | 8 +- .../model/ConfigurationModel.java | 25 +++ .../model}/ConfigurationNames.java | 5 +- .../model}/FileLockConfiguration.java | 5 +- .../configuration/model}/FileType.java | 5 +- .../model}/LdapConfiguration.java | 5 +- .../model}/LdapGroupMapping.java | 5 +- .../model}/LegacyArtifactPath.java | 5 +- .../ManagedRepositoryConfiguration.java | 7 +- .../model}/NetworkConfiguration.java | 5 +- .../model}/NetworkProxyConfiguration.java | 5 +- .../model}/OrganisationInformation.java | 5 +- .../model}/ProxyConnectorConfiguration.java | 5 +- .../ProxyConnectorRuleConfiguration.java | 5 +- .../model}/RedbackRuntimeConfiguration.java | 5 +- .../model}/RemoteRepositoryConfiguration.java | 7 +- .../model}/RepositoryCheckPath.java | 5 +- .../model}/RepositoryGroupConfiguration.java | 7 +- .../RepositoryScanningConfiguration.java | 5 +- .../model}/SyncConnectorConfiguration.java | 5 +- .../model}/UserInterfaceOptions.java | 5 +- .../model}/WebappConfiguration.java | 5 +- .../functors/FiletypeSelectionPredicate.java | 7 +- .../model}/functors/FiletypeToMapClosure.java | 7 +- .../functors/NetworkProxyComparator.java | 7 +- .../NetworkProxySelectionPredicate.java | 7 +- ...ConnectorConfigurationOrderComparator.java | 7 +- .../ProxyConnectorSelectionPredicate.java | 7 +- .../RepositoryConfigurationComparator.java | 7 +- .../archiva-configuration-provider/pom.xml | 176 ++++++++++++++++++ .../provider}/ArchivaConfiguration.java | 6 +- .../provider}/ConfigurationEvent.java | 5 +- .../provider}/ConfigurationListener.java | 5 +- .../ConfigurationRuntimeException.java | 5 +- .../DefaultArchivaConfiguration.java | 36 ++-- .../configuration/provider}/FileTypes.java | 10 +- .../IndeterminateConfigurationException.java | 5 +- .../InvalidConfigurationException.java | 5 +- .../provider}/MavenProxyPropertyLoader.java | 10 +- .../registry/ConfigurationRegistryReader.java | 41 +++- .../registry/ConfigurationRegistryWriter.java | 63 +++++-- .../provider}/util/ConfigMapper.java | 2 +- .../resources/META-INF/spring-context.xml | 0 .../archiva/configuration/default-archiva.xml | 0 .../src/test/conf/archiva-0.9.xml | 0 .../src/test/conf/archiva-1.3.xml | 0 .../src/test/conf/archiva-v1.xml | 0 .../src/test/conf/autodetect-v1.xml | 0 .../src/test/conf/conf-base.xml | 0 .../test/conf/conf-single-list-elements.xml | 0 .../src/test/conf/conf-user.xml | 0 .../src/test/conf/corrupt.xml | 0 .../src/test/conf/escape-cron-expressions.xml | 0 .../src/test/conf/maven-proxy-complete.conf | 0 .../src/test/conf/repository-manager.xml | 0 .../ArchivaConfigurationMRM789Test.java | 10 +- .../provider}/ArchivaConfigurationTest.java | 16 +- .../provider}/ConfigurationTest.java | 9 +- .../provider}/FileTypesTest.java | 5 +- .../provider}/LegacyArtifactPathTest.java | 6 +- .../MavenProxyPropertyLoaderTest.java | 9 +- ...ectorConfigurationOrderComparatorTest.java | 8 +- ...RepositoryConfigurationComparatorTest.java | 10 +- .../src/test/resources/log4j2-test.xml | 0 .../configuration/test-default-archiva.xml | 0 .../src/test/resources/spring-context.xml | 34 ++-- .../archiva-configuration/pom.xml | 140 +------------- .../src/main/mdo/configuration.mdo | 2 +- .../archiva-consumer-archetype/pom.xml | 4 +- .../src/main/java/SimpleArtifactConsumer.java | 4 +- .../src/test/java/RepositoryProviderMock.java | 6 +- .../archetype-resources/pom.xml | 4 +- .../archiva-core-consumers/pom.xml | 4 +- .../ArtifactMissingChecksumsConsumer.java | 4 +- .../consumers/core/AutoRemoveConsumer.java | 6 +- .../core/MetadataUpdaterConsumer.java | 2 +- .../repository/RepositoryPurgeConsumer.java | 6 +- .../core/AbstractArtifactConsumerTest.java | 6 +- .../repository/RepositoryProviderMock.java | 6 +- ...pReleasedSnapshotsRepositoryPurgeTest.java | 2 +- .../RepositoryPurgeConsumerTest.java | 6 +- ...ing-context-cleanup-released-snapshots.xml | 2 +- .../spring-context-purge-consumer-test.xml | 8 +- .../archiva-indexer-consumers/pom.xml | 4 +- .../lucene/NexusIndexerConsumer.java | 6 +- .../lucene/NexusIndexerConsumerTest.java | 4 +- .../archiva-metadata-consumer/pom.xml | 4 +- .../ArchivaMetadataCreationConsumer.java | 6 +- .../archiva-base/archiva-proxy/pom.xml | 4 +- .../proxy/base/ArchivaProxyRegistry.java | 6 +- .../base/DefaultRepositoryProxyHandler.java | 6 +- .../archiva-repository-admin-default/pom.xml | 4 +- .../repository/AbstractRepositoryAdmin.java | 8 +- .../DefaultRepositoryCommonValidator.java | 4 +- .../admin/DefaultArchivaAdministration.java | 42 ++--- .../group/DefaultRepositoryGroupAdmin.java | 10 +- .../DefaultManagedRepositoryAdmin.java | 7 +- .../DefaultNetworkProxyAdmin.java | 4 +- .../DefaultProxyConnectorAdmin.java | 6 +- .../DefaultProxyConnectorRuleAdmin.java | 6 +- .../remote/DefaultRemoteRepositoryAdmin.java | 6 +- ...faultArchivaRuntimeConfigurationAdmin.java | 20 +- ...faultRedbackRuntimeConfigurationAdmin.java | 33 ++-- .../admin/mock/ArchivaIndexManagerMock.java | 2 +- .../AbstractRepositoryAdminTest.java | 2 +- .../managed/ManagedRepositoryAdminTest.java | 2 +- .../archiva-repository-api/pom.xml | 4 +- .../repository/RepositoryContentFactory.java | 4 +- .../archiva/repository/RepositoryHandler.java | 17 +- .../repository/RepositoryHandlerManager.java | 2 +- .../repository/RepositoryProvider.java | 6 +- .../repository/RepositoryRegistry.java | 33 +++- .../archiva-repository-layer/pom.xml | 4 +- .../base/AbstractRepositoryHandler.java | 14 +- .../base/ArchivaRepositoryRegistry.java | 43 ++++- .../repository/base/ConfigurationHandler.java | 8 +- .../base/group/RepositoryGroupHandler.java | 8 +- .../managed/ManagedRepositoryHandler.java | 6 +- .../base/remote/RemoteRepositoryHandler.java | 8 +- .../metadata/base/MetadataTools.java | 12 +- .../base/ArchivaRepositoryRegistryTest.java | 8 +- .../group/RepositoryGroupHandlerTest.java | 10 +- .../BasicManagedRepositoryValidatorTest.java | 2 +- .../managed/ManagedRepositoryHandlerTest.java | 8 +- .../remote/RemoteRepositoryHandlerTest.java | 6 +- .../mock/RepositoryProviderMock.java | 6 +- .../archiva-repository-scanner/pom.xml | 4 +- .../scanner/DefaultRepositoryScanner.java | 2 +- .../scanner/RepositoryContentConsumers.java | 2 +- .../scanner/ArchivaAdministrationStub.java | 2 +- .../RepositoryContentConsumersTest.java | 2 +- .../src/test/resources/spring-context.xml | 2 +- .../archiva-maven-indexer/pom.xml | 4 +- .../maven/indexer/MavenIndexManager.java | 2 +- .../search/AbstractMavenRepositorySearch.java | 7 +- .../archiva-maven/archiva-maven-proxy/pom.xml | 4 +- .../maven/proxy/AbstractProxyTestCase.java | 10 +- .../maven/proxy/HttpProxyTransferTest.java | 8 +- .../maven/proxy/MetadataTransferTest.java | 2 +- .../maven/proxy/MockConfiguration.java | 7 +- .../repository/RepositoryProviderMock.java | 6 +- .../archiva-maven-repository/pom.xml | 4 +- .../repository/MavenRepositoryProvider.java | 10 +- .../ManagedDefaultRepositoryContent.java | 2 +- .../content/MavenContentProvider.java | 2 +- .../merge/Maven2RepositoryMerger.java | 6 +- .../MavenRepositoryProviderTest.java | 8 +- .../ManagedDefaultRepositoryContentTest.java | 6 +- .../MavenRepositoryRequestInfoTest.java | 6 +- .../tree/DependencyTreeBuilderTestMaven3.java | 6 +- .../merge/Maven2RepositoryMergerTest.java | 8 +- .../metadata/MetadataToolsTest.java | 2 +- ...yMetadataResolverMRM1411RepoGroupTest.java | 12 +- ...RepositoryMetadataResolverMRM1411Test.java | 10 +- .../Maven2RepositoryMetadataResolverTest.java | 12 +- .../storage/mock/MockConfiguration.java | 14 +- .../mock/ArchivaIndexManagerMock.java | 2 +- .../mock/configuration/MockRepoAdmin.java | 8 +- .../mock/configuration/StubConfiguration.java | 10 +- .../mock/configuration/TestConfiguration.java | 8 +- .../spring-context-repo-request-test.xml | 2 +- .../test/resources/spring-context-storage.xml | 2 +- .../src/test/resources/spring-context.xml | 4 +- .../archiva-maven-scheduler/pom.xml | 4 +- .../DefaultDownloadRemoteIndexScheduler.java | 6 +- .../src/test/resources/spring-context.xml | 2 +- .../archiva-scheduler-indexing/pom.xml | 4 +- .../archiva-scheduler-repository-api/pom.xml | 4 +- .../archiva-scheduler-repository/pom.xml | 4 +- ...DefaultRepositoryArchivaTaskScheduler.java | 8 +- ...ivaRepositoryScanningTaskExecutorTest.java | 4 +- .../mock/ArchivaIndexManagerMock.java | 2 +- .../mock/MockArchivaAdministration.java | 2 +- .../mock/MockRemoteRepositoryAdmin.java | 2 +- .../src/test/resources/spring-context.xml | 2 +- .../archiva-rest/archiva-rest-api/pom.xml | 4 + .../archiva/rest/api/v2/model/Artifact.java | 2 +- .../api/v2/model/ArtifactTransferRequest.java | 2 +- .../rest/api/v2/model/BeanInformation.java | 2 +- .../rest/api/v2/model/CacheConfiguration.java | 2 +- .../archiva/rest/api/v2/model/FileInfo.java | 2 +- .../rest/api/v2/model/IndexingTask.java | 2 +- .../rest/api/v2/model/LdapConfiguration.java | 2 +- .../rest/api/v2/model/MergeConfiguration.java | 2 +- .../archiva/rest/api/v2/model/Repository.java | 2 +- .../rest/api/v2/model/RepositoryGroup.java | 2 +- .../api/v2/model/RepositoryStatistics.java | 2 +- .../archiva/rest/api/v2/model/RestModel.java | 26 +++ .../archiva/rest/api/v2/model/ScanStatus.java | 2 +- .../archiva/rest/api/v2/model/ScanTask.java | 2 +- .../api/v2/model/SecurityConfiguration.java | 2 +- .../rest/api/v2/model/ValidationError.java | 2 +- .../v2/model/map/MavenRepositoryMapper.java | 72 +++++++ .../rest/api/v2/model/map/RestMapper.java | 29 +++ .../v2/model/map/ServiceMapperFactory.java | 76 ++++++++ .../v2/svc/DefaultRepositoryGroupService.java | 2 +- .../DefaultMavenManagedRepositoryService.java | 12 +- ...tiveMavenManagedRepositoryServiceTest.java | 31 +++ .../META-INF/spring-context-native-test.xml | 2 +- .../META-INF/spring-context-test.xml | 2 +- .../archiva-web/archiva-security/pom.xml | 4 +- .../security/AbstractSecurityTest.java | 4 +- .../src/test/resources/spring-context.xml | 2 +- .../archiva-web/archiva-web-common/pom.xml | 4 +- .../web/api/DefaultFileUploadService.java | 2 +- .../web/startup/SecuritySynchronization.java | 6 +- .../archiva/web/rss/RssFeedServletTest.java | 2 +- .../web/upload/UploadArtifactsTest.java | 2 +- .../resources/spring-context-rss-servlet.xml | 2 +- .../resources/spring-context-test-common.xml | 2 +- .../resources/spring-context-test-upload.xml | 2 +- .../archiva-web/archiva-webapp/pom.xml | 4 +- .../archiva-web/archiva-webdav/pom.xml | 4 +- .../webdav/ArchivaDavResourceFactory.java | 2 +- .../archiva/webdav/RepositoryServlet.java | 6 +- ...tractRepositoryServletProxiedTestCase.java | 4 +- .../AbstractRepositoryServletTestCase.java | 8 +- .../webdav/ArchivaDavResourceFactoryTest.java | 9 +- .../webdav/RepositoryServletDeployTest.java | 2 +- .../webdav/RepositoryServletNoProxyTest.java | 2 +- ...ervletProxiedPluginSnapshotPolicyTest.java | 2 +- ...sitoryServletProxiedReleasePolicyTest.java | 2 +- ...itoryServletProxiedSnapshotPolicyTest.java | 4 +- ...tProxiedTimestampedSnapshotPolicyTest.java | 2 +- .../RepositoryServletRepositoryGroupTest.java | 6 +- .../webdav/RepositoryServletSecurityTest.java | 9 +- .../archiva/webdav/RepositoryServletTest.java | 6 +- .../UnauthenticatedDavResourceFactory.java | 2 +- .../archiva/webdav/util/ReinitServlet.java | 2 +- .../resources/repository-servlet-simple.xml | 2 +- .../spring-context-servlet-security-test.xml | 2 +- .../src/test/resources/spring-context.xml | 2 +- .../metadata-store-cassandra/pom.xml | 4 +- .../CassandraRepositorySessionFactory.java | 2 +- .../metadata-store-file/pom.xml | 4 +- .../file/FileMetadataRepository.java | 4 +- .../file/FileRepositorySessionFactory.java | 2 +- .../file/FileMetadataRepositoryTest.java | 6 +- .../oak-jcr/oak-jcr-lucene/pom.xml | 4 - archiva-modules/plugins/audit/pom.xml | 4 +- .../archiva/audit/AuditManagerTest.java | 2 +- .../plugins/problem-reports/pom.xml | 4 +- .../consumers/DuplicateArtifactsConsumer.java | 2 +- pom.xml | 12 +- 252 files changed, 1380 insertions(+), 790 deletions(-) create mode 100644 archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/ModelMapper.java create mode 100644 archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/ModelMapperFactory.java create mode 100644 archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/pom.xml rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/AbstractRepositoryConfiguration.java (98%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/AbstractRepositoryConnectorConfiguration.java (98%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/ArchivaDefaultConfiguration.java (96%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/ArchivaRuntimeConfiguration.java (98%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/CacheConfiguration.java (97%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/Configuration.java (99%) create mode 100644 archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/ConfigurationModel.java rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/ConfigurationNames.java (95%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/FileLockConfiguration.java (95%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/FileType.java (97%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/LdapConfiguration.java (98%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/LdapGroupMapping.java (96%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/LegacyArtifactPath.java (97%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/ManagedRepositoryConfiguration.java (98%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/NetworkConfiguration.java (96%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/NetworkProxyConfiguration.java (98%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/OrganisationInformation.java (96%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/ProxyConnectorConfiguration.java (97%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/ProxyConnectorRuleConfiguration.java (97%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/RedbackRuntimeConfiguration.java (98%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/RemoteRepositoryConfiguration.java (98%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/RepositoryCheckPath.java (95%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/RepositoryGroupConfiguration.java (97%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/RepositoryScanningConfiguration.java (98%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/SyncConnectorConfiguration.java (96%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/UserInterfaceOptions.java (97%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/WebappConfiguration.java (94%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/functors/FiletypeSelectionPredicate.java (89%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/functors/FiletypeToMapClosure.java (89%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/functors/NetworkProxyComparator.java (88%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/functors/NetworkProxySelectionPredicate.java (89%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/functors/ProxyConnectorConfigurationOrderComparator.java (91%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/functors/ProxyConnectorSelectionPredicate.java (90%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model}/functors/RepositoryConfigurationComparator.java (88%) create mode 100644 archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/pom.xml rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider}/ArchivaConfiguration.java (96%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider}/ConfigurationEvent.java (94%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider}/ConfigurationListener.java (91%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider}/ConfigurationRuntimeException.java (91%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider}/DefaultArchivaConfiguration.java (97%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider}/FileTypes.java (94%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider}/IndeterminateConfigurationException.java (91%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider}/InvalidConfigurationException.java (92%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider}/MavenProxyPropertyLoader.java (92%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider}/io/registry/ConfigurationRegistryReader.java (97%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider}/io/registry/ConfigurationRegistryWriter.java (92%) rename archiva-modules/archiva-base/archiva-configuration/{src/main/java/org/apache/archiva/configuration => archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider}/util/ConfigMapper.java (98%) rename archiva-modules/archiva-base/archiva-configuration/{ => archiva-configuration-provider}/src/main/resources/META-INF/spring-context.xml (100%) rename archiva-modules/archiva-base/archiva-configuration/{ => archiva-configuration-provider}/src/main/resources/org/apache/archiva/configuration/default-archiva.xml (100%) rename archiva-modules/archiva-base/archiva-configuration/{ => archiva-configuration-provider}/src/test/conf/archiva-0.9.xml (100%) rename archiva-modules/archiva-base/archiva-configuration/{ => archiva-configuration-provider}/src/test/conf/archiva-1.3.xml (100%) rename archiva-modules/archiva-base/archiva-configuration/{ => archiva-configuration-provider}/src/test/conf/archiva-v1.xml (100%) rename archiva-modules/archiva-base/archiva-configuration/{ => archiva-configuration-provider}/src/test/conf/autodetect-v1.xml (100%) rename archiva-modules/archiva-base/archiva-configuration/{ => archiva-configuration-provider}/src/test/conf/conf-base.xml (100%) rename archiva-modules/archiva-base/archiva-configuration/{ => archiva-configuration-provider}/src/test/conf/conf-single-list-elements.xml (100%) rename archiva-modules/archiva-base/archiva-configuration/{ => archiva-configuration-provider}/src/test/conf/conf-user.xml (100%) rename archiva-modules/archiva-base/archiva-configuration/{ => archiva-configuration-provider}/src/test/conf/corrupt.xml (100%) rename archiva-modules/archiva-base/archiva-configuration/{ => archiva-configuration-provider}/src/test/conf/escape-cron-expressions.xml (100%) rename archiva-modules/archiva-base/archiva-configuration/{ => archiva-configuration-provider}/src/test/conf/maven-proxy-complete.conf (100%) rename archiva-modules/archiva-base/archiva-configuration/{ => archiva-configuration-provider}/src/test/conf/repository-manager.xml (100%) rename archiva-modules/archiva-base/archiva-configuration/{src/test/java/org/apache/archiva/configuration => archiva-configuration-provider/src/test/java/org/apache/archiva/configuration/provider}/ArchivaConfigurationMRM789Test.java (93%) rename archiva-modules/archiva-base/archiva-configuration/{src/test/java/org/apache/archiva/configuration => archiva-configuration-provider/src/test/java/org/apache/archiva/configuration/provider}/ArchivaConfigurationTest.java (97%) rename archiva-modules/archiva-base/archiva-configuration/{src/test/java/org/apache/archiva/configuration => archiva-configuration-provider/src/test/java/org/apache/archiva/configuration/provider}/ConfigurationTest.java (94%) rename archiva-modules/archiva-base/archiva-configuration/{src/test/java/org/apache/archiva/configuration => archiva-configuration-provider/src/test/java/org/apache/archiva/configuration/provider}/FileTypesTest.java (97%) rename archiva-modules/archiva-base/archiva-configuration/{src/test/java/org/apache/archiva/configuration => archiva-configuration-provider/src/test/java/org/apache/archiva/configuration/provider}/LegacyArtifactPathTest.java (93%) rename archiva-modules/archiva-base/archiva-configuration/{src/test/java/org/apache/archiva/configuration => archiva-configuration-provider/src/test/java/org/apache/archiva/configuration/provider}/MavenProxyPropertyLoaderTest.java (91%) rename archiva-modules/archiva-base/archiva-configuration/{src/test/java/org/apache/archiva/configuration => archiva-configuration-provider/src/test/java/org/apache/archiva/configuration/provider}/functors/ProxyConnectorConfigurationOrderComparatorTest.java (94%) rename archiva-modules/archiva-base/archiva-configuration/{src/test/java/org/apache/archiva/configuration => archiva-configuration-provider/src/test/java/org/apache/archiva/configuration/provider}/functors/RepositoryConfigurationComparatorTest.java (85%) rename archiva-modules/archiva-base/archiva-configuration/{ => archiva-configuration-provider}/src/test/resources/log4j2-test.xml (100%) rename archiva-modules/archiva-base/archiva-configuration/{ => archiva-configuration-provider}/src/test/resources/org/apache/archiva/configuration/test-default-archiva.xml (100%) rename archiva-modules/archiva-base/archiva-configuration/{ => archiva-configuration-provider}/src/test/resources/spring-context.xml (91%) create mode 100644 archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/v2/model/RestModel.java create mode 100644 archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/v2/model/map/MavenRepositoryMapper.java create mode 100644 archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/v2/model/map/RestMapper.java create mode 100644 archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/v2/model/map/ServiceMapperFactory.java diff --git a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/ModelMapper.java b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/ModelMapper.java new file mode 100644 index 000000000..1f7fda93b --- /dev/null +++ b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/ModelMapper.java @@ -0,0 +1,78 @@ +package org.apache.archiva.common; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +/** + * Generic interface for mapping DTOs + * + * @author Martin Schreier + */ +public interface ModelMapper +{ + /** + * Converts the source instance to a new instance of the target type. + * @param source the source instance + * @return a new instance of the target type + */ + T map(S source); + + /** + * Updates the target instance based on the source instance + * @param source the source instance + * @param target the target instance + */ + void update( S source, T target ); + + + /** + * Converts the target instance back to the source type + * @param target the target instance + * @return a new instance of the source type + */ + S reverseMap(T target); + + /** + * Updates the source instance based on the target instance + * @param target the target instance + * @param source the source instance + */ + void reverseUpdate( T target, S source); + + /** + * Returns the class name of the source type + * @return the source type + */ + Class getSourceType(); + + /** + * Returns the class name of the target type + * @return the target type + */ + Class getTargetType(); + + /** + * Returns true, if the given type are the same or supertype of the mapping types. + * @param sourceType + * @param targetType + * @param + * @param + * @return + */ + boolean supports( Class sourceType, Class targetType ); + +} diff --git a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/ModelMapperFactory.java b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/ModelMapperFactory.java new file mode 100644 index 000000000..30ee0c4c3 --- /dev/null +++ b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/ModelMapperFactory.java @@ -0,0 +1,40 @@ +package org.apache.archiva.common; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +/** + * Interface that returns a given DTO mapper. + * + * @author Martin Schreier + * + * @param The base source type for the model mapper + * @param The base target type for the model mapper + */ +public interface ModelMapperFactory +{ + /** + * Returns a mapper for the given source and target type. If no mapper is registered for this combination, + * it will throw a {@link IllegalArgumentException} + * @param sourceType the source type for the mapping + * @param targetType the destination type + * @param source type + * @param destination type + * @return the mapper instance + */ + ModelMapper getMapper( Class sourceType, Class targetType ) throws IllegalArgumentException; +} diff --git a/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/pom.xml b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/pom.xml new file mode 100644 index 000000000..bd2591722 --- /dev/null +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/pom.xml @@ -0,0 +1,44 @@ + + + + + + archiva-configuration + org.apache.archiva.configuration + 3.0.0-SNAPSHOT + + 4.0.0 + + archiva-configuration-model + Archiva Base :: Configuration :: Model + + + + org.apache.commons + commons-lang3 + + + org.apache.commons + commons-collections4 + + + + \ No newline at end of file diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/AbstractRepositoryConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/AbstractRepositoryConfiguration.java similarity index 98% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/AbstractRepositoryConfiguration.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/AbstractRepositoryConfiguration.java index 695f0c0c2..36c1f4e6e 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/AbstractRepositoryConfiguration.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/AbstractRepositoryConfiguration.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.model; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/AbstractRepositoryConnectorConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/AbstractRepositoryConnectorConfiguration.java similarity index 98% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/AbstractRepositoryConnectorConfiguration.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/AbstractRepositoryConnectorConfiguration.java index 5a7bc587e..aed4995db 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/AbstractRepositoryConnectorConfiguration.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/AbstractRepositoryConnectorConfiguration.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.model; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ArchivaDefaultConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/ArchivaDefaultConfiguration.java similarity index 96% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ArchivaDefaultConfiguration.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/ArchivaDefaultConfiguration.java index 3917cc8f0..c7a613b8f 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ArchivaDefaultConfiguration.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/ArchivaDefaultConfiguration.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.model; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ArchivaRuntimeConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/ArchivaRuntimeConfiguration.java similarity index 98% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ArchivaRuntimeConfiguration.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/ArchivaRuntimeConfiguration.java index b05686092..85f20bf11 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ArchivaRuntimeConfiguration.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/ArchivaRuntimeConfiguration.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.model; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/CacheConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/CacheConfiguration.java similarity index 97% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/CacheConfiguration.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/CacheConfiguration.java index 5d765edde..d14a8865a 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/CacheConfiguration.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/CacheConfiguration.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.model; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/Configuration.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/Configuration.java similarity index 99% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/Configuration.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/Configuration.java index 1bd3bcef2..890986839 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/Configuration.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/Configuration.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.model; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 @@ -19,6 +18,7 @@ package org.apache.archiva.configuration; * under the License. */ + /** * Class Configuration. * @@ -769,7 +769,7 @@ public class Configuration connectors.add( proxyConfig ); java.util.Collections.sort( connectors, - org.apache.archiva.configuration.functors.ProxyConnectorConfigurationOrderComparator.getInstance() ); + org.apache.archiva.configuration.model.functors.ProxyConnectorConfigurationOrderComparator.getInstance() ); } } diff --git a/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/ConfigurationModel.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/ConfigurationModel.java new file mode 100644 index 000000000..6a9520aa7 --- /dev/null +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/ConfigurationModel.java @@ -0,0 +1,25 @@ +package org.apache.archiva.configuration.model; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +/** + * @author Martin Schreier + */ +public interface ConfigurationModel +{ +} diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ConfigurationNames.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/ConfigurationNames.java similarity index 95% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ConfigurationNames.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/ConfigurationNames.java index aaa0a5df9..8a1a03fbd 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ConfigurationNames.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/ConfigurationNames.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.model; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileLockConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/FileLockConfiguration.java similarity index 95% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileLockConfiguration.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/FileLockConfiguration.java index 259e3b85a..acac6d7a3 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileLockConfiguration.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/FileLockConfiguration.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.model; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileType.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/FileType.java similarity index 97% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileType.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/FileType.java index d3930c1c1..7f0ec575d 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileType.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/FileType.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.model; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/LdapConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/LdapConfiguration.java similarity index 98% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/LdapConfiguration.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/LdapConfiguration.java index 5541c7310..abed037ba 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/LdapConfiguration.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/LdapConfiguration.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.model; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/LdapGroupMapping.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/LdapGroupMapping.java similarity index 96% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/LdapGroupMapping.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/LdapGroupMapping.java index 05288c148..c899d4032 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/LdapGroupMapping.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/LdapGroupMapping.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.model; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/LegacyArtifactPath.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/LegacyArtifactPath.java similarity index 97% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/LegacyArtifactPath.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/LegacyArtifactPath.java index 695245fdc..6c7013395 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/LegacyArtifactPath.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/LegacyArtifactPath.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.model; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ManagedRepositoryConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/ManagedRepositoryConfiguration.java similarity index 98% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ManagedRepositoryConfiguration.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/ManagedRepositoryConfiguration.java index a8da04d6d..64c84b9f3 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ManagedRepositoryConfiguration.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/ManagedRepositoryConfiguration.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.model; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 @@ -27,7 +26,7 @@ package org.apache.archiva.configuration; @SuppressWarnings( "all" ) public class ManagedRepositoryConfiguration extends AbstractRepositoryConfiguration - implements java.io.Serializable + implements java.io.Serializable, ConfigurationModel { //--------------------------/ diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/NetworkConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/NetworkConfiguration.java similarity index 96% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/NetworkConfiguration.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/NetworkConfiguration.java index a7eacec7e..dd1b2de16 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/NetworkConfiguration.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/NetworkConfiguration.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.model; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/NetworkProxyConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/NetworkProxyConfiguration.java similarity index 98% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/NetworkProxyConfiguration.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/NetworkProxyConfiguration.java index 234ef8a75..e18fe059f 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/NetworkProxyConfiguration.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/NetworkProxyConfiguration.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.model; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/OrganisationInformation.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/OrganisationInformation.java similarity index 96% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/OrganisationInformation.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/OrganisationInformation.java index a7f7fb62f..5e892ae20 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/OrganisationInformation.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/OrganisationInformation.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.model; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ProxyConnectorConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/ProxyConnectorConfiguration.java similarity index 97% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ProxyConnectorConfiguration.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/ProxyConnectorConfiguration.java index 944c8b670..637808a07 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ProxyConnectorConfiguration.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/ProxyConnectorConfiguration.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.model; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ProxyConnectorRuleConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/ProxyConnectorRuleConfiguration.java similarity index 97% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ProxyConnectorRuleConfiguration.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/ProxyConnectorRuleConfiguration.java index 3340e0563..f555d9a45 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ProxyConnectorRuleConfiguration.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/ProxyConnectorRuleConfiguration.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.model; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/RedbackRuntimeConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/RedbackRuntimeConfiguration.java similarity index 98% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/RedbackRuntimeConfiguration.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/RedbackRuntimeConfiguration.java index 2c8992926..10a4d7f8c 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/RedbackRuntimeConfiguration.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/RedbackRuntimeConfiguration.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.model; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/RemoteRepositoryConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/RemoteRepositoryConfiguration.java similarity index 98% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/RemoteRepositoryConfiguration.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/RemoteRepositoryConfiguration.java index ca49d315c..37ff862c8 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/RemoteRepositoryConfiguration.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/RemoteRepositoryConfiguration.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.model; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 @@ -27,7 +26,7 @@ package org.apache.archiva.configuration; @SuppressWarnings( "all" ) public class RemoteRepositoryConfiguration extends AbstractRepositoryConfiguration - implements java.io.Serializable + implements java.io.Serializable, ConfigurationModel { //--------------------------/ diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/RepositoryCheckPath.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/RepositoryCheckPath.java similarity index 95% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/RepositoryCheckPath.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/RepositoryCheckPath.java index 27f766052..6fcdd0c34 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/RepositoryCheckPath.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/RepositoryCheckPath.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.model; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/RepositoryGroupConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/RepositoryGroupConfiguration.java similarity index 97% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/RepositoryGroupConfiguration.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/RepositoryGroupConfiguration.java index 877ccaadc..904a931e0 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/RepositoryGroupConfiguration.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/RepositoryGroupConfiguration.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.model; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 @@ -30,7 +29,7 @@ import java.util.List; */ @SuppressWarnings( "all" ) public class RepositoryGroupConfiguration extends AbstractRepositoryConfiguration - implements Serializable + implements Serializable, ConfigurationModel { //--------------------------/ diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/RepositoryScanningConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/RepositoryScanningConfiguration.java similarity index 98% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/RepositoryScanningConfiguration.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/RepositoryScanningConfiguration.java index 976eb345a..02b4d0acd 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/RepositoryScanningConfiguration.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/RepositoryScanningConfiguration.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.model; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/SyncConnectorConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/SyncConnectorConfiguration.java similarity index 96% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/SyncConnectorConfiguration.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/SyncConnectorConfiguration.java index a4f8ff901..f92bcbf94 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/SyncConnectorConfiguration.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/SyncConnectorConfiguration.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.model; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/UserInterfaceOptions.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/UserInterfaceOptions.java similarity index 97% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/UserInterfaceOptions.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/UserInterfaceOptions.java index 8d8476646..df740e7b0 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/UserInterfaceOptions.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/UserInterfaceOptions.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.model; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/WebappConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/WebappConfiguration.java similarity index 94% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/WebappConfiguration.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/WebappConfiguration.java index aab3660c6..372cf0085 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/WebappConfiguration.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/WebappConfiguration.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.model; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeSelectionPredicate.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/functors/FiletypeSelectionPredicate.java similarity index 89% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeSelectionPredicate.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/functors/FiletypeSelectionPredicate.java index 2573a5dc7..7bb422ca5 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeSelectionPredicate.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/functors/FiletypeSelectionPredicate.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration.functors; +package org.apache.archiva.configuration.model.functors; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration.functors; * "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 - * + * 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 @@ -19,7 +18,7 @@ package org.apache.archiva.configuration.functors; * under the License. */ -import org.apache.archiva.configuration.FileType; +import org.apache.archiva.configuration.model.FileType; import org.apache.commons.collections4.Predicate; import org.apache.commons.lang3.StringUtils; diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeToMapClosure.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/functors/FiletypeToMapClosure.java similarity index 89% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeToMapClosure.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/functors/FiletypeToMapClosure.java index ad8ef5c97..5b2f13219 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeToMapClosure.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/functors/FiletypeToMapClosure.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration.functors; +package org.apache.archiva.configuration.model.functors; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration.functors; * "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 - * + * 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 @@ -19,7 +18,7 @@ package org.apache.archiva.configuration.functors; * under the License. */ -import org.apache.archiva.configuration.FileType; +import org.apache.archiva.configuration.model.FileType; import org.apache.commons.collections4.Closure; import java.util.HashMap; diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxyComparator.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/functors/NetworkProxyComparator.java similarity index 88% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxyComparator.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/functors/NetworkProxyComparator.java index d71e32316..ae8f96b77 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxyComparator.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/functors/NetworkProxyComparator.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration.functors; +package org.apache.archiva.configuration.model.functors; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration.functors; * "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 - * + * 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 @@ -19,7 +18,7 @@ package org.apache.archiva.configuration.functors; * under the License. */ -import org.apache.archiva.configuration.NetworkProxyConfiguration; +import org.apache.archiva.configuration.model.NetworkProxyConfiguration; import java.util.Comparator; diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxySelectionPredicate.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/functors/NetworkProxySelectionPredicate.java similarity index 89% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxySelectionPredicate.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/functors/NetworkProxySelectionPredicate.java index c76cfa221..b3534f2e1 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxySelectionPredicate.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/functors/NetworkProxySelectionPredicate.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration.functors; +package org.apache.archiva.configuration.model.functors; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration.functors; * "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 - * + * 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 @@ -19,7 +18,7 @@ package org.apache.archiva.configuration.functors; * under the License. */ -import org.apache.archiva.configuration.NetworkProxyConfiguration; +import org.apache.archiva.configuration.model.NetworkProxyConfiguration; import org.apache.commons.collections4.Predicate; import org.apache.commons.lang3.StringUtils; diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparator.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/functors/ProxyConnectorConfigurationOrderComparator.java similarity index 91% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparator.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/functors/ProxyConnectorConfigurationOrderComparator.java index 05cad4baf..28d246026 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparator.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/functors/ProxyConnectorConfigurationOrderComparator.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration.functors; +package org.apache.archiva.configuration.model.functors; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration.functors; * "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 - * + * 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 @@ -19,7 +18,7 @@ package org.apache.archiva.configuration.functors; * under the License. */ -import org.apache.archiva.configuration.ProxyConnectorConfiguration; +import org.apache.archiva.configuration.model.ProxyConnectorConfiguration; import java.util.Comparator; diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorSelectionPredicate.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/functors/ProxyConnectorSelectionPredicate.java similarity index 90% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorSelectionPredicate.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/functors/ProxyConnectorSelectionPredicate.java index 2b5641f47..99a723fd6 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorSelectionPredicate.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/functors/ProxyConnectorSelectionPredicate.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration.functors; +package org.apache.archiva.configuration.model.functors; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration.functors; * "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 - * + * 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 @@ -19,7 +18,7 @@ package org.apache.archiva.configuration.functors; * under the License. */ -import org.apache.archiva.configuration.ProxyConnectorConfiguration; +import org.apache.archiva.configuration.model.ProxyConnectorConfiguration; import org.apache.commons.collections4.Predicate; import org.apache.commons.lang3.StringUtils; diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/RepositoryConfigurationComparator.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/functors/RepositoryConfigurationComparator.java similarity index 88% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/RepositoryConfigurationComparator.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/functors/RepositoryConfigurationComparator.java index 9e2b64e22..0af59d767 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/RepositoryConfigurationComparator.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/functors/RepositoryConfigurationComparator.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration.functors; +package org.apache.archiva.configuration.model.functors; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration.functors; * "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 - * + * 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 @@ -19,7 +18,7 @@ package org.apache.archiva.configuration.functors; * under the License. */ -import org.apache.archiva.configuration.AbstractRepositoryConfiguration; +import org.apache.archiva.configuration.model.AbstractRepositoryConfiguration; import java.util.Comparator; diff --git a/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/pom.xml b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/pom.xml new file mode 100644 index 000000000..5404763e4 --- /dev/null +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/pom.xml @@ -0,0 +1,176 @@ + + + + + + archiva-configuration + org.apache.archiva.configuration + 3.0.0-SNAPSHOT + + 4.0.0 + + archiva-configuration-provider + Archiva Base :: Configuration :: Provider + + + + + org.apache.archiva.configuration + archiva-configuration-model + + + + org.apache.archiva + archiva-common + + + org.apache.archiva + archiva-policies + + + org.apache.archiva.components.registry + archiva-components-spring-registry-api + + + org.springframework + spring-test + + + + + org.springframework + spring-context + + + commons-logging + commons-logging + + + + + org.apache.archiva.components.registry + archiva-components-spring-registry-commons + + + org.springframework + spring-test + + + + + org.apache.archiva.components + archiva-components-expression-evaluator + + + + jakarta.annotation + jakarta.annotation-api + + + jakarta.inject + jakarta.inject-api + + + + org.apache.commons + commons-configuration2 + runtime + + + commons-logging + commons-logging + + + + + + commons-io + commons-io + + + org.apache.commons + commons-lang3 + + + org.apache.commons + commons-collections4 + + + + + + + org.apache.archiva + archiva-test-utils + ${project.version} + test + + + + org.springframework + spring-test + test + + + org.apache.logging.log4j + log4j-jcl + test + + + + org.mockito + mockito-core + test + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${basedir} + + false + + + + + + + org.apache.rat + apache-rat-plugin + + + src/main/resources/org/apache/archiva/configuration/default-archiva.xml + src/test/conf/maven-proxy-complete.conf + src/test/resources/org/apache/archiva/configuration/test-default-archiva.xml + nbactions.xml + + + + + + + + \ No newline at end of file diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ArchivaConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/ArchivaConfiguration.java similarity index 96% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ArchivaConfiguration.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/ArchivaConfiguration.java index cf90a13d3..b71d26bb9 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ArchivaConfiguration.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/ArchivaConfiguration.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.provider; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 @@ -22,6 +21,7 @@ package org.apache.archiva.configuration; import org.apache.archiva.components.registry.Registry; import org.apache.archiva.components.registry.RegistryException; import org.apache.archiva.components.registry.RegistryListener; +import org.apache.archiva.configuration.model.Configuration; import java.nio.file.Path; import java.util.List; diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ConfigurationEvent.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/ConfigurationEvent.java similarity index 94% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ConfigurationEvent.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/ConfigurationEvent.java index 9639effbe..5ad758c8b 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ConfigurationEvent.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/ConfigurationEvent.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.provider; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ConfigurationListener.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/ConfigurationListener.java similarity index 91% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ConfigurationListener.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/ConfigurationListener.java index 2abeb6371..370c61cec 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ConfigurationListener.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/ConfigurationListener.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.provider; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ConfigurationRuntimeException.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/ConfigurationRuntimeException.java similarity index 91% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ConfigurationRuntimeException.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/ConfigurationRuntimeException.java index 2368d201e..abf2b7038 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ConfigurationRuntimeException.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/ConfigurationRuntimeException.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.provider; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/DefaultArchivaConfiguration.java similarity index 97% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/DefaultArchivaConfiguration.java index b9db3042e..88efcf90a 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/DefaultArchivaConfiguration.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.provider; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 @@ -19,12 +18,6 @@ package org.apache.archiva.configuration; * under the License. */ -import org.apache.archiva.configuration.functors.ProxyConnectorConfigurationOrderComparator; -import org.apache.archiva.configuration.io.registry.ConfigurationRegistryReader; -import org.apache.archiva.configuration.io.registry.ConfigurationRegistryWriter; -import org.apache.archiva.policies.AbstractUpdatePolicy; -import org.apache.archiva.policies.CachedFailuresPolicy; -import org.apache.archiva.policies.ChecksumPolicy; import org.apache.archiva.components.evaluator.DefaultExpressionEvaluator; import org.apache.archiva.components.evaluator.EvaluatorException; import org.apache.archiva.components.evaluator.ExpressionEvaluator; @@ -33,6 +26,17 @@ import org.apache.archiva.components.registry.Registry; import org.apache.archiva.components.registry.RegistryException; import org.apache.archiva.components.registry.RegistryListener; import org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.ProxyConnectorConfiguration; +import org.apache.archiva.configuration.model.RemoteRepositoryConfiguration; +import org.apache.archiva.configuration.model.RepositoryCheckPath; +import org.apache.archiva.configuration.model.functors.ProxyConnectorConfigurationOrderComparator; +import org.apache.archiva.configuration.provider.io.registry.ConfigurationRegistryReader; +import org.apache.archiva.configuration.provider.io.registry.ConfigurationRegistryWriter; +import org.apache.archiva.policies.AbstractUpdatePolicy; +import org.apache.archiva.policies.CachedFailuresPolicy; +import org.apache.archiva.policies.ChecksumPolicy; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.ListUtils; import org.apache.commons.io.FileUtils; @@ -49,8 +53,18 @@ import java.nio.file.Files; import java.nio.file.InvalidPathException; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Map; import java.util.Map.Entry; +import java.util.Set; /** *

@@ -508,7 +522,7 @@ public class DefaultArchivaConfiguration } private void escapeCronExpressions(Configuration configuration) { - for (ManagedRepositoryConfiguration c : configuration.getManagedRepositories()) { + for ( ManagedRepositoryConfiguration c : configuration.getManagedRepositories()) { c.setRefreshCronExpression(escapeCronExpression(c.getRefreshCronExpression())); } } diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/FileTypes.java similarity index 94% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/FileTypes.java index 2415f7119..a08e4bf14 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/FileTypes.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.provider; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 @@ -20,9 +19,12 @@ package org.apache.archiva.configuration; */ import org.apache.archiva.common.FileTypeUtils; -import org.apache.archiva.configuration.functors.FiletypeSelectionPredicate; import org.apache.archiva.components.registry.Registry; import org.apache.archiva.components.registry.RegistryListener; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.FileType; +import org.apache.archiva.configuration.model.RepositoryScanningConfiguration; +import org.apache.archiva.configuration.model.functors.FiletypeSelectionPredicate; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.IterableUtils; import org.apache.commons.collections4.Predicate; diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/IndeterminateConfigurationException.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/IndeterminateConfigurationException.java similarity index 91% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/IndeterminateConfigurationException.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/IndeterminateConfigurationException.java index 04160fab4..39054ced6 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/IndeterminateConfigurationException.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/IndeterminateConfigurationException.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.provider; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/InvalidConfigurationException.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/InvalidConfigurationException.java similarity index 92% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/InvalidConfigurationException.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/InvalidConfigurationException.java index 55f5b3408..f65aa7d1b 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/InvalidConfigurationException.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/InvalidConfigurationException.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.provider; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/MavenProxyPropertyLoader.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/MavenProxyPropertyLoader.java similarity index 92% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/MavenProxyPropertyLoader.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/MavenProxyPropertyLoader.java index 20e3f34cf..7f657f92f 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/MavenProxyPropertyLoader.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/MavenProxyPropertyLoader.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.provider; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 @@ -19,6 +18,11 @@ package org.apache.archiva.configuration; * under the License. */ +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.NetworkProxyConfiguration; +import org.apache.archiva.configuration.model.ProxyConnectorConfiguration; +import org.apache.archiva.configuration.model.RemoteRepositoryConfiguration; import org.apache.archiva.policies.ReleasesPolicy; import org.apache.archiva.policies.SnapshotsPolicy; import org.apache.commons.lang3.StringUtils; diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/io/registry/ConfigurationRegistryReader.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/io/registry/ConfigurationRegistryReader.java similarity index 97% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/io/registry/ConfigurationRegistryReader.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/io/registry/ConfigurationRegistryReader.java index 27146f5e6..6a89e1cf7 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/io/registry/ConfigurationRegistryReader.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/io/registry/ConfigurationRegistryReader.java @@ -1,5 +1,5 @@ -package org.apache.archiva.configuration.io.registry; +package org.apache.archiva.configuration.provider.io.registry; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -10,8 +10,7 @@ package org.apache.archiva.configuration.io.registry; * "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 - * + * 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 @@ -20,8 +19,32 @@ package org.apache.archiva.configuration.io.registry; * under the License. */ -import org.apache.archiva.configuration.*; import org.apache.archiva.components.registry.Registry; +import org.apache.archiva.configuration.model.AbstractRepositoryConfiguration; +import org.apache.archiva.configuration.model.AbstractRepositoryConnectorConfiguration; +import org.apache.archiva.configuration.model.ArchivaDefaultConfiguration; +import org.apache.archiva.configuration.model.ArchivaRuntimeConfiguration; +import org.apache.archiva.configuration.model.CacheConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.FileLockConfiguration; +import org.apache.archiva.configuration.model.FileType; +import org.apache.archiva.configuration.model.LdapConfiguration; +import org.apache.archiva.configuration.model.LdapGroupMapping; +import org.apache.archiva.configuration.model.LegacyArtifactPath; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.NetworkConfiguration; +import org.apache.archiva.configuration.model.NetworkProxyConfiguration; +import org.apache.archiva.configuration.model.OrganisationInformation; +import org.apache.archiva.configuration.model.ProxyConnectorConfiguration; +import org.apache.archiva.configuration.model.ProxyConnectorRuleConfiguration; +import org.apache.archiva.configuration.model.RedbackRuntimeConfiguration; +import org.apache.archiva.configuration.model.RemoteRepositoryConfiguration; +import org.apache.archiva.configuration.model.RepositoryCheckPath; +import org.apache.archiva.configuration.model.RepositoryGroupConfiguration; +import org.apache.archiva.configuration.model.RepositoryScanningConfiguration; +import org.apache.archiva.configuration.model.SyncConnectorConfiguration; +import org.apache.archiva.configuration.model.UserInterfaceOptions; +import org.apache.archiva.configuration.model.WebappConfiguration; import java.util.Iterator; import java.util.List; @@ -34,7 +57,7 @@ import java.util.List; * Generate Redback Registry input mechanism for model 'Configuration'. */ public class ConfigurationRegistryReader { - public Configuration read(Registry registry) { + public Configuration read( Registry registry) { return readConfiguration("", registry); } @@ -140,7 +163,7 @@ public class ConfigurationRegistryReader { return value; } - private AbstractRepositoryConfiguration readAbstractRepositoryConfiguration(String prefix, Registry registry) { + private AbstractRepositoryConfiguration readAbstractRepositoryConfiguration( String prefix, Registry registry) { AbstractRepositoryConfiguration value = new AbstractRepositoryConfiguration(); //String id = registry.getString( prefix + "id", value.getId() ); @@ -776,7 +799,7 @@ public class ConfigurationRegistryReader { return value; } - private RepositoryCheckPath readRepositoryCheckPath(String prefix, Registry registry) { + private RepositoryCheckPath readRepositoryCheckPath( String prefix, Registry registry) { RepositoryCheckPath value = new RepositoryCheckPath(); //String url = registry.getString( prefix + "url", value.getUrl() ); @@ -815,7 +838,7 @@ public class ConfigurationRegistryReader { return value; } - private AbstractRepositoryConnectorConfiguration readAbstractRepositoryConnectorConfiguration(String prefix, Registry registry) { + private AbstractRepositoryConnectorConfiguration readAbstractRepositoryConnectorConfiguration( String prefix, Registry registry) { AbstractRepositoryConnectorConfiguration value = new AbstractRepositoryConnectorConfiguration(); //String sourceRepoId = registry.getString( prefix + "sourceRepoId", value.getSourceRepoId() ); @@ -997,7 +1020,7 @@ public class ConfigurationRegistryReader { return value; } - private SyncConnectorConfiguration readSyncConnectorConfiguration(String prefix, Registry registry) { + private SyncConnectorConfiguration readSyncConnectorConfiguration( String prefix, Registry registry) { SyncConnectorConfiguration value = new SyncConnectorConfiguration(); //String cronExpression = registry.getString( prefix + "cronExpression", value.getCronExpression() ); diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/io/registry/ConfigurationRegistryWriter.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/io/registry/ConfigurationRegistryWriter.java similarity index 92% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/io/registry/ConfigurationRegistryWriter.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/io/registry/ConfigurationRegistryWriter.java index 83202f531..253eae897 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/io/registry/ConfigurationRegistryWriter.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/io/registry/ConfigurationRegistryWriter.java @@ -1,5 +1,5 @@ -package org.apache.archiva.configuration.io.registry; +package org.apache.archiva.configuration.provider.io.registry; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -10,8 +10,7 @@ package org.apache.archiva.configuration.io.registry; * "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 - * + * 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 @@ -20,8 +19,32 @@ package org.apache.archiva.configuration.io.registry; * under the License. */ -import org.apache.archiva.configuration.*; import org.apache.archiva.components.registry.Registry; +import org.apache.archiva.configuration.model.AbstractRepositoryConfiguration; +import org.apache.archiva.configuration.model.AbstractRepositoryConnectorConfiguration; +import org.apache.archiva.configuration.model.ArchivaDefaultConfiguration; +import org.apache.archiva.configuration.model.ArchivaRuntimeConfiguration; +import org.apache.archiva.configuration.model.CacheConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.FileLockConfiguration; +import org.apache.archiva.configuration.model.FileType; +import org.apache.archiva.configuration.model.LdapConfiguration; +import org.apache.archiva.configuration.model.LdapGroupMapping; +import org.apache.archiva.configuration.model.LegacyArtifactPath; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.NetworkConfiguration; +import org.apache.archiva.configuration.model.NetworkProxyConfiguration; +import org.apache.archiva.configuration.model.OrganisationInformation; +import org.apache.archiva.configuration.model.ProxyConnectorConfiguration; +import org.apache.archiva.configuration.model.ProxyConnectorRuleConfiguration; +import org.apache.archiva.configuration.model.RedbackRuntimeConfiguration; +import org.apache.archiva.configuration.model.RemoteRepositoryConfiguration; +import org.apache.archiva.configuration.model.RepositoryCheckPath; +import org.apache.archiva.configuration.model.RepositoryGroupConfiguration; +import org.apache.archiva.configuration.model.RepositoryScanningConfiguration; +import org.apache.archiva.configuration.model.SyncConnectorConfiguration; +import org.apache.archiva.configuration.model.UserInterfaceOptions; +import org.apache.archiva.configuration.model.WebappConfiguration; import java.util.Iterator; import java.util.List; @@ -34,7 +57,7 @@ import java.util.List; * Generate Plexus Registry output mechanism for model 'Configuration'. */ public class ConfigurationRegistryWriter { - public void write(Configuration model, Registry registry) { + public void write( Configuration model, Registry registry) { writeConfiguration("", model, registry); } @@ -172,7 +195,7 @@ public class ConfigurationRegistryWriter { } } - private void writeAbstractRepositoryConfiguration(String prefix, AbstractRepositoryConfiguration value, Registry registry) { + private void writeAbstractRepositoryConfiguration( String prefix, AbstractRepositoryConfiguration value, Registry registry) { if (value != null) { if (value.getId() != null ) { @@ -457,7 +480,7 @@ public class ConfigurationRegistryWriter { } } - private void writeRepositoryCheckPath(String prefix, RepositoryCheckPath value, Registry registry) { + private void writeRepositoryCheckPath( String prefix, RepositoryCheckPath value, Registry registry) { if (value != null) { if (value.getUrl() != null ) { @@ -472,7 +495,7 @@ public class ConfigurationRegistryWriter { } } - private void writeAbstractRepositoryConnectorConfiguration(String prefix, AbstractRepositoryConnectorConfiguration value, Registry registry) { + private void writeAbstractRepositoryConnectorConfiguration( String prefix, AbstractRepositoryConnectorConfiguration value, Registry registry) { if (value != null) { if (value.getSourceRepoId() != null ) { @@ -635,7 +658,7 @@ public class ConfigurationRegistryWriter { } } - private void writeSyncConnectorConfiguration(String prefix, SyncConnectorConfiguration value, Registry registry) { + private void writeSyncConnectorConfiguration( String prefix, SyncConnectorConfiguration value, Registry registry) { if (value != null) { if (value.getCronExpression() != null && !value.getCronExpression().equals("0 0 * * * ?") ) { @@ -748,7 +771,7 @@ public class ConfigurationRegistryWriter { } } - private void writeRepositoryScanningConfiguration(String prefix, RepositoryScanningConfiguration value, Registry registry) { + private void writeRepositoryScanningConfiguration( String prefix, RepositoryScanningConfiguration value, Registry registry) { if (value != null) { if (value.getFileTypes() != null && value.getFileTypes().size() > 0 ) { @@ -807,7 +830,7 @@ public class ConfigurationRegistryWriter { } } - private void writeOrganisationInformation(String prefix, OrganisationInformation value, Registry registry) { + private void writeOrganisationInformation( String prefix, OrganisationInformation value, Registry registry) { if (value != null) { if (value.getName() != null ) { @@ -827,7 +850,7 @@ public class ConfigurationRegistryWriter { } } - private void writeWebappConfiguration(String prefix, WebappConfiguration value, Registry registry) { + private void writeWebappConfiguration( String prefix, WebappConfiguration value, Registry registry) { if (value != null) { if (value.getUi() != null ) { @@ -836,7 +859,7 @@ public class ConfigurationRegistryWriter { } } - private void writeUserInterfaceOptions(String prefix, UserInterfaceOptions value, Registry registry) { + private void writeUserInterfaceOptions( String prefix, UserInterfaceOptions value, Registry registry) { if (value != null) { String showFindArtifacts = "showFindArtifacts"; registry.setBoolean(prefix + showFindArtifacts, value.isShowFindArtifacts()); @@ -854,7 +877,7 @@ public class ConfigurationRegistryWriter { } } - private void writeNetworkConfiguration(String prefix, NetworkConfiguration value, Registry registry) { + private void writeNetworkConfiguration( String prefix, NetworkConfiguration value, Registry registry) { if (value != null) { if (value.getMaxTotal() != 30 ) { @@ -871,7 +894,7 @@ public class ConfigurationRegistryWriter { } } - private void writeArchivaRuntimeConfiguration(String prefix, ArchivaRuntimeConfiguration value, Registry registry) { + private void writeArchivaRuntimeConfiguration( String prefix, ArchivaRuntimeConfiguration value, Registry registry) { if (value != null) { if (value.getUrlFailureCacheConfiguration() != null ) { @@ -916,7 +939,7 @@ public class ConfigurationRegistryWriter { } } - private void writeRedbackRuntimeConfiguration(String prefix, RedbackRuntimeConfiguration value, Registry registry) { + private void writeRedbackRuntimeConfiguration( String prefix, RedbackRuntimeConfiguration value, Registry registry) { if (value != null) { String migratedFromRedbackConfiguration = "migratedFromRedbackConfiguration"; registry.setBoolean(prefix + migratedFromRedbackConfiguration, value.isMigratedFromRedbackConfiguration()); @@ -977,7 +1000,7 @@ public class ConfigurationRegistryWriter { } } - private void writeArchivaDefaultConfiguration(String prefix, ArchivaDefaultConfiguration value, Registry registry) { + private void writeArchivaDefaultConfiguration( String prefix, ArchivaDefaultConfiguration value, Registry registry) { if (value != null) { if (value.getDefaultCheckPaths() != null && value.getDefaultCheckPaths().size() > 0 ) { @@ -993,7 +1016,7 @@ public class ConfigurationRegistryWriter { } } - private void writeLdapConfiguration(String prefix, LdapConfiguration value, Registry registry) { + private void writeLdapConfiguration( String prefix, LdapConfiguration value, Registry registry) { if (value != null) { if (value.getHostName() != null ) { @@ -1057,7 +1080,7 @@ public class ConfigurationRegistryWriter { } } - private void writeFileLockConfiguration(String prefix, FileLockConfiguration value, Registry registry) { + private void writeFileLockConfiguration( String prefix, FileLockConfiguration value, Registry registry) { if (value != null) { String skipLocking = "skipLocking"; registry.setBoolean(prefix + skipLocking, value.isSkipLocking()); @@ -1069,7 +1092,7 @@ public class ConfigurationRegistryWriter { } } - private void writeCacheConfiguration(String prefix, CacheConfiguration value, Registry registry) { + private void writeCacheConfiguration( String prefix, CacheConfiguration value, Registry registry) { if (value != null) { if (value.getTimeToIdleSeconds() != -1 ) { diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/util/ConfigMapper.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/util/ConfigMapper.java similarity index 98% rename from archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/util/ConfigMapper.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/util/ConfigMapper.java index f55dbbc66..d03137a95 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/util/ConfigMapper.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/java/org/apache/archiva/configuration/provider/util/ConfigMapper.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration.util; +package org.apache.archiva.configuration.provider.util; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/resources/META-INF/spring-context.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-configuration/src/main/resources/META-INF/spring-context.xml rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/resources/META-INF/spring-context.xml diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/resources/org/apache/archiva/configuration/default-archiva.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/main/resources/org/apache/archiva/configuration/default-archiva.xml diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/conf/archiva-0.9.xml b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/conf/archiva-0.9.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-configuration/src/test/conf/archiva-0.9.xml rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/conf/archiva-0.9.xml diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/conf/archiva-1.3.xml b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/conf/archiva-1.3.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-configuration/src/test/conf/archiva-1.3.xml rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/conf/archiva-1.3.xml diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/conf/archiva-v1.xml b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/conf/archiva-v1.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-configuration/src/test/conf/archiva-v1.xml rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/conf/archiva-v1.xml diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/conf/autodetect-v1.xml b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/conf/autodetect-v1.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-configuration/src/test/conf/autodetect-v1.xml rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/conf/autodetect-v1.xml diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/conf/conf-base.xml b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/conf/conf-base.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-configuration/src/test/conf/conf-base.xml rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/conf/conf-base.xml diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/conf/conf-single-list-elements.xml b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/conf/conf-single-list-elements.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-configuration/src/test/conf/conf-single-list-elements.xml rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/conf/conf-single-list-elements.xml diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/conf/conf-user.xml b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/conf/conf-user.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-configuration/src/test/conf/conf-user.xml rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/conf/conf-user.xml diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/conf/corrupt.xml b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/conf/corrupt.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-configuration/src/test/conf/corrupt.xml rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/conf/corrupt.xml diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/conf/escape-cron-expressions.xml b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/conf/escape-cron-expressions.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-configuration/src/test/conf/escape-cron-expressions.xml rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/conf/escape-cron-expressions.xml diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/conf/maven-proxy-complete.conf b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/conf/maven-proxy-complete.conf similarity index 100% rename from archiva-modules/archiva-base/archiva-configuration/src/test/conf/maven-proxy-complete.conf rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/conf/maven-proxy-complete.conf diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/conf/repository-manager.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/conf/repository-manager.xml diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationMRM789Test.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/java/org/apache/archiva/configuration/provider/ArchivaConfigurationMRM789Test.java similarity index 93% rename from archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationMRM789Test.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/java/org/apache/archiva/configuration/provider/ArchivaConfigurationMRM789Test.java index d7b4c6f0c..606749692 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationMRM789Test.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/java/org/apache/archiva/configuration/provider/ArchivaConfigurationMRM789Test.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.provider; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 @@ -19,6 +18,11 @@ package org.apache.archiva.configuration; * under the License. */ +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.RepositoryScanningConfiguration; +import org.apache.archiva.configuration.model.UserInterfaceOptions; +import org.apache.archiva.configuration.model.WebappConfiguration; import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/java/org/apache/archiva/configuration/provider/ArchivaConfigurationTest.java similarity index 97% rename from archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/java/org/apache/archiva/configuration/provider/ArchivaConfigurationTest.java index 9a882d3e2..ae2079b19 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/java/org/apache/archiva/configuration/provider/ArchivaConfigurationTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.provider; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 @@ -20,12 +19,21 @@ package org.apache.archiva.configuration; */ import org.apache.archiva.components.registry.RegistryException; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.LegacyArtifactPath; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.NetworkProxyConfiguration; +import org.apache.archiva.configuration.model.ProxyConnectorConfiguration; +import org.apache.archiva.configuration.model.RemoteRepositoryConfiguration; +import org.apache.archiva.configuration.model.RepositoryGroupConfiguration; +import org.apache.archiva.configuration.model.RepositoryScanningConfiguration; +import org.apache.archiva.configuration.model.UserInterfaceOptions; +import org.apache.archiva.configuration.model.WebappConfiguration; import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Mockito; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationContext; diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ConfigurationTest.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/java/org/apache/archiva/configuration/provider/ConfigurationTest.java similarity index 94% rename from archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ConfigurationTest.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/java/org/apache/archiva/configuration/provider/ConfigurationTest.java index 2a5e9b447..599bf92e5 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ConfigurationTest.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/java/org/apache/archiva/configuration/provider/ConfigurationTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.provider; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 @@ -19,6 +18,10 @@ package org.apache.archiva.configuration; * under the License. */ +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.NetworkProxyConfiguration; +import org.apache.archiva.configuration.model.RemoteRepositoryConfiguration; import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/FileTypesTest.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/java/org/apache/archiva/configuration/provider/FileTypesTest.java similarity index 97% rename from archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/FileTypesTest.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/java/org/apache/archiva/configuration/provider/FileTypesTest.java index 83874b7a0..38921e3e2 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/FileTypesTest.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/java/org/apache/archiva/configuration/provider/FileTypesTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.provider; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/LegacyArtifactPathTest.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/java/org/apache/archiva/configuration/provider/LegacyArtifactPathTest.java similarity index 93% rename from archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/LegacyArtifactPathTest.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/java/org/apache/archiva/configuration/provider/LegacyArtifactPathTest.java index c36a93b71..38e7dfb60 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/LegacyArtifactPathTest.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/java/org/apache/archiva/configuration/provider/LegacyArtifactPathTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.provider; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 @@ -19,6 +18,7 @@ package org.apache.archiva.configuration; * under the License. */ +import org.apache.archiva.configuration.model.LegacyArtifactPath; import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/MavenProxyPropertyLoaderTest.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/java/org/apache/archiva/configuration/provider/MavenProxyPropertyLoaderTest.java similarity index 91% rename from archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/MavenProxyPropertyLoaderTest.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/java/org/apache/archiva/configuration/provider/MavenProxyPropertyLoaderTest.java index dfc41e949..892cf322e 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/MavenProxyPropertyLoaderTest.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/java/org/apache/archiva/configuration/provider/MavenProxyPropertyLoaderTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration; +package org.apache.archiva.configuration.provider; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration; * "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 - * + * 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 @@ -19,6 +18,10 @@ package org.apache.archiva.configuration; * under the License. */ +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.NetworkProxyConfiguration; +import org.apache.archiva.configuration.model.RemoteRepositoryConfiguration; import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner; import org.junit.Before; import org.junit.Test; diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparatorTest.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/java/org/apache/archiva/configuration/provider/functors/ProxyConnectorConfigurationOrderComparatorTest.java similarity index 94% rename from archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparatorTest.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/java/org/apache/archiva/configuration/provider/functors/ProxyConnectorConfigurationOrderComparatorTest.java index 458014f12..b5873f52b 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparatorTest.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/java/org/apache/archiva/configuration/provider/functors/ProxyConnectorConfigurationOrderComparatorTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration.functors; +package org.apache.archiva.configuration.provider.functors; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration.functors; * "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 - * + * 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 @@ -19,7 +18,8 @@ package org.apache.archiva.configuration.functors; * under the License. */ -import org.apache.archiva.configuration.ProxyConnectorConfiguration; +import org.apache.archiva.configuration.model.ProxyConnectorConfiguration; +import org.apache.archiva.configuration.model.functors.ProxyConnectorConfigurationOrderComparator; import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner; import org.apache.commons.lang3.StringUtils; import org.junit.Test; diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/functors/RepositoryConfigurationComparatorTest.java b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/java/org/apache/archiva/configuration/provider/functors/RepositoryConfigurationComparatorTest.java similarity index 85% rename from archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/functors/RepositoryConfigurationComparatorTest.java rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/java/org/apache/archiva/configuration/provider/functors/RepositoryConfigurationComparatorTest.java index 2dd659c86..0423351ac 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/functors/RepositoryConfigurationComparatorTest.java +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/java/org/apache/archiva/configuration/provider/functors/RepositoryConfigurationComparatorTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.configuration.functors; +package org.apache.archiva.configuration.provider.functors; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.configuration.functors; * "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 - * + * 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 @@ -19,8 +18,9 @@ package org.apache.archiva.configuration.functors; * under the License. */ -import org.apache.archiva.configuration.AbstractRepositoryConfiguration; -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.AbstractRepositoryConfiguration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.functors.RepositoryConfigurationComparator; import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/resources/log4j2-test.xml b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/resources/log4j2-test.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-configuration/src/test/resources/log4j2-test.xml rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/resources/log4j2-test.xml diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/resources/org/apache/archiva/configuration/test-default-archiva.xml b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/resources/org/apache/archiva/configuration/test-default-archiva.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-configuration/src/test/resources/org/apache/archiva/configuration/test-default-archiva.xml rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/resources/org/apache/archiva/configuration/test-default-archiva.xml diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/resources/spring-context.xml similarity index 91% rename from archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml rename to archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/resources/spring-context.xml index 4eb7b5be6..4f63c9839 100755 --- a/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml +++ b/archiva-modules/archiva-base/archiva-configuration/archiva-configuration-provider/src/test/resources/spring-context.xml @@ -29,17 +29,17 @@ - + - + - + @@ -58,7 +58,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,7 @@ - + @@ -113,7 +113,7 @@ - + @@ -131,7 +131,7 @@ - + @@ -148,7 +148,7 @@ - + @@ -167,7 +167,7 @@ - + @@ -186,7 +186,7 @@ - + @@ -206,7 +206,7 @@ - + @@ -226,7 +226,7 @@ - + @@ -244,7 +244,7 @@ - + @@ -263,7 +263,7 @@ - + @@ -281,7 +281,7 @@ - + @@ -302,7 +302,7 @@ - + diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml index 485245199..aff864c2f 100644 --- a/archiva-modules/archiva-base/archiva-configuration/pom.xml +++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml @@ -25,147 +25,21 @@ 3.0.0-SNAPSHOT 4.0.0 + org.apache.archiva.configuration archiva-configuration Archiva Base :: Configuration + 3.0.0-SNAPSHOT + pom ${project.parent.parent.basedir} + + archiva-configuration-model + archiva-configuration-provider + - - org.apache.archiva - archiva-common - - - org.apache.archiva - archiva-policies - - - org.apache.archiva.components.registry - archiva-components-spring-registry-api - - - org.springframework - spring-test - - - - - org.springframework - spring-context - - - commons-logging - commons-logging - - - - - org.apache.archiva.components.registry - archiva-components-spring-registry-commons - - - org.springframework - spring-test - - - - - org.apache.archiva.components - archiva-components-expression-evaluator - - - - jakarta.annotation - jakarta.annotation-api - - - jakarta.inject - jakarta.inject-api - - - - org.apache.commons - commons-configuration2 - runtime - - - commons-logging - commons-logging - - - - - - commons-io - commons-io - - - org.apache.commons - commons-lang3 - - - org.apache.commons - commons-collections4 - - - - - - - org.apache.archiva - archiva-test-utils - ${project.version} - test - - - - org.springframework - spring-test - test - - - org.apache.logging.log4j - log4j-jcl - test - - - - org.mockito - mockito-core - test - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - ${basedir} - - false - - - - - - - org.apache.rat - apache-rat-plugin - - - src/main/resources/org/apache/archiva/configuration/default-archiva.xml - src/test/conf/maven-proxy-complete.conf - src/test/resources/org/apache/archiva/configuration/test-default-archiva.xml - nbactions.xml - - - - - - diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo b/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo index 746f2c472..b8c5a7104 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo @@ -336,7 +336,7 @@ connectors.add( proxyConfig ); java.util.Collections.sort( connectors, - org.apache.archiva.configuration.functors.ProxyConnectorConfigurationOrderComparator.getInstance() ); + org.apache.archiva.configuration.provider.functors.ProxyConnectorConfigurationOrderComparator.getInstance() ); } } diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml index a86d0a1fe..42844565e 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml @@ -82,8 +82,8 @@ test - org.apache.archiva - archiva-configuration + org.apache.archiva.configuration + archiva-configuration-provider test diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/SimpleArtifactConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/SimpleArtifactConsumer.java index e9f0cc036..c6dab3538 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/SimpleArtifactConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/SimpleArtifactConsumer.java @@ -21,8 +21,8 @@ package $package; import org.apache.archiva.components.registry.Registry; import org.apache.archiva.components.registry.RegistryListener; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.FileTypes; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.provider.FileTypes; import org.apache.archiva.consumers.AbstractMonitoredConsumer; import org.apache.archiva.consumers.ConsumerException; import org.apache.archiva.consumers.KnownRepositoryContentConsumer; diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/RepositoryProviderMock.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/RepositoryProviderMock.java index 10f9f2d45..a77d0ebc4 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/RepositoryProviderMock.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/RepositoryProviderMock.java @@ -19,9 +19,9 @@ package $package; * under the License. */ -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; -import org.apache.archiva.configuration.RemoteRepositoryConfiguration; -import org.apache.archiva.configuration.RepositoryGroupConfiguration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.RemoteRepositoryConfiguration; +import org.apache.archiva.configuration.model.RepositoryGroupConfiguration; import org.apache.archiva.event.EventHandler; import org.apache.archiva.repository.base.managed.BasicManagedRepository; import org.apache.archiva.repository.base.remote.BasicRemoteRepository; diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml index 81a77435a..ac5f5ba2c 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml @@ -52,8 +52,8 @@ ${archiva.version} - org.apache.archiva - archiva-configuration + org.apache.archiva.configuration + archiva-configuration-provider ${archiva.version} diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml index 3502aa3ee..abad21899 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml @@ -34,8 +34,8 @@ - org.apache.archiva - archiva-configuration + org.apache.archiva.configuration + archiva-configuration-provider org.apache.archiva diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java index 559de35e0..cbb7a2ac4 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java @@ -20,8 +20,8 @@ package org.apache.archiva.consumers.core; */ import org.apache.archiva.checksum.*; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.FileTypes; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.provider.FileTypes; import org.apache.archiva.consumers.AbstractMonitoredConsumer; import org.apache.archiva.consumers.ConsumerException; import org.apache.archiva.consumers.KnownRepositoryContentConsumer; diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java index 89b014a7b..ffa022e40 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java @@ -19,9 +19,9 @@ package org.apache.archiva.consumers.core; * under the License. */ -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.ConfigurationNames; -import org.apache.archiva.configuration.FileTypes; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.ConfigurationNames; +import org.apache.archiva.configuration.provider.FileTypes; import org.apache.archiva.consumers.AbstractMonitoredConsumer; import org.apache.archiva.consumers.ConsumerException; import org.apache.archiva.consumers.KnownRepositoryContentConsumer; diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java index 5c7985491..4410c5477 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java @@ -19,7 +19,7 @@ package org.apache.archiva.consumers.core; * under the License. */ -import org.apache.archiva.configuration.FileTypes; +import org.apache.archiva.configuration.provider.FileTypes; import org.apache.archiva.consumers.AbstractMonitoredConsumer; import org.apache.archiva.consumers.ConsumerException; import org.apache.archiva.consumers.KnownRepositoryContentConsumer; diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java index 24779a77e..86bf774bf 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java @@ -19,9 +19,9 @@ package org.apache.archiva.consumers.core.repository; * under the License. */ -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.ConfigurationNames; -import org.apache.archiva.configuration.FileTypes; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.ConfigurationNames; +import org.apache.archiva.configuration.provider.FileTypes; import org.apache.archiva.consumers.AbstractMonitoredConsumer; import org.apache.archiva.consumers.ConsumerException; import org.apache.archiva.consumers.KnownRepositoryContentConsumer; diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/AbstractArtifactConsumerTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/AbstractArtifactConsumerTest.java index 8a50d78a4..721f270a4 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/AbstractArtifactConsumerTest.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/AbstractArtifactConsumerTest.java @@ -20,9 +20,9 @@ package org.apache.archiva.consumers.core; */ import org.apache.archiva.common.utils.BaseFile; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.FileType; -import org.apache.archiva.configuration.FileTypes; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.FileType; +import org.apache.archiva.configuration.provider.FileTypes; import org.apache.archiva.consumers.KnownRepositoryContentConsumer; import org.apache.archiva.consumers.functors.ConsumerWantsFilePredicate; import org.apache.archiva.repository.RepositoryRegistry; diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/mock/repository/RepositoryProviderMock.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/mock/repository/RepositoryProviderMock.java index a74ae2461..3cb612339 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/mock/repository/RepositoryProviderMock.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/mock/repository/RepositoryProviderMock.java @@ -18,9 +18,9 @@ package org.apache.archiva.consumers.core.mock.repository; * under the License. */ -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; -import org.apache.archiva.configuration.RemoteRepositoryConfiguration; -import org.apache.archiva.configuration.RepositoryGroupConfiguration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.RemoteRepositoryConfiguration; +import org.apache.archiva.configuration.model.RepositoryGroupConfiguration; import org.apache.archiva.event.EventHandler; import org.apache.archiva.repository.base.managed.BasicManagedRepository; import org.apache.archiva.repository.base.remote.BasicRemoteRepository; diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java index 2a60d710c..c3273cf6f 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java @@ -21,7 +21,7 @@ package org.apache.archiva.consumers.core.repository; import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin; import org.apache.archiva.admin.repository.managed.DefaultManagedRepositoryAdmin; -import org.apache.archiva.configuration.ArchivaConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; import org.apache.archiva.metadata.model.ArtifactMetadata; import org.apache.archiva.metadata.model.MetadataFacet; import org.apache.archiva.repository.base.ArchivaRepositoryRegistry; diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java index 209d050d3..ba5568ad3 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java @@ -20,9 +20,9 @@ package org.apache.archiva.consumers.core.repository; */ import org.apache.archiva.common.utils.BaseFile; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.FileType; -import org.apache.archiva.configuration.FileTypes; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.FileType; +import org.apache.archiva.configuration.provider.FileTypes; import org.apache.archiva.consumers.KnownRepositoryContentConsumer; import org.apache.archiva.consumers.functors.ConsumerWantsFilePredicate; import org.apache.archiva.metadata.model.ArtifactMetadata; diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-cleanup-released-snapshots.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-cleanup-released-snapshots.xml index 95c203340..32eb6357d 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-cleanup-released-snapshots.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-cleanup-released-snapshots.xml @@ -27,7 +27,7 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd" default-lazy-init="true"> - + diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-purge-consumer-test.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-purge-consumer-test.xml index 0657f9551..4b970df9c 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-purge-consumer-test.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-purge-consumer-test.xml @@ -38,7 +38,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -96,7 +96,7 @@ - + diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/pom.xml index 84c501651..261ddf871 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/pom.xml @@ -34,8 +34,8 @@ - org.apache.archiva - archiva-configuration + org.apache.archiva.configuration + archiva-configuration-provider org.apache.archiva diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java index e03557ebf..e4673205e 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java @@ -20,9 +20,9 @@ package org.apache.archiva.consumers.lucene; */ import org.apache.archiva.common.utils.PathUtil; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.ConfigurationNames; -import org.apache.archiva.configuration.FileTypes; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.ConfigurationNames; +import org.apache.archiva.configuration.provider.FileTypes; import org.apache.archiva.consumers.AbstractMonitoredConsumer; import org.apache.archiva.consumers.ConsumerException; import org.apache.archiva.consumers.KnownRepositoryContentConsumer; diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java index cf2768584..d5bcb077f 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java @@ -22,8 +22,8 @@ package org.apache.archiva.consumers.lucene; import junit.framework.TestCase; import org.apache.archiva.common.utils.PathUtil; import org.apache.archiva.components.taskqueue.TaskQueueException; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.FileTypes; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.provider.FileTypes; import org.apache.archiva.repository.ReleaseScheme; import org.apache.archiva.repository.base.ArchivaRepositoryRegistry; import org.apache.archiva.repository.base.RepositoryHandlerDependencies; diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml index f23955a1c..3c552e672 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml @@ -38,8 +38,8 @@ archiva-consumer-api - org.apache.archiva - archiva-configuration + org.apache.archiva.configuration + archiva-configuration-provider org.apache.archiva diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java index f694d5af4..9234108fc 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java @@ -20,9 +20,9 @@ package org.apache.archiva.consumers.metadata; */ import org.apache.archiva.common.utils.VersionUtil; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.ConfigurationNames; -import org.apache.archiva.configuration.FileTypes; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.ConfigurationNames; +import org.apache.archiva.configuration.provider.FileTypes; import org.apache.archiva.consumers.AbstractMonitoredConsumer; import org.apache.archiva.consumers.ConsumerException; import org.apache.archiva.consumers.KnownRepositoryContentConsumer; diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml index 2a63d5041..dc3c7da0d 100644 --- a/archiva-modules/archiva-base/archiva-proxy/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml @@ -34,8 +34,8 @@ - org.apache.archiva - archiva-configuration + org.apache.archiva.configuration + archiva-configuration-provider org.apache.archiva diff --git a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/base/ArchivaProxyRegistry.java b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/base/ArchivaProxyRegistry.java index a86cb3701..02a2c1bf2 100644 --- a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/base/ArchivaProxyRegistry.java +++ b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/base/ArchivaProxyRegistry.java @@ -18,9 +18,9 @@ package org.apache.archiva.proxy.base; * under the License. */ -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.NetworkProxyConfiguration; -import org.apache.archiva.configuration.ProxyConnectorConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.NetworkProxyConfiguration; +import org.apache.archiva.configuration.model.ProxyConnectorConfiguration; import org.apache.archiva.policies.Policy; import org.apache.archiva.policies.PolicyOption; import org.apache.archiva.policies.PolicyUtil; diff --git a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/base/DefaultRepositoryProxyHandler.java b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/base/DefaultRepositoryProxyHandler.java index 44c6c92b0..f0bfe6baa 100644 --- a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/base/DefaultRepositoryProxyHandler.java +++ b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/base/DefaultRepositoryProxyHandler.java @@ -23,9 +23,9 @@ import org.apache.archiva.checksum.ChecksumUtil; import org.apache.archiva.common.filelock.FileLockManager; import org.apache.archiva.common.utils.PathUtil; import org.apache.archiva.components.taskqueue.TaskQueueException; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.ProxyConnectorConfiguration; -import org.apache.archiva.configuration.ProxyConnectorRuleConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.ProxyConnectorConfiguration; +import org.apache.archiva.configuration.model.ProxyConnectorRuleConfiguration; import org.apache.archiva.policies.DownloadErrorPolicy; import org.apache.archiva.policies.DownloadPolicy; import org.apache.archiva.policies.Policy; diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml index 341d2a3c3..8c231f2c1 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml @@ -34,8 +34,8 @@ - org.apache.archiva - archiva-configuration + org.apache.archiva.configuration + archiva-configuration-provider org.apache.archiva diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java index f1c947572..d2cbb499a 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java @@ -22,10 +22,10 @@ import org.apache.archiva.admin.model.AuditInformation; import org.apache.archiva.admin.model.RepositoryAdminException; import org.apache.archiva.admin.model.RepositoryCommonValidator; import org.apache.archiva.admin.model.beans.AbstractRepository; -import org.apache.archiva.configuration.AbstractRepositoryConfiguration; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.IndeterminateConfigurationException; +import org.apache.archiva.configuration.model.AbstractRepositoryConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.provider.IndeterminateConfigurationException; import org.apache.archiva.metadata.model.facets.AuditEvent; import org.apache.archiva.components.registry.Registry; import org.apache.archiva.redback.users.User; diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/DefaultRepositoryCommonValidator.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/DefaultRepositoryCommonValidator.java index 7375942fe..df739e7a8 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/DefaultRepositoryCommonValidator.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/DefaultRepositoryCommonValidator.java @@ -23,8 +23,8 @@ import org.apache.archiva.admin.model.RepositoryCommonValidator; import org.apache.archiva.admin.model.beans.AbstractRepository; import org.apache.archiva.admin.model.beans.ManagedRepository; import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.Configuration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.Configuration; import org.apache.archiva.components.registry.Registry; import org.apache.archiva.components.scheduler.CronExpressionValidator; import org.apache.commons.lang3.StringUtils; diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java index dec2caa86..8db4ebe72 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java @@ -23,9 +23,9 @@ import org.apache.archiva.admin.model.RepositoryAdminException; import org.apache.archiva.admin.model.admin.ArchivaAdministration; import org.apache.archiva.admin.model.beans.*; import org.apache.archiva.admin.repository.AbstractRepositoryAdmin; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.UserInterfaceOptions; -import org.apache.archiva.configuration.WebappConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.UserInterfaceOptions; +import org.apache.archiva.configuration.model.WebappConfiguration; import org.apache.archiva.metadata.model.facets.AuditEvent; import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; @@ -54,7 +54,7 @@ public class DefaultArchivaAdministration { List legacyArtifactPaths = new ArrayList<>( getArchivaConfiguration().getConfiguration().getLegacyArtifactPaths().size() ); - for ( org.apache.archiva.configuration.LegacyArtifactPath legacyArtifactPath : getArchivaConfiguration().getConfiguration().getLegacyArtifactPaths() ) + for ( org.apache.archiva.configuration.model.LegacyArtifactPath legacyArtifactPath : getArchivaConfiguration().getConfiguration().getLegacyArtifactPaths() ) { legacyArtifactPaths.add( getModelMapper().map( legacyArtifactPath, LegacyArtifactPath.class ) ); @@ -69,7 +69,7 @@ public class DefaultArchivaAdministration Configuration configuration = getArchivaConfiguration().getConfiguration(); configuration.addLegacyArtifactPath( getModelMapper().map( legacyArtifactPath, - org.apache.archiva.configuration.LegacyArtifactPath.class ) ); + org.apache.archiva.configuration.model.LegacyArtifactPath.class ) ); saveConfiguration( configuration ); triggerAuditEvent( "", "", AuditEvent.ADD_LEGACY_PATH, auditInformation ); @@ -80,8 +80,8 @@ public class DefaultArchivaAdministration throws RepositoryAdminException { Configuration configuration = getArchivaConfiguration().getConfiguration(); - org.apache.archiva.configuration.LegacyArtifactPath legacyArtifactPath = - new org.apache.archiva.configuration.LegacyArtifactPath(); + org.apache.archiva.configuration.model.LegacyArtifactPath legacyArtifactPath = + new org.apache.archiva.configuration.model.LegacyArtifactPath(); legacyArtifactPath.setPath( path ); configuration.removeLegacyArtifactPath( legacyArtifactPath ); @@ -97,7 +97,7 @@ public class DefaultArchivaAdministration { Configuration configuration = getArchivaConfiguration().getConfiguration(); - org.apache.archiva.configuration.FileType fileType = getFileTypeById( fileTypeId, configuration ); + org.apache.archiva.configuration.model.FileType fileType = getFileTypeById( fileTypeId, configuration ); if ( fileType == null ) { return; @@ -120,7 +120,7 @@ public class DefaultArchivaAdministration { Configuration configuration = getArchivaConfiguration().getConfiguration(); - org.apache.archiva.configuration.FileType fileType = getFileTypeById( fileTypeId, configuration ); + org.apache.archiva.configuration.model.FileType fileType = getFileTypeById( fileTypeId, configuration ); if ( fileType == null ) { return; @@ -135,7 +135,7 @@ public class DefaultArchivaAdministration public FileType getFileType( String fileTypeId ) throws RepositoryAdminException { - org.apache.archiva.configuration.FileType fileType = + org.apache.archiva.configuration.model.FileType fileType = getFileTypeById( fileTypeId, getArchivaConfiguration().getConfiguration() ); if ( fileType == null ) { @@ -156,7 +156,7 @@ public class DefaultArchivaAdministration } configuration.getRepositoryScanning().addFileType( - getModelMapper().map( fileType, org.apache.archiva.configuration.FileType.class ) ); + getModelMapper().map( fileType, org.apache.archiva.configuration.model.FileType.class ) ); saveConfiguration( configuration ); } @@ -165,7 +165,7 @@ public class DefaultArchivaAdministration throws RepositoryAdminException { Configuration configuration = getArchivaConfiguration().getConfiguration(); - org.apache.archiva.configuration.FileType fileType = new org.apache.archiva.configuration.FileType(); + org.apache.archiva.configuration.model.FileType fileType = new org.apache.archiva.configuration.model.FileType(); fileType.setId( fileTypeId ); configuration.getRepositoryScanning().removeFileType( fileType ); saveConfiguration( configuration ); @@ -253,14 +253,14 @@ public class DefaultArchivaAdministration public List getFileTypes() throws RepositoryAdminException { - List configFileTypes = + List configFileTypes = getArchivaConfiguration().getConfiguration().getRepositoryScanning().getFileTypes(); if ( configFileTypes == null || configFileTypes.isEmpty() ) { return Collections.emptyList(); } List fileTypes = new ArrayList<>( configFileTypes.size() ); - for ( org.apache.archiva.configuration.FileType fileType : configFileTypes ) + for ( org.apache.archiva.configuration.model.FileType fileType : configFileTypes ) { fileTypes.add( getModelMapper().map( fileType, FileType.class ) ); } @@ -287,7 +287,7 @@ public class DefaultArchivaAdministration public OrganisationInformation getOrganisationInformation() throws RepositoryAdminException { - org.apache.archiva.configuration.OrganisationInformation organisationInformation = + org.apache.archiva.configuration.model.OrganisationInformation organisationInformation = getArchivaConfiguration().getConfiguration().getOrganisationInfo(); if ( organisationInformation == null ) { @@ -329,9 +329,9 @@ public class DefaultArchivaAdministration if ( organisationInformation != null ) { organisationInformation.setName( convertName( organisationInformation.getName() )); - org.apache.archiva.configuration.OrganisationInformation organisationInformationModel = + org.apache.archiva.configuration.model.OrganisationInformation organisationInformationModel = getModelMapper( ).map( organisationInformation, - org.apache.archiva.configuration.OrganisationInformation.class ); + org.apache.archiva.configuration.model.OrganisationInformation.class ); configuration.setOrganisationInfo( organisationInformationModel ); } else @@ -382,7 +382,7 @@ public class DefaultArchivaAdministration public NetworkConfiguration getNetworkConfiguration() throws RepositoryAdminException { - org.apache.archiva.configuration.NetworkConfiguration networkConfiguration = + org.apache.archiva.configuration.model.NetworkConfiguration networkConfiguration = getArchivaConfiguration().getConfiguration().getNetworkConfiguration(); if ( networkConfiguration == null ) @@ -404,7 +404,7 @@ public class DefaultArchivaAdministration else { configuration.setNetworkConfiguration( getModelMapper().map( networkConfiguration, - org.apache.archiva.configuration.NetworkConfiguration.class ) ); + org.apache.archiva.configuration.model.NetworkConfiguration.class ) ); } // setupWagon( networkConfiguration ); saveConfiguration( configuration ); @@ -415,9 +415,9 @@ public class DefaultArchivaAdministration // //------------------------- - private org.apache.archiva.configuration.FileType getFileTypeById( String id, Configuration configuration ) + private org.apache.archiva.configuration.model.FileType getFileTypeById( String id, Configuration configuration ) { - for ( org.apache.archiva.configuration.FileType fileType : configuration.getRepositoryScanning().getFileTypes() ) + for ( org.apache.archiva.configuration.model.FileType fileType : configuration.getRepositoryScanning().getFileTypes() ) { if ( StringUtils.equals( id, fileType.getId() ) ) { diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.java index a6276a844..f30c849a6 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.java @@ -27,13 +27,12 @@ import org.apache.archiva.admin.model.beans.RepositoryGroup; import org.apache.archiva.admin.model.group.RepositoryGroupAdmin; import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin; import org.apache.archiva.admin.repository.AbstractRepositoryAdmin; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.RepositoryGroupConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.RepositoryGroupConfiguration; import org.apache.archiva.event.Event; import org.apache.archiva.event.EventHandler; import org.apache.archiva.event.EventType; import org.apache.archiva.metadata.model.facets.AuditEvent; -import org.apache.archiva.indexer.merger.MergedRemoteIndexesScheduler; import org.apache.archiva.repository.EditableRepositoryGroup; import org.apache.archiva.repository.RepositoryException; import org.apache.archiva.repository.RepositoryRegistry; @@ -47,11 +46,6 @@ import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; import javax.inject.Inject; -import javax.inject.Named; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java index 7a8a98291..5b6dae25b 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java @@ -25,9 +25,9 @@ import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin; import org.apache.archiva.admin.repository.AbstractRepositoryAdmin; import org.apache.archiva.components.cache.Cache; import org.apache.archiva.components.taskqueue.TaskQueueException; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; -import org.apache.archiva.configuration.ProxyConnectorConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.ProxyConnectorConfiguration; import org.apache.archiva.indexer.ArchivaIndexManager; import org.apache.archiva.indexer.IndexManagerFactory; import org.apache.archiva.indexer.IndexUpdateFailedException; @@ -63,7 +63,6 @@ import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import java.util.Map; import java.util.stream.Collectors; diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/networkproxy/DefaultNetworkProxyAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/networkproxy/DefaultNetworkProxyAdmin.java index b6ccc73ff..7fd43ec3c 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/networkproxy/DefaultNetworkProxyAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/networkproxy/DefaultNetworkProxyAdmin.java @@ -23,8 +23,8 @@ import org.apache.archiva.admin.model.RepositoryAdminException; import org.apache.archiva.admin.model.beans.NetworkProxy; import org.apache.archiva.admin.model.networkproxy.NetworkProxyAdmin; import org.apache.archiva.admin.repository.AbstractRepositoryAdmin; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.NetworkProxyConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.NetworkProxyConfiguration; import org.apache.archiva.metadata.model.facets.AuditEvent; import org.apache.archiva.repository.RemoteRepository; import org.apache.archiva.repository.RepositoryException; diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java index 4a8f452ba..e6ec28b42 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java @@ -24,9 +24,9 @@ import org.apache.archiva.admin.model.beans.ProxyConnector; import org.apache.archiva.admin.model.proxyconnector.ProxyConnectorAdmin; import org.apache.archiva.admin.model.proxyconnector.ProxyConnectorOrderComparator; import org.apache.archiva.admin.repository.AbstractRepositoryAdmin; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.ProxyConnectorConfiguration; -import org.apache.archiva.configuration.functors.ProxyConnectorSelectionPredicate; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.ProxyConnectorConfiguration; +import org.apache.archiva.configuration.model.functors.ProxyConnectorSelectionPredicate; import org.apache.archiva.metadata.model.facets.AuditEvent; import org.apache.archiva.repository.RepositoryRegistry; import org.apache.commons.collections4.IterableUtils; diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnectorrule/DefaultProxyConnectorRuleAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnectorrule/DefaultProxyConnectorRuleAdmin.java index 9dbc37429..b6dd64bcc 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnectorrule/DefaultProxyConnectorRuleAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnectorrule/DefaultProxyConnectorRuleAdmin.java @@ -25,9 +25,9 @@ import org.apache.archiva.admin.model.beans.ProxyConnectorRule; import org.apache.archiva.proxy.model.ProxyConnectorRuleType; import org.apache.archiva.admin.model.proxyconnectorrule.ProxyConnectorRuleAdmin; import org.apache.archiva.admin.repository.AbstractRepositoryAdmin; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.ProxyConnectorConfiguration; -import org.apache.archiva.configuration.ProxyConnectorRuleConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.ProxyConnectorConfiguration; +import org.apache.archiva.configuration.model.ProxyConnectorRuleConfiguration; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java index 4a845beea..427f52e27 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java @@ -23,9 +23,9 @@ import org.apache.archiva.admin.model.RepositoryAdminException; import org.apache.archiva.admin.model.remote.RemoteRepositoryAdmin; import org.apache.archiva.admin.repository.AbstractRepositoryAdmin; import org.apache.archiva.common.utils.PathUtil; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.RemoteRepositoryConfiguration; -import org.apache.archiva.configuration.RepositoryCheckPath; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.RemoteRepositoryConfiguration; +import org.apache.archiva.configuration.model.RepositoryCheckPath; import org.apache.archiva.metadata.model.facets.AuditEvent; import org.apache.archiva.repository.RemoteRepository; import org.apache.archiva.repository.RepositoryCredentials; diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java index b6b1eb41b..2413c7194 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java @@ -24,9 +24,9 @@ import org.apache.archiva.admin.model.beans.CacheConfiguration; import org.apache.archiva.admin.model.beans.FileLockConfiguration; import org.apache.archiva.admin.model.runtime.ArchivaRuntimeConfigurationAdmin; import org.apache.archiva.admin.repository.AbstractRepositoryAdmin; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.IndeterminateConfigurationException; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.provider.IndeterminateConfigurationException; import org.apache.archiva.components.cache.Cache; import org.apache.archiva.components.registry.RegistryException; import org.springframework.stereotype.Service; @@ -146,7 +146,7 @@ public class DefaultArchivaRuntimeConfigurationAdmin } protected ArchivaRuntimeConfiguration build( - org.apache.archiva.configuration.ArchivaRuntimeConfiguration archivaRuntimeConfiguration ) + org.apache.archiva.configuration.model.ArchivaRuntimeConfiguration archivaRuntimeConfiguration ) { if ( archivaRuntimeConfiguration == null ) { @@ -175,24 +175,24 @@ public class DefaultArchivaRuntimeConfigurationAdmin return res; } - protected org.apache.archiva.configuration.ArchivaRuntimeConfiguration build( + protected org.apache.archiva.configuration.model.ArchivaRuntimeConfiguration build( ArchivaRuntimeConfiguration archivaRuntimeConfiguration ) { if ( archivaRuntimeConfiguration == null ) { - return new org.apache.archiva.configuration.ArchivaRuntimeConfiguration(); + return new org.apache.archiva.configuration.model.ArchivaRuntimeConfiguration(); } - org.apache.archiva.configuration.ArchivaRuntimeConfiguration res = + org.apache.archiva.configuration.model.ArchivaRuntimeConfiguration res = getModelMapper().map( archivaRuntimeConfiguration, - org.apache.archiva.configuration.ArchivaRuntimeConfiguration.class ); + org.apache.archiva.configuration.model.ArchivaRuntimeConfiguration.class ); if ( archivaRuntimeConfiguration.getUrlFailureCacheConfiguration() != null ) { res.setUrlFailureCacheConfiguration( getModelMapper().map( archivaRuntimeConfiguration.getUrlFailureCacheConfiguration(), - org.apache.archiva.configuration.CacheConfiguration.class ) ); + org.apache.archiva.configuration.model.CacheConfiguration.class ) ); } @@ -200,7 +200,7 @@ public class DefaultArchivaRuntimeConfigurationAdmin { res.setFileLockConfiguration( getModelMapper().map( archivaRuntimeConfiguration.getFileLockConfiguration(), - org.apache.archiva.configuration.FileLockConfiguration.class ) ); + org.apache.archiva.configuration.model.FileLockConfiguration.class ) ); } return res; diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java index d15990189..9c6afe659 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java @@ -25,15 +25,14 @@ import org.apache.archiva.admin.model.beans.LdapGroupMapping; import org.apache.archiva.admin.model.beans.RedbackRuntimeConfiguration; import org.apache.archiva.admin.model.runtime.RedbackRuntimeConfigurationAdmin; import org.apache.archiva.admin.repository.AbstractRepositoryAdmin; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.IndeterminateConfigurationException; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.provider.IndeterminateConfigurationException; import org.apache.archiva.components.cache.Cache; import org.apache.archiva.components.registry.RegistryException; -import org.apache.archiva.configuration.util.ConfigMapper; +import org.apache.archiva.configuration.provider.util.ConfigMapper; import org.apache.archiva.redback.configuration.UserConfiguration; import org.apache.archiva.redback.configuration.UserConfigurationException; -import org.apache.archiva.redback.configuration.UserConfigurationKeys; import org.apache.archiva.redback.users.User; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -349,7 +348,7 @@ public class DefaultRedbackRuntimeConfigurationAdmin public void updateRedbackRuntimeConfiguration( RedbackRuntimeConfiguration redbackRuntimeConfiguration ) throws RepositoryAdminException { - org.apache.archiva.configuration.RedbackRuntimeConfiguration runtimeConfiguration = + org.apache.archiva.configuration.model.RedbackRuntimeConfiguration runtimeConfiguration = build( redbackRuntimeConfiguration ); Configuration configuration = archivaConfiguration.getConfiguration(); configuration.setRedbackRuntimeConfiguration( runtimeConfiguration ); @@ -368,7 +367,7 @@ public class DefaultRedbackRuntimeConfigurationAdmin } private RedbackRuntimeConfiguration build( - org.apache.archiva.configuration.RedbackRuntimeConfiguration runtimeConfiguration ) + org.apache.archiva.configuration.model.RedbackRuntimeConfiguration runtimeConfiguration ) { RedbackRuntimeConfiguration redbackRuntimeConfiguration = getModelMapper().map( runtimeConfiguration, RedbackRuntimeConfiguration.class ); @@ -396,13 +395,13 @@ public class DefaultRedbackRuntimeConfigurationAdmin redbackRuntimeConfiguration.setUsersCacheConfiguration( new CacheConfiguration() ); } - List mappings = runtimeConfiguration.getLdapGroupMappings(); + List mappings = runtimeConfiguration.getLdapGroupMappings(); if ( mappings != null && mappings.size() > 0 ) { List ldapGroupMappings = new ArrayList<>( mappings.size() ); - for ( org.apache.archiva.configuration.LdapGroupMapping mapping : mappings ) + for ( org.apache.archiva.configuration.model.LdapGroupMapping mapping : mappings ) { ldapGroupMappings.add( new LdapGroupMapping( mapping.getGroup(), mapping.getRoleNames() ) ); } @@ -426,19 +425,19 @@ public class DefaultRedbackRuntimeConfigurationAdmin LDAP_MAPPER.getAllAttributes( ).stream( ).forEach( att -> properties.remove( att ) ); } - private org.apache.archiva.configuration.RedbackRuntimeConfiguration build( + private org.apache.archiva.configuration.model.RedbackRuntimeConfiguration build( RedbackRuntimeConfiguration redbackRuntimeConfiguration ) { - org.apache.archiva.configuration.RedbackRuntimeConfiguration res = + org.apache.archiva.configuration.model.RedbackRuntimeConfiguration res = getModelMapper().map( redbackRuntimeConfiguration, - org.apache.archiva.configuration.RedbackRuntimeConfiguration.class ); + org.apache.archiva.configuration.model.RedbackRuntimeConfiguration.class ); if ( redbackRuntimeConfiguration.getLdapConfiguration() == null ) { redbackRuntimeConfiguration.setLdapConfiguration( new LdapConfiguration() ); } res.setLdapConfiguration( getModelMapper().map( redbackRuntimeConfiguration.getLdapConfiguration(), - org.apache.archiva.configuration.LdapConfiguration.class ) ); + org.apache.archiva.configuration.model.LdapConfiguration.class ) ); if ( redbackRuntimeConfiguration.getUsersCacheConfiguration() == null ) { @@ -446,21 +445,21 @@ public class DefaultRedbackRuntimeConfigurationAdmin } res.setUsersCacheConfiguration( getModelMapper().map( redbackRuntimeConfiguration.getUsersCacheConfiguration(), - org.apache.archiva.configuration.CacheConfiguration.class ) ); + org.apache.archiva.configuration.model.CacheConfiguration.class ) ); List ldapGroupMappings = redbackRuntimeConfiguration.getLdapGroupMappings(); if ( ldapGroupMappings != null && ldapGroupMappings.size() > 0 ) { - List mappings = + List mappings = new ArrayList<>( ldapGroupMappings.size() ); for ( LdapGroupMapping ldapGroupMapping : ldapGroupMappings ) { - org.apache.archiva.configuration.LdapGroupMapping mapping = - new org.apache.archiva.configuration.LdapGroupMapping(); + org.apache.archiva.configuration.model.LdapGroupMapping mapping = + new org.apache.archiva.configuration.model.LdapGroupMapping(); mapping.setGroup( ldapGroupMapping.getGroup() ); mapping.setRoleNames( new ArrayList<>( ldapGroupMapping.getRoleNames() ) ); mappings.add( mapping ); diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/ArchivaIndexManagerMock.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/ArchivaIndexManagerMock.java index 6fbfa9589..0557fdb7b 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/ArchivaIndexManagerMock.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/ArchivaIndexManagerMock.java @@ -21,7 +21,7 @@ package org.apache.archiva.admin.mock; import org.apache.archiva.common.filelock.DefaultFileLockManager; import org.apache.archiva.common.utils.PathUtil; -import org.apache.archiva.configuration.ArchivaConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; import org.apache.archiva.indexer.ArchivaIndexManager; import org.apache.archiva.indexer.ArchivaIndexingContext; import org.apache.archiva.indexer.IndexCreationFailedException; diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java index 2d84e474f..9d7a9661f 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java @@ -27,7 +27,7 @@ import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin; import org.apache.archiva.admin.model.proxyconnector.ProxyConnectorAdmin; import org.apache.archiva.admin.model.proxyconnectorrule.ProxyConnectorRuleAdmin; import org.apache.archiva.admin.model.remote.RemoteRepositoryAdmin; -import org.apache.archiva.configuration.ArchivaConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; import org.apache.archiva.redback.role.RoleManager; import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.memory.SimpleUser; diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java index 2e542d5cc..2378d49e5 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java @@ -21,7 +21,7 @@ package org.apache.archiva.admin.repository.managed; import org.apache.archiva.admin.model.beans.ManagedRepository; import org.apache.archiva.admin.repository.AbstractRepositoryAdminTest; import org.apache.archiva.common.utils.FileUtils; -import org.apache.archiva.configuration.ArchivaConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; import org.apache.archiva.metadata.model.facets.AuditEvent; import org.apache.archiva.repository.RepositoryRegistry; import org.apache.archiva.security.common.ArchivaRoleConstants; diff --git a/archiva-modules/archiva-base/archiva-repository-api/pom.xml b/archiva-modules/archiva-base/archiva-repository-api/pom.xml index be94705fe..4ae27d9e3 100644 --- a/archiva-modules/archiva-base/archiva-repository-api/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-api/pom.xml @@ -52,8 +52,8 @@ archiva-model - org.apache.archiva - archiva-configuration + org.apache.archiva.configuration + archiva-configuration-provider org.springframework diff --git a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryContentFactory.java b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryContentFactory.java index 537a043a6..3ea75b266 100644 --- a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryContentFactory.java +++ b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryContentFactory.java @@ -19,10 +19,10 @@ package org.apache.archiva.repository; * under the License. */ -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.ConfigurationNames; import org.apache.archiva.components.registry.Registry; import org.apache.archiva.components.registry.RegistryListener; +import org.apache.archiva.configuration.model.ConfigurationNames; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Service; diff --git a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryHandler.java b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryHandler.java index ee7f1e4e1..8ed6c37da 100644 --- a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryHandler.java +++ b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryHandler.java @@ -17,8 +17,8 @@ package org.apache.archiva.repository; * under the License. */ -import org.apache.archiva.configuration.AbstractRepositoryConfiguration; -import org.apache.archiva.configuration.Configuration; +import org.apache.archiva.configuration.model.AbstractRepositoryConfiguration; +import org.apache.archiva.configuration.model.Configuration; import org.apache.archiva.repository.validation.CheckedResult; import org.apache.archiva.repository.validation.RepositoryChecker; import org.apache.archiva.repository.validation.RepositoryValidator; @@ -140,6 +140,19 @@ public interface RepositoryHandler CheckedResult putWithCheck( C repositoryConfiguration, RepositoryChecker checker ) throws RepositoryException; + /** + * Adds or updates a repository from the given configuration data. The resulting repository is + * checked by the default repository checker of the handler instance and the result is returned. + * If the checker returns a valid result, the registry is updated and configuration is saved. + * + * @param repositoryConfiguration the repository configuration + * @return the repository and the check result as map of attributes -> list of validation errors + * @throws RepositoryException if the creation or update failed + */ + CheckedResult>> + putWithCheck( C repositoryConfiguration ) throws RepositoryException; + + /** * Removes the given repository from the registry and updates references and saves the new configuration. * diff --git a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryHandlerManager.java b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryHandlerManager.java index d3270d184..f47bb184a 100644 --- a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryHandlerManager.java +++ b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryHandlerManager.java @@ -17,7 +17,7 @@ package org.apache.archiva.repository; * under the License. */ -import org.apache.archiva.configuration.AbstractRepositoryConfiguration; +import org.apache.archiva.configuration.model.AbstractRepositoryConfiguration; import org.apache.archiva.event.Event; import org.apache.archiva.event.EventHandler; diff --git a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryProvider.java b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryProvider.java index 813acb61d..89005f662 100644 --- a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryProvider.java +++ b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryProvider.java @@ -19,9 +19,9 @@ package org.apache.archiva.repository; * under the License. */ -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; -import org.apache.archiva.configuration.RemoteRepositoryConfiguration; -import org.apache.archiva.configuration.RepositoryGroupConfiguration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.RemoteRepositoryConfiguration; +import org.apache.archiva.configuration.model.RepositoryGroupConfiguration; import org.apache.archiva.event.EventHandler; import org.apache.archiva.repository.event.RepositoryEvent; diff --git a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryRegistry.java b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryRegistry.java index 718045e29..1c6123a83 100644 --- a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryRegistry.java +++ b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryRegistry.java @@ -19,11 +19,11 @@ package org.apache.archiva.repository; * under the License. */ -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; -import org.apache.archiva.configuration.RemoteRepositoryConfiguration; -import org.apache.archiva.configuration.RepositoryGroupConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.RemoteRepositoryConfiguration; +import org.apache.archiva.configuration.model.RepositoryGroupConfiguration; import org.apache.archiva.event.EventSource; import org.apache.archiva.indexer.ArchivaIndexManager; import org.apache.archiva.indexer.IndexUpdateFailedException; @@ -190,6 +190,16 @@ public interface RepositoryRegistry extends EventSource, RepositoryHandlerManage */ ManagedRepository putRepository( ManagedRepositoryConfiguration managedRepositoryConfiguration, Configuration configuration ) throws RepositoryException; + /** + * Validates the given repository configuration and adds the repository persistent to the registry, if it is valid. + * If the validation was not successful, the repository will not be added or persistet, and it will return the list of validation errors. + * + * @param configuration the managed repository configuration + * @return the managed repository or a list of validation errors + * @throws RepositoryException if there are errors while adding the repository + */ + CheckedResult>> putRepositoryAndValidate( ManagedRepositoryConfiguration configuration) throws RepositoryException; + /** * Adds or updates the given repository group. If a repository group with the given id exists already, it is updated * from the data of the given instance. Otherwise a new repository is created and updated by the data of the given instance. @@ -261,6 +271,19 @@ public interface RepositoryRegistry extends EventSource, RepositoryHandlerManage */ RemoteRepository putRepository( RemoteRepositoryConfiguration remoteRepositoryConfiguration ) throws RepositoryException; + /** + * Adds or updates the given remote repository. If a remote repository with the given id exists already, it is updated + * from the data of the given configuration. Otherwise a new repository is created and updated by the data of the given configuration. + * + * The remoteRepositoryConfiguration is validated before adding to the registry and persisting. If the validation fails, + * it is not registered or updated. + * + * @param remoteRepositoryConfiguration the remote repository configuration + * @return the repository instance, that was created or updated + * @throws RepositoryException if an error occurred while creating or updating the instance + */ + CheckedResult>> putRepositoryAndValidate( RemoteRepositoryConfiguration remoteRepositoryConfiguration ) throws RepositoryException; + /** * Adds or updates the given remote repository. If a remote repository with the given id exists already, it is updated * from the data of the given configuration. Otherwise a new repository is created and updated by the data of the given configuration. diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml index c68e4bce6..b9b6f4558 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml @@ -54,8 +54,8 @@ archiva-repository-api - org.apache.archiva - archiva-configuration + org.apache.archiva.configuration + archiva-configuration-provider org.apache.archiva diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/AbstractRepositoryHandler.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/AbstractRepositoryHandler.java index 9e316a7fe..0e17aacd6 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/AbstractRepositoryHandler.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/AbstractRepositoryHandler.java @@ -18,9 +18,9 @@ package org.apache.archiva.repository.base; */ import org.apache.archiva.components.registry.RegistryException; -import org.apache.archiva.configuration.AbstractRepositoryConfiguration; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.IndeterminateConfigurationException; +import org.apache.archiva.configuration.model.AbstractRepositoryConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.provider.IndeterminateConfigurationException; import org.apache.archiva.event.Event; import org.apache.archiva.event.EventManager; import org.apache.archiva.event.EventType; @@ -214,7 +214,13 @@ public abstract class AbstractRepositoryHandler>> putWithCheck( C repositoryConfiguration ) throws RepositoryException + { + return putWithCheck( repositoryConfiguration, getValidator( ) ); + } + + protected abstract C findRepositoryConfiguration( Configuration configuration, String id); protected abstract void removeRepositoryConfiguration(Configuration configuration, C repoConfiguration ); diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/ArchivaRepositoryRegistry.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/ArchivaRepositoryRegistry.java index a2c7dc39f..1d0c32207 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/ArchivaRepositoryRegistry.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/ArchivaRepositoryRegistry.java @@ -20,15 +20,15 @@ package org.apache.archiva.repository.base; */ import org.apache.archiva.components.registry.RegistryException; -import org.apache.archiva.configuration.AbstractRepositoryConfiguration; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.ConfigurationEvent; -import org.apache.archiva.configuration.ConfigurationListener; -import org.apache.archiva.configuration.IndeterminateConfigurationException; -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; -import org.apache.archiva.configuration.RemoteRepositoryConfiguration; -import org.apache.archiva.configuration.RepositoryGroupConfiguration; +import org.apache.archiva.configuration.model.AbstractRepositoryConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.provider.ConfigurationEvent; +import org.apache.archiva.configuration.provider.ConfigurationListener; +import org.apache.archiva.configuration.provider.IndeterminateConfigurationException; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.RemoteRepositoryConfiguration; +import org.apache.archiva.configuration.model.RepositoryGroupConfiguration; import org.apache.archiva.event.Event; import org.apache.archiva.event.EventHandler; import org.apache.archiva.event.EventManager; @@ -563,6 +563,17 @@ public class ArchivaRepositoryRegistry implements ConfigurationListener, EventHa } } + @Override + public CheckedResult>> putRepositoryAndValidate( ManagedRepositoryConfiguration configuration ) throws RepositoryException + { + rwLock.writeLock().lock(); + try { + return managedRepositoryHandler.putWithCheck( configuration ); + } finally + { + rwLock.writeLock( ).unlock( ); + } + } /** * Adds a new repository group to the current list, or replaces the repository group definition with @@ -620,7 +631,7 @@ public class ArchivaRepositoryRegistry implements ConfigurationListener, EventHa rwLock.writeLock( ).lock( ); try { - return groupHandler.putWithCheck( repositoryGroupConfiguration, groupHandler.getValidator( ) ); + return groupHandler.putWithCheck( repositoryGroupConfiguration ); } finally { @@ -695,6 +706,18 @@ public class ArchivaRepositoryRegistry implements ConfigurationListener, EventHa } } + @Override + public CheckedResult>> putRepositoryAndValidate( RemoteRepositoryConfiguration remoteRepositoryConfiguration ) throws RepositoryException + { + rwLock.writeLock().lock(); + try { + return remoteRepositoryHandler.putWithCheck( remoteRepositoryConfiguration ); + } finally + { + rwLock.writeLock().unlock(); + } + } + /** * Adds a new repository or updates the repository with the same id. The given configuration object is updated, but * the configuration is not saved. diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/ConfigurationHandler.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/ConfigurationHandler.java index 9278e022a..b54e385a1 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/ConfigurationHandler.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/ConfigurationHandler.java @@ -18,10 +18,10 @@ package org.apache.archiva.repository.base; */ import org.apache.archiva.components.registry.RegistryException; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.ConfigurationListener; -import org.apache.archiva.configuration.IndeterminateConfigurationException; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.provider.ConfigurationListener; +import org.apache.archiva.configuration.provider.IndeterminateConfigurationException; import org.springframework.stereotype.Service; import java.util.concurrent.locks.ReentrantReadWriteLock; diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/group/RepositoryGroupHandler.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/group/RepositoryGroupHandler.java index 9285de888..547a66659 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/group/RepositoryGroupHandler.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/group/RepositoryGroupHandler.java @@ -18,10 +18,10 @@ package org.apache.archiva.repository.base.group; */ import org.apache.archiva.components.registry.RegistryException; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.IndeterminateConfigurationException; -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; -import org.apache.archiva.configuration.RepositoryGroupConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.provider.IndeterminateConfigurationException; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.RepositoryGroupConfiguration; import org.apache.archiva.indexer.merger.MergedRemoteIndexesScheduler; import org.apache.archiva.repository.EditableRepository; import org.apache.archiva.repository.EditableRepositoryGroup; diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/managed/ManagedRepositoryHandler.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/managed/ManagedRepositoryHandler.java index 0ed99ecc7..bdcbf04d8 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/managed/ManagedRepositoryHandler.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/managed/ManagedRepositoryHandler.java @@ -18,9 +18,9 @@ package org.apache.archiva.repository.base.managed; */ import org.apache.archiva.components.registry.RegistryException; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.IndeterminateConfigurationException; -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.provider.IndeterminateConfigurationException; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; import org.apache.archiva.indexer.ArchivaIndexManager; import org.apache.archiva.indexer.IndexCreationFailedException; import org.apache.archiva.indexer.IndexManagerFactory; diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/remote/RemoteRepositoryHandler.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/remote/RemoteRepositoryHandler.java index ea1f19c91..9d9417f86 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/remote/RemoteRepositoryHandler.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/remote/RemoteRepositoryHandler.java @@ -18,10 +18,10 @@ package org.apache.archiva.repository.base.remote; */ import org.apache.archiva.components.registry.RegistryException; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.IndeterminateConfigurationException; -import org.apache.archiva.configuration.ProxyConnectorConfiguration; -import org.apache.archiva.configuration.RemoteRepositoryConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.provider.IndeterminateConfigurationException; +import org.apache.archiva.configuration.model.ProxyConnectorConfiguration; +import org.apache.archiva.configuration.model.RemoteRepositoryConfiguration; import org.apache.archiva.indexer.ArchivaIndexManager; import org.apache.archiva.indexer.IndexCreationFailedException; import org.apache.archiva.indexer.IndexManagerFactory; diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/base/MetadataTools.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/base/MetadataTools.java index cb8b6eb4d..2a385ba5d 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/base/MetadataTools.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/base/MetadataTools.java @@ -25,12 +25,12 @@ import org.apache.archiva.common.utils.VersionComparator; import org.apache.archiva.common.utils.VersionUtil; import org.apache.archiva.components.registry.Registry; import org.apache.archiva.components.registry.RegistryListener; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.ConfigurationEvent; -import org.apache.archiva.configuration.ConfigurationListener; -import org.apache.archiva.configuration.ConfigurationNames; -import org.apache.archiva.configuration.FileTypes; -import org.apache.archiva.configuration.ProxyConnectorConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.provider.ConfigurationEvent; +import org.apache.archiva.configuration.provider.ConfigurationListener; +import org.apache.archiva.configuration.model.ConfigurationNames; +import org.apache.archiva.configuration.provider.FileTypes; +import org.apache.archiva.configuration.model.ProxyConnectorConfiguration; import org.apache.archiva.model.ArchivaRepositoryMetadata; import org.apache.archiva.model.Plugin; import org.apache.archiva.model.SnapshotVersion; diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/base/ArchivaRepositoryRegistryTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/base/ArchivaRepositoryRegistryTest.java index e4bb05230..d1f58e263 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/base/ArchivaRepositoryRegistryTest.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/base/ArchivaRepositoryRegistryTest.java @@ -19,10 +19,10 @@ package org.apache.archiva.repository.base; * under the License. */ -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; -import org.apache.archiva.configuration.RemoteRepositoryConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.RemoteRepositoryConfiguration; import org.apache.archiva.repository.ManagedRepository; import org.apache.archiva.repository.ReleaseScheme; import org.apache.archiva.repository.RemoteRepository; diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/base/group/RepositoryGroupHandlerTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/base/group/RepositoryGroupHandlerTest.java index ea65a2e0e..fb607e427 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/base/group/RepositoryGroupHandlerTest.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/base/group/RepositoryGroupHandlerTest.java @@ -21,11 +21,11 @@ package org.apache.archiva.repository.base.group; import org.apache.archiva.common.filelock.DefaultFileLockManager; import org.apache.archiva.common.filelock.FileLockManager; import org.apache.archiva.common.utils.FileUtils; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; -import org.apache.archiva.configuration.RemoteRepositoryConfiguration; -import org.apache.archiva.configuration.RepositoryGroupConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.RemoteRepositoryConfiguration; +import org.apache.archiva.configuration.model.RepositoryGroupConfiguration; import org.apache.archiva.indexer.merger.MergedRemoteIndexesScheduler; import org.apache.archiva.repository.EditableRepositoryGroup; import org.apache.archiva.repository.ManagedRepository; diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/base/managed/BasicManagedRepositoryValidatorTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/base/managed/BasicManagedRepositoryValidatorTest.java index 2fe4f671e..a5ed4b5b0 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/base/managed/BasicManagedRepositoryValidatorTest.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/base/managed/BasicManagedRepositoryValidatorTest.java @@ -20,7 +20,7 @@ package org.apache.archiva.repository.base.managed; import org.apache.archiva.common.filelock.DefaultFileLockManager; import org.apache.archiva.common.filelock.FileLockManager; -import org.apache.archiva.configuration.ArchivaConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; import org.apache.archiva.repository.EditableManagedRepository; import org.apache.archiva.repository.ManagedRepository; import org.apache.archiva.repository.RepositoryException; diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/base/managed/ManagedRepositoryHandlerTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/base/managed/ManagedRepositoryHandlerTest.java index 8811d4a46..fb6505de7 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/base/managed/ManagedRepositoryHandlerTest.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/base/managed/ManagedRepositoryHandlerTest.java @@ -21,11 +21,10 @@ package org.apache.archiva.repository.base.managed; import org.apache.archiva.common.filelock.DefaultFileLockManager; import org.apache.archiva.common.filelock.FileLockManager; import org.apache.archiva.common.utils.FileUtils; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; import org.apache.archiva.indexer.IndexManagerFactory; -import org.apache.archiva.indexer.merger.MergedRemoteIndexesScheduler; import org.apache.archiva.repository.EditableManagedRepository; import org.apache.archiva.repository.ManagedRepository; import org.apache.archiva.repository.Repository; @@ -41,7 +40,6 @@ import org.apache.archiva.repository.validation.RepositoryValidator; import org.apache.archiva.repository.validation.ValidationError; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringExtension; diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/base/remote/RemoteRepositoryHandlerTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/base/remote/RemoteRepositoryHandlerTest.java index f596b8e23..b23c7f92f 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/base/remote/RemoteRepositoryHandlerTest.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/base/remote/RemoteRepositoryHandlerTest.java @@ -21,9 +21,9 @@ package org.apache.archiva.repository.base.remote; import org.apache.archiva.common.filelock.DefaultFileLockManager; import org.apache.archiva.common.filelock.FileLockManager; import org.apache.archiva.common.utils.FileUtils; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.RemoteRepositoryConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.RemoteRepositoryConfiguration; import org.apache.archiva.indexer.IndexManagerFactory; import org.apache.archiva.repository.EditableRemoteRepository; import org.apache.archiva.repository.RemoteRepository; diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java index 5a3a4736d..3a0707367 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java @@ -19,9 +19,9 @@ package org.apache.archiva.repository.mock; * under the License. */ -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; -import org.apache.archiva.configuration.RemoteRepositoryConfiguration; -import org.apache.archiva.configuration.RepositoryGroupConfiguration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.RemoteRepositoryConfiguration; +import org.apache.archiva.configuration.model.RepositoryGroupConfiguration; import org.apache.archiva.event.EventHandler; import org.apache.archiva.repository.*; import org.apache.archiva.event.Event; diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml index c57a4ba1e..11131f74d 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml @@ -38,8 +38,8 @@ archiva-consumer-api - org.apache.archiva - archiva-configuration + org.apache.archiva.configuration + archiva-configuration-provider org.apache.archiva diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java index 650162bd5..0fd0c3cac 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java @@ -19,7 +19,7 @@ package org.apache.archiva.repository.scanner; * under the License. */ -import org.apache.archiva.configuration.FileTypes; +import org.apache.archiva.configuration.provider.FileTypes; import org.apache.archiva.consumers.ConsumerException; import org.apache.archiva.consumers.InvalidRepositoryContentConsumer; import org.apache.archiva.consumers.KnownRepositoryContentConsumer; diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java index 0795fa557..5457202a2 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java @@ -23,7 +23,7 @@ import org.apache.archiva.admin.model.RepositoryAdminException; import org.apache.archiva.admin.model.admin.ArchivaAdministration; import org.apache.archiva.common.utils.BaseFile; import org.apache.archiva.common.utils.PathUtil; -import org.apache.archiva.configuration.ArchivaConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; import org.apache.archiva.consumers.ConsumerException; import org.apache.archiva.consumers.InvalidRepositoryContentConsumer; import org.apache.archiva.consumers.KnownRepositoryContentConsumer; diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/ArchivaAdministrationStub.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/ArchivaAdministrationStub.java index d3eadfdfa..ca43b6569 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/ArchivaAdministrationStub.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/ArchivaAdministrationStub.java @@ -26,7 +26,7 @@ import org.apache.archiva.admin.model.beans.LegacyArtifactPath; import org.apache.archiva.admin.model.beans.NetworkConfiguration; import org.apache.archiva.admin.model.beans.OrganisationInformation; import org.apache.archiva.admin.model.beans.UiConfiguration; -import org.apache.archiva.configuration.ArchivaConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; import org.springframework.stereotype.Service; import java.util.List; diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java index b2bfd5191..40b0e9e77 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java @@ -20,7 +20,7 @@ package org.apache.archiva.repository.scanner; */ import junit.framework.TestCase; -import org.apache.archiva.configuration.ArchivaConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; import org.apache.archiva.consumers.InvalidRepositoryContentConsumer; import org.apache.archiva.consumers.KnownRepositoryContentConsumer; import org.apache.archiva.repository.base.managed.BasicManagedRepository; diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/spring-context.xml index 219f7144a..a77f925e2 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/spring-context.xml +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/spring-context.xml @@ -24,7 +24,7 @@ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd" default-lazy-init="true"> - + diff --git a/archiva-modules/archiva-maven/archiva-maven-indexer/pom.xml b/archiva-modules/archiva-maven/archiva-maven-indexer/pom.xml index f2855f681..b49e39c7d 100644 --- a/archiva-modules/archiva-maven/archiva-maven-indexer/pom.xml +++ b/archiva-modules/archiva-maven/archiva-maven-indexer/pom.xml @@ -77,8 +77,8 @@ archiva-model - org.apache.archiva - archiva-configuration + org.apache.archiva.configuration + archiva-configuration-provider diff --git a/archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/maven/indexer/MavenIndexManager.java b/archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/maven/indexer/MavenIndexManager.java index 512c74194..da4d1b779 100644 --- a/archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/maven/indexer/MavenIndexManager.java +++ b/archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/maven/indexer/MavenIndexManager.java @@ -20,7 +20,7 @@ package org.apache.archiva.maven.indexer; import org.apache.archiva.common.utils.FileUtils; import org.apache.archiva.common.utils.PathUtil; -import org.apache.archiva.configuration.ArchivaConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; import org.apache.archiva.indexer.ArchivaIndexManager; import org.apache.archiva.indexer.ArchivaIndexingContext; import org.apache.archiva.indexer.IndexCreationFailedException; diff --git a/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/maven/indexer/search/AbstractMavenRepositorySearch.java b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/maven/indexer/search/AbstractMavenRepositorySearch.java index 4cdc10dba..3ff27e379 100644 --- a/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/maven/indexer/search/AbstractMavenRepositorySearch.java +++ b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/maven/indexer/search/AbstractMavenRepositorySearch.java @@ -20,10 +20,9 @@ package org.apache.archiva.maven.indexer.search; import junit.framework.TestCase; import org.apache.archiva.common.utils.FileUtils; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.ConfigurationListener; -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; import org.apache.archiva.indexer.ArchivaIndexingContext; import org.apache.archiva.indexer.search.SearchResultHit; import org.apache.archiva.indexer.search.SearchResults; diff --git a/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml index 611964236..653256609 100644 --- a/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml +++ b/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml @@ -78,8 +78,8 @@ archiva-model - org.apache.archiva - archiva-configuration + org.apache.archiva.configuration + archiva-configuration-provider org.apache.archiva diff --git a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/maven/proxy/AbstractProxyTestCase.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/maven/proxy/AbstractProxyTestCase.java index ae3589333..5fd12f264 100644 --- a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/maven/proxy/AbstractProxyTestCase.java +++ b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/maven/proxy/AbstractProxyTestCase.java @@ -18,11 +18,11 @@ package org.apache.archiva.maven.proxy; * under the License. */ -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.ArchivaRuntimeConfiguration; -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; -import org.apache.archiva.configuration.ProxyConnectorConfiguration; -import org.apache.archiva.configuration.RemoteRepositoryConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.ArchivaRuntimeConfiguration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.ProxyConnectorConfiguration; +import org.apache.archiva.configuration.model.RemoteRepositoryConfiguration; import org.apache.archiva.policies.CachedFailuresPolicy; import org.apache.archiva.policies.ChecksumPolicy; import org.apache.archiva.policies.PolicyOption; diff --git a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/maven/proxy/HttpProxyTransferTest.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/maven/proxy/HttpProxyTransferTest.java index 9d47b1bc7..f8ec13f00 100644 --- a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/maven/proxy/HttpProxyTransferTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/maven/proxy/HttpProxyTransferTest.java @@ -18,10 +18,10 @@ package org.apache.archiva.maven.proxy; * under the License. */ -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.NetworkProxyConfiguration; -import org.apache.archiva.configuration.ProxyConnectorConfiguration; -import org.apache.archiva.configuration.RemoteRepositoryConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.NetworkProxyConfiguration; +import org.apache.archiva.configuration.model.ProxyConnectorConfiguration; +import org.apache.archiva.configuration.model.RemoteRepositoryConfiguration; import org.apache.archiva.policies.CachedFailuresPolicy; import org.apache.archiva.policies.ChecksumPolicy; import org.apache.archiva.policies.PropagateErrorsDownloadPolicy; diff --git a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/maven/proxy/MetadataTransferTest.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/maven/proxy/MetadataTransferTest.java index 530b0561f..bec37cf1b 100644 --- a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/maven/proxy/MetadataTransferTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/maven/proxy/MetadataTransferTest.java @@ -20,7 +20,7 @@ package org.apache.archiva.maven.proxy; import org.apache.archiva.common.filelock.DefaultFileLockManager; import org.apache.archiva.common.utils.VersionUtil; -import org.apache.archiva.configuration.ProxyConnectorConfiguration; +import org.apache.archiva.configuration.model.ProxyConnectorConfiguration; import org.apache.archiva.model.ArchivaRepositoryMetadata; import org.apache.archiva.model.Plugin; import org.apache.archiva.model.SnapshotVersion; diff --git a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/maven/proxy/MockConfiguration.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/maven/proxy/MockConfiguration.java index 2cf6a105a..5116078ec 100644 --- a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/maven/proxy/MockConfiguration.java +++ b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/maven/proxy/MockConfiguration.java @@ -18,12 +18,15 @@ package org.apache.archiva.maven.proxy; * under the License. */ -import org.apache.archiva.configuration.*; +import org.apache.archiva.configuration.model.ArchivaRuntimeConfiguration; +import org.apache.archiva.configuration.model.FileType; +import org.apache.archiva.configuration.model.RepositoryScanningConfiguration; +import org.apache.archiva.configuration.provider.*; import org.apache.archiva.components.registry.Registry; import org.apache.archiva.components.registry.RegistryException; import org.apache.archiva.components.registry.RegistryListener; +import org.apache.archiva.configuration.model.Configuration; import org.apache.commons.lang3.StringUtils; -import org.mockito.Mockito; import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; diff --git a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/maven/proxy/mock/repository/RepositoryProviderMock.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/maven/proxy/mock/repository/RepositoryProviderMock.java index 3c9efe8a6..90dfb5824 100644 --- a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/maven/proxy/mock/repository/RepositoryProviderMock.java +++ b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/maven/proxy/mock/repository/RepositoryProviderMock.java @@ -18,9 +18,9 @@ package org.apache.archiva.maven.proxy.mock.repository; * under the License. */ -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; -import org.apache.archiva.configuration.RemoteRepositoryConfiguration; -import org.apache.archiva.configuration.RepositoryGroupConfiguration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.RemoteRepositoryConfiguration; +import org.apache.archiva.configuration.model.RepositoryGroupConfiguration; import org.apache.archiva.event.EventHandler; import org.apache.archiva.repository.base.managed.BasicManagedRepository; import org.apache.archiva.repository.base.remote.BasicRemoteRepository; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml index f415c77e3..7c042b5c7 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml +++ b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml @@ -212,8 +212,8 @@ - org.apache.archiva - archiva-configuration + org.apache.archiva.configuration + archiva-configuration-provider org.apache.archiva.maven diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/MavenRepositoryProvider.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/MavenRepositoryProvider.java index 636b8c988..87a263a03 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/MavenRepositoryProvider.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/MavenRepositoryProvider.java @@ -19,11 +19,11 @@ package org.apache.archiva.maven.repository; */ import org.apache.archiva.common.filelock.FileLockManager; -import org.apache.archiva.configuration.AbstractRepositoryConfiguration; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; -import org.apache.archiva.configuration.RemoteRepositoryConfiguration; -import org.apache.archiva.configuration.RepositoryGroupConfiguration; +import org.apache.archiva.configuration.model.AbstractRepositoryConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.RemoteRepositoryConfiguration; +import org.apache.archiva.configuration.model.RepositoryGroupConfiguration; import org.apache.archiva.event.Event; import org.apache.archiva.event.EventHandler; import org.apache.archiva.repository.EditableManagedRepository; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/ManagedDefaultRepositoryContent.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/ManagedDefaultRepositoryContent.java index e9818dc63..4b9d27d51 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/ManagedDefaultRepositoryContent.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/ManagedDefaultRepositoryContent.java @@ -21,7 +21,7 @@ package org.apache.archiva.maven.repository.content; import org.apache.archiva.common.filelock.FileLockManager; import org.apache.archiva.common.utils.FileUtils; import org.apache.archiva.common.utils.VersionUtil; -import org.apache.archiva.configuration.FileTypes; +import org.apache.archiva.configuration.provider.FileTypes; import org.apache.archiva.maven.metadata.MavenMetadataReader; import org.apache.archiva.repository.EditableManagedRepository; import org.apache.archiva.repository.ItemDeleteStatus; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/MavenContentProvider.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/MavenContentProvider.java index eb80f7746..bea96aa0f 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/MavenContentProvider.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/MavenContentProvider.java @@ -19,7 +19,7 @@ package org.apache.archiva.maven.repository.content; */ import org.apache.archiva.common.filelock.FileLockManager; -import org.apache.archiva.configuration.FileTypes; +import org.apache.archiva.configuration.provider.FileTypes; import org.apache.archiva.maven.repository.metadata.storage.ArtifactMappingProvider; import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; import org.apache.archiva.repository.ManagedRepository; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/merge/Maven2RepositoryMerger.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/merge/Maven2RepositoryMerger.java index 4bb7fb9a4..1bc75f21d 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/merge/Maven2RepositoryMerger.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/merge/Maven2RepositoryMerger.java @@ -21,9 +21,9 @@ package org.apache.archiva.maven.repository.merge; import org.apache.archiva.common.filelock.DefaultFileLockManager; import org.apache.archiva.common.utils.VersionComparator; import org.apache.archiva.common.utils.VersionUtil; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; import org.apache.archiva.filter.Filter; import org.apache.archiva.maven.metadata.MavenMetadataReader; import org.apache.archiva.metadata.model.ArtifactMetadata; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/MavenRepositoryProviderTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/MavenRepositoryProviderTest.java index dcd3b7f37..98472de02 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/MavenRepositoryProviderTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/MavenRepositoryProviderTest.java @@ -19,10 +19,10 @@ package org.apache.archiva.maven.repository; */ import org.apache.archiva.common.utils.FileUtils; -import org.apache.archiva.configuration.ArchivaRuntimeConfiguration; -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; -import org.apache.archiva.configuration.RemoteRepositoryConfiguration; -import org.apache.archiva.configuration.RepositoryGroupConfiguration; +import org.apache.archiva.configuration.model.ArchivaRuntimeConfiguration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.RemoteRepositoryConfiguration; +import org.apache.archiva.configuration.model.RepositoryGroupConfiguration; import org.apache.archiva.repository.EditableRepositoryGroup; import org.apache.archiva.repository.ManagedRepository; import org.apache.archiva.repository.ReleaseScheme; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/ManagedDefaultRepositoryContentTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/ManagedDefaultRepositoryContentTest.java index 83930a1cd..5cebdf53a 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/ManagedDefaultRepositoryContentTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/ManagedDefaultRepositoryContentTest.java @@ -20,9 +20,9 @@ package org.apache.archiva.maven.repository.content; import org.apache.archiva.common.filelock.FileLockManager; import org.apache.archiva.common.utils.VersionComparator; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.FileType; -import org.apache.archiva.configuration.FileTypes; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.FileType; +import org.apache.archiva.configuration.provider.FileTypes; import org.apache.archiva.maven.metadata.MavenMetadataReader; import org.apache.archiva.maven.repository.MavenManagedRepository; import org.apache.archiva.maven.repository.metadata.storage.ArtifactMappingProvider; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/MavenRepositoryRequestInfoTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/MavenRepositoryRequestInfoTest.java index 1cfdc4709..764a57113 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/MavenRepositoryRequestInfoTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/MavenRepositoryRequestInfoTest.java @@ -20,9 +20,9 @@ package org.apache.archiva.maven.repository.content; import org.apache.archiva.common.filelock.FileLockManager; import org.apache.archiva.common.utils.FileUtils; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.FileType; -import org.apache.archiva.configuration.FileTypes; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.FileType; +import org.apache.archiva.configuration.provider.FileTypes; import org.apache.archiva.maven.repository.MavenManagedRepository; import org.apache.archiva.maven.repository.metadata.storage.ArtifactMappingProvider; import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/dependency/tree/DependencyTreeBuilderTestMaven3.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/dependency/tree/DependencyTreeBuilderTestMaven3.java index c78ae5f9d..b5e251373 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/dependency/tree/DependencyTreeBuilderTestMaven3.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/dependency/tree/DependencyTreeBuilderTestMaven3.java @@ -19,9 +19,9 @@ package org.apache.archiva.maven.repository.dependency.tree; */ import junit.framework.TestCase; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; import org.apache.archiva.maven.model.Artifact; import org.apache.archiva.maven.model.TreeEntry; import org.apache.archiva.repository.RepositoryRegistry; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/merge/Maven2RepositoryMergerTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/merge/Maven2RepositoryMergerTest.java index 780d1b729..a36891a7c 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/merge/Maven2RepositoryMergerTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/merge/Maven2RepositoryMergerTest.java @@ -19,10 +19,10 @@ package org.apache.archiva.maven.repository.merge; */ import junit.framework.TestCase; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; -import org.apache.archiva.configuration.RepositoryScanningConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.RepositoryScanningConfiguration; import org.apache.archiva.metadata.model.ArtifactMetadata; import org.apache.archiva.metadata.repository.MetadataRepository; import org.apache.archiva.metadata.repository.MetadataRepositoryException; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/MetadataToolsTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/MetadataToolsTest.java index 03d94f346..e7557ccc3 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/MetadataToolsTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/MetadataToolsTest.java @@ -19,7 +19,7 @@ package org.apache.archiva.maven.repository.metadata; */ import org.apache.archiva.common.utils.VersionComparator; -import org.apache.archiva.configuration.ProxyConnectorConfiguration; +import org.apache.archiva.configuration.model.ProxyConnectorConfiguration; import org.apache.archiva.maven.repository.AbstractRepositoryLayerTestCase; import org.apache.archiva.maven.repository.MavenManagedRepository; import org.apache.archiva.maven.repository.metadata.storage.mock.MockConfiguration; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java index 730593083..0e33ad1d4 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java @@ -19,12 +19,12 @@ package org.apache.archiva.maven.repository.metadata.storage; */ import junit.framework.TestCase; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; -import org.apache.archiva.configuration.ProxyConnectorConfiguration; -import org.apache.archiva.configuration.RemoteRepositoryConfiguration; -import org.apache.archiva.configuration.RepositoryGroupConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.ProxyConnectorConfiguration; +import org.apache.archiva.configuration.model.RemoteRepositoryConfiguration; +import org.apache.archiva.configuration.model.RepositoryGroupConfiguration; import org.apache.archiva.filter.AllFilter; import org.apache.archiva.filter.Filter; import org.apache.archiva.metadata.model.ArtifactMetadata; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverMRM1411Test.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverMRM1411Test.java index c9d5c0222..5c2a6cd55 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverMRM1411Test.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverMRM1411Test.java @@ -19,11 +19,11 @@ package org.apache.archiva.maven.repository.metadata.storage; */ import junit.framework.TestCase; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; -import org.apache.archiva.configuration.ProxyConnectorConfiguration; -import org.apache.archiva.configuration.RemoteRepositoryConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.ProxyConnectorConfiguration; +import org.apache.archiva.configuration.model.RemoteRepositoryConfiguration; import org.apache.archiva.filter.AllFilter; import org.apache.archiva.filter.Filter; import org.apache.archiva.metadata.model.ArtifactMetadata; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverTest.java index 109ccacb1..6f5f72c1d 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverTest.java @@ -19,12 +19,12 @@ package org.apache.archiva.maven.repository.metadata.storage; */ import junit.framework.TestCase; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; -import org.apache.archiva.configuration.ProxyConnectorConfiguration; -import org.apache.archiva.configuration.RemoteRepositoryConfiguration; -import org.apache.archiva.configuration.RepositoryScanningConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.ProxyConnectorConfiguration; +import org.apache.archiva.configuration.model.RemoteRepositoryConfiguration; +import org.apache.archiva.configuration.model.RepositoryScanningConfiguration; import org.apache.archiva.filter.AllFilter; import org.apache.archiva.filter.ExcludesFilter; import org.apache.archiva.filter.Filter; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/mock/MockConfiguration.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/mock/MockConfiguration.java index a5de3eaeb..41a1368c3 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/mock/MockConfiguration.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/mock/MockConfiguration.java @@ -21,13 +21,13 @@ package org.apache.archiva.maven.repository.metadata.storage.mock; import org.apache.archiva.components.registry.Registry; import org.apache.archiva.components.registry.RegistryException; import org.apache.archiva.components.registry.RegistryListener; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.ArchivaRuntimeConfiguration; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.ConfigurationListener; -import org.apache.archiva.configuration.FileType; -import org.apache.archiva.configuration.IndeterminateConfigurationException; -import org.apache.archiva.configuration.RepositoryScanningConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.ArchivaRuntimeConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.provider.ConfigurationListener; +import org.apache.archiva.configuration.model.FileType; +import org.apache.archiva.configuration.provider.IndeterminateConfigurationException; +import org.apache.archiva.configuration.model.RepositoryScanningConfiguration; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/ArchivaIndexManagerMock.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/ArchivaIndexManagerMock.java index 0fadd50b3..e10df3148 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/ArchivaIndexManagerMock.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/ArchivaIndexManagerMock.java @@ -21,7 +21,7 @@ package org.apache.archiva.maven.repository.mock; import org.apache.archiva.common.filelock.DefaultFileLockManager; import org.apache.archiva.common.utils.FileUtils; import org.apache.archiva.common.utils.PathUtil; -import org.apache.archiva.configuration.ArchivaConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; import org.apache.archiva.indexer.ArchivaIndexManager; import org.apache.archiva.indexer.ArchivaIndexingContext; import org.apache.archiva.indexer.IndexCreationFailedException; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/configuration/MockRepoAdmin.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/configuration/MockRepoAdmin.java index f069d8374..814ca0624 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/configuration/MockRepoAdmin.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/configuration/MockRepoAdmin.java @@ -29,10 +29,10 @@ import org.apache.archiva.admin.model.networkproxy.NetworkProxyAdmin; import org.apache.archiva.admin.model.proxyconnector.ProxyConnectorAdmin; import org.apache.archiva.admin.model.proxyconnector.ProxyConnectorOrderComparator; import org.apache.archiva.admin.model.remote.RemoteRepositoryAdmin; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; -import org.apache.archiva.configuration.ProxyConnectorConfiguration; -import org.apache.archiva.configuration.RemoteRepositoryConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.ProxyConnectorConfiguration; +import org.apache.archiva.configuration.model.RemoteRepositoryConfiguration; import org.apache.commons.lang3.StringUtils; import org.modelmapper.ModelMapper; import org.springframework.stereotype.Service; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/configuration/StubConfiguration.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/configuration/StubConfiguration.java index 474fd4a7b..71416f32b 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/configuration/StubConfiguration.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/configuration/StubConfiguration.java @@ -21,11 +21,11 @@ package org.apache.archiva.maven.repository.mock.configuration; import org.apache.archiva.components.registry.Registry; import org.apache.archiva.components.registry.RegistryException; import org.apache.archiva.components.registry.RegistryListener; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.ConfigurationListener; -import org.apache.archiva.configuration.IndeterminateConfigurationException; -import org.apache.archiva.configuration.RepositoryScanningConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.provider.ConfigurationListener; +import org.apache.archiva.configuration.provider.IndeterminateConfigurationException; +import org.apache.archiva.configuration.model.RepositoryScanningConfiguration; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/configuration/TestConfiguration.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/configuration/TestConfiguration.java index d398be9d0..59758f7ea 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/configuration/TestConfiguration.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/configuration/TestConfiguration.java @@ -3,10 +3,10 @@ package org.apache.archiva.maven.repository.mock.configuration; import org.apache.archiva.components.registry.Registry; import org.apache.archiva.components.registry.RegistryException; import org.apache.archiva.components.registry.RegistryListener; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.ConfigurationListener; -import org.apache.archiva.configuration.IndeterminateConfigurationException; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.provider.ConfigurationListener; +import org.apache.archiva.configuration.provider.IndeterminateConfigurationException; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-repo-request-test.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-repo-request-test.xml index 40d036ee4..7c6966d91 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-repo-request-test.xml +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-repo-request-test.xml @@ -28,7 +28,7 @@ - + diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-storage.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-storage.xml index bd9567de8..866d1193b 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-storage.xml +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-storage.xml @@ -55,7 +55,7 @@ - + diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context.xml index 63dc0de2e..f976c3469 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context.xml +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context.xml @@ -31,7 +31,7 @@ - + @@ -56,7 +56,7 @@ - + diff --git a/archiva-modules/archiva-maven/archiva-maven-scheduler/pom.xml b/archiva-modules/archiva-maven/archiva-maven-scheduler/pom.xml index e9f49ec72..d0105b39d 100644 --- a/archiva-modules/archiva-maven/archiva-maven-scheduler/pom.xml +++ b/archiva-modules/archiva-maven/archiva-maven-scheduler/pom.xml @@ -53,8 +53,8 @@ archiva-storage-api - org.apache.archiva - archiva-configuration + org.apache.archiva.configuration + archiva-configuration-provider org.apache.archiva diff --git a/archiva-modules/archiva-maven/archiva-maven-scheduler/src/main/java/org/apache/archiva/maven/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java b/archiva-modules/archiva-maven/archiva-maven-scheduler/src/main/java/org/apache/archiva/maven/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java index 7ff7e0869..a5aee2ebe 100644 --- a/archiva-modules/archiva-maven/archiva-maven-scheduler/src/main/java/org/apache/archiva/maven/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java +++ b/archiva-modules/archiva-maven/archiva-maven-scheduler/src/main/java/org/apache/archiva/maven/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java @@ -21,9 +21,9 @@ import org.apache.archiva.proxy.ProxyRegistry; import org.apache.archiva.proxy.model.NetworkProxy; import org.apache.archiva.scheduler.indexing.DownloadRemoteIndexException; import org.apache.archiva.scheduler.indexing.DownloadRemoteIndexScheduler; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.ConfigurationEvent; -import org.apache.archiva.configuration.ConfigurationListener; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.provider.ConfigurationEvent; +import org.apache.archiva.configuration.provider.ConfigurationListener; import org.apache.archiva.indexer.UnsupportedBaseContextException; import org.apache.archiva.maven.common.proxy.WagonFactory; import org.apache.archiva.repository.RepositoryRegistry; diff --git a/archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/resources/spring-context.xml b/archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/resources/spring-context.xml index 3393cdf02..1b759eebb 100644 --- a/archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/resources/spring-context.xml +++ b/archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/resources/spring-context.xml @@ -39,7 +39,7 @@ - + diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml index 1908333fd..5f086d81b 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml @@ -42,8 +42,8 @@ diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml index 73e987ece..38227f549 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml @@ -71,8 +71,8 @@ --> - + diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml index 19eba026f..4f3750ccb 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml @@ -47,7 +47,7 @@ - + diff --git a/archiva-modules/archiva-web/archiva-security/pom.xml b/archiva-modules/archiva-web/archiva-security/pom.xml index d2484a08e..f5f9bce4a 100644 --- a/archiva-modules/archiva-web/archiva-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-security/pom.xml @@ -33,8 +33,8 @@ - org.apache.archiva - archiva-configuration + org.apache.archiva.configuration + archiva-configuration-provider org.apache.archiva diff --git a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java index 550745d20..06debd40f 100644 --- a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java +++ b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java @@ -20,8 +20,8 @@ package org.apache.archiva.security; */ import junit.framework.TestCase; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; import org.apache.archiva.redback.rbac.RBACManager; import org.apache.archiva.redback.rbac.RbacObjectNotFoundException; import org.apache.archiva.redback.rbac.UserAssignment; diff --git a/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml b/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml index c94f9c6d5..22793a3fb 100644 --- a/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml +++ b/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml @@ -79,7 +79,7 @@ - + diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml index cd16ed653..dc73e13a5 100644 --- a/archiva-modules/archiva-web/archiva-web-common/pom.xml +++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml @@ -40,8 +40,8 @@ metadata-repository-api - org.apache.archiva - archiva-configuration + org.apache.archiva.configuration + archiva-configuration-provider org.apache.archiva diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java index 72df50cf5..8c85c97e4 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java @@ -26,7 +26,7 @@ import org.apache.archiva.checksum.ChecksummedFile; import org.apache.archiva.common.utils.VersionComparator; import org.apache.archiva.common.utils.VersionUtil; import org.apache.archiva.components.taskqueue.TaskQueueException; -import org.apache.archiva.configuration.ArchivaConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; import org.apache.archiva.metadata.model.facets.AuditEvent; import org.apache.archiva.model.ArchivaRepositoryMetadata; import org.apache.archiva.model.SnapshotVersion; diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java index dc0d2e882..9e255a63c 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java @@ -20,9 +20,9 @@ package org.apache.archiva.web.startup; */ import org.apache.archiva.common.ArchivaException; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.ConfigurationNames; -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.ConfigurationNames; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; import org.apache.archiva.components.registry.RegistryListener; import org.apache.archiva.redback.rbac.RBACManager; import org.apache.archiva.redback.rbac.RbacManagerException; diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java index 746c5ec82..0dfd1d957 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java @@ -22,7 +22,7 @@ package org.apache.archiva.web.rss; import junit.framework.TestCase; import org.apache.archiva.common.filelock.DefaultFileLockManager; -import org.apache.archiva.configuration.ArchivaConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; import org.apache.archiva.repository.base.managed.BasicManagedRepository; import org.apache.archiva.repository.RepositoryRegistry; import org.apache.archiva.repository.storage.fs.FilesystemStorage; diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/upload/UploadArtifactsTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/upload/UploadArtifactsTest.java index 0487368db..a8b23cd7d 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/upload/UploadArtifactsTest.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/upload/UploadArtifactsTest.java @@ -18,7 +18,7 @@ package org.apache.archiva.web.upload; */ import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; -import org.apache.archiva.configuration.ArchivaConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; import org.apache.archiva.rest.api.services.ArchivaRestServiceException; import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner; import org.apache.archiva.web.AbstractRestServicesTest; diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-rss-servlet.xml b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-rss-servlet.xml index ae84b9697..7ec43de90 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-rss-servlet.xml +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-rss-servlet.xml @@ -43,7 +43,7 @@ - + diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml index 5bbaa7f22..dd98b2f93 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml @@ -44,7 +44,7 @@ - + diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-upload.xml b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-upload.xml index fb1d5213d..ee24fb4f0 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-upload.xml +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-upload.xml @@ -46,7 +46,7 @@ - + diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index c2a2a94bb..1418bec90 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -283,8 +283,8 @@ runtime - org.apache.archiva - archiva-configuration + org.apache.archiva.configuration + archiva-configuration-provider runtime diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml index 8bb9fbb2f..8efc940c7 100644 --- a/archiva-modules/archiva-web/archiva-webdav/pom.xml +++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml @@ -53,8 +53,8 @@ archiva-repository-scanner - org.apache.archiva - archiva-configuration + org.apache.archiva.configuration + archiva-configuration-provider diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java index f3e8737e8..ec79dd5e1 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java @@ -29,7 +29,7 @@ import org.apache.archiva.common.filelock.DefaultFileLockManager; import org.apache.archiva.common.filelock.FileLockManager; import org.apache.archiva.common.utils.PathUtil; import org.apache.archiva.common.utils.VersionUtil; -import org.apache.archiva.configuration.ArchivaConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; import org.apache.archiva.indexer.ArchivaIndexingContext; import org.apache.archiva.indexer.merger.IndexMerger; import org.apache.archiva.indexer.merger.IndexMergerException; diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/RepositoryServlet.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/RepositoryServlet.java index ba7517fd8..763eb2454 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/RepositoryServlet.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/RepositoryServlet.java @@ -20,9 +20,9 @@ package org.apache.archiva.webdav; */ import org.apache.archiva.admin.model.RepositoryAdminException; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.ConfigurationEvent; -import org.apache.archiva.configuration.ConfigurationListener; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.provider.ConfigurationEvent; +import org.apache.archiva.configuration.provider.ConfigurationListener; import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator; import org.apache.archiva.repository.base.ArchivaRepositoryRegistry; import org.apache.archiva.repository.ManagedRepository; diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java index 3637bc40a..90605f526 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java @@ -22,8 +22,8 @@ package org.apache.archiva.webdav; import com.gargoylesoftware.htmlunit.WebClient; import org.apache.archiva.common.utils.FileUtils; -import org.apache.archiva.configuration.ProxyConnectorConfiguration; -import org.apache.archiva.configuration.RemoteRepositoryConfiguration; +import org.apache.archiva.configuration.model.ProxyConnectorConfiguration; +import org.apache.archiva.configuration.model.RemoteRepositoryConfiguration; import org.apache.archiva.policies.*; import org.apache.commons.lang3.StringUtils; import org.eclipse.jetty.server.HttpConnectionFactory; diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java index dd699581d..adf584694 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java @@ -25,10 +25,10 @@ import com.gargoylesoftware.htmlunit.WebClient; import com.gargoylesoftware.htmlunit.WebRequest; import com.gargoylesoftware.htmlunit.WebResponse; import junit.framework.TestCase; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; -import org.apache.archiva.configuration.RemoteRepositoryConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.RemoteRepositoryConfiguration; import org.apache.archiva.repository.ManagedRepository; import org.apache.archiva.repository.RepositoryException; import org.apache.archiva.repository.base.ArchivaRepositoryRegistry; diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java index 3650a9704..1afc78425 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java @@ -28,10 +28,10 @@ import org.apache.archiva.admin.repository.DefaultRepositoryCommonValidator; import org.apache.archiva.admin.repository.group.DefaultRepositoryGroupAdmin; import org.apache.archiva.admin.repository.managed.DefaultManagedRepositoryAdmin; import org.apache.archiva.common.filelock.FileLockManager; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.FileTypes; -import org.apache.archiva.configuration.RepositoryGroupConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.provider.FileTypes; +import org.apache.archiva.configuration.model.RepositoryGroupConfiguration; import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; import org.apache.archiva.proxy.ProxyRegistry; import org.apache.archiva.repository.EditableManagedRepository; @@ -60,7 +60,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Mockito; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.context.ApplicationContext; import org.springframework.context.ConfigurableApplicationContext; diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletDeployTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletDeployTest.java index e29190aac..20ee8ec72 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletDeployTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletDeployTest.java @@ -21,7 +21,7 @@ package org.apache.archiva.webdav; import com.gargoylesoftware.htmlunit.WebRequest; import com.gargoylesoftware.htmlunit.WebResponse; -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; import org.apache.archiva.webdav.mock.httpunit.MkColMethodWebRequest; import org.junit.After; import org.junit.Before; diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletNoProxyTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletNoProxyTest.java index a532de1a6..d45fbc2cc 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletNoProxyTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletNoProxyTest.java @@ -22,7 +22,7 @@ package org.apache.archiva.webdav; import com.gargoylesoftware.htmlunit.WebRequest; import com.gargoylesoftware.htmlunit.WebResponse; -import org.apache.archiva.configuration.ProxyConnectorConfiguration; +import org.apache.archiva.configuration.model.ProxyConnectorConfiguration; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedPluginSnapshotPolicyTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedPluginSnapshotPolicyTest.java index 67d112f11..6a2eaacfa 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedPluginSnapshotPolicyTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedPluginSnapshotPolicyTest.java @@ -22,7 +22,7 @@ package org.apache.archiva.webdav; import com.gargoylesoftware.htmlunit.WebRequest; import com.gargoylesoftware.htmlunit.WebResponse; -import org.apache.archiva.configuration.ProxyConnectorConfiguration; +import org.apache.archiva.configuration.model.ProxyConnectorConfiguration; import org.apache.archiva.policies.PolicyOption; import org.apache.archiva.policies.SnapshotsPolicy; import org.junit.Test; diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedReleasePolicyTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedReleasePolicyTest.java index 25643a03b..6b05673bb 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedReleasePolicyTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedReleasePolicyTest.java @@ -21,7 +21,7 @@ package org.apache.archiva.webdav; import com.gargoylesoftware.htmlunit.WebRequest; import com.gargoylesoftware.htmlunit.WebResponse; -import org.apache.archiva.configuration.ProxyConnectorConfiguration; +import org.apache.archiva.configuration.model.ProxyConnectorConfiguration; import org.apache.archiva.policies.PolicyOption; import org.apache.archiva.policies.ReleasesPolicy; import org.junit.Test; diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedSnapshotPolicyTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedSnapshotPolicyTest.java index 67e50880f..3f5697d51 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedSnapshotPolicyTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedSnapshotPolicyTest.java @@ -21,8 +21,8 @@ package org.apache.archiva.webdav; import com.gargoylesoftware.htmlunit.WebRequest; import com.gargoylesoftware.htmlunit.WebResponse; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.ProxyConnectorConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.ProxyConnectorConfiguration; import org.apache.archiva.policies.PolicyOption; import org.apache.archiva.policies.SnapshotsPolicy; import org.junit.After; diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedTimestampedSnapshotPolicyTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedTimestampedSnapshotPolicyTest.java index 58fe15b46..3f968a658 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedTimestampedSnapshotPolicyTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedTimestampedSnapshotPolicyTest.java @@ -21,7 +21,7 @@ package org.apache.archiva.webdav; import com.gargoylesoftware.htmlunit.WebRequest; import com.gargoylesoftware.htmlunit.WebResponse; -import org.apache.archiva.configuration.ProxyConnectorConfiguration; +import org.apache.archiva.configuration.model.ProxyConnectorConfiguration; import org.apache.archiva.policies.PolicyOption; import org.apache.archiva.policies.SnapshotsPolicy; import org.junit.After; diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletRepositoryGroupTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletRepositoryGroupTest.java index 8ec608b2f..62af4e4e5 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletRepositoryGroupTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletRepositoryGroupTest.java @@ -23,9 +23,9 @@ package org.apache.archiva.webdav; import com.gargoylesoftware.htmlunit.WebRequest; import com.gargoylesoftware.htmlunit.WebResponse; import org.apache.archiva.common.utils.FileUtils; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; -import org.apache.archiva.configuration.RepositoryGroupConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.RepositoryGroupConfiguration; import org.apache.archiva.maven.metadata.MavenMetadataReader; import org.apache.archiva.model.ArchivaRepositoryMetadata; import org.apache.commons.lang3.StringUtils; diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java index 48ce7f04b..465a4028d 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java @@ -21,9 +21,9 @@ package org.apache.archiva.webdav; import junit.framework.TestCase; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authorization.UnauthorizedException; @@ -47,7 +47,6 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Mockito; import org.springframework.context.ApplicationContext; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; @@ -58,9 +57,7 @@ import org.springframework.web.context.WebApplicationContext; import javax.inject.Inject; import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import java.io.InputStream; import java.nio.charset.Charset; import java.nio.file.Files; diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletTest.java index 909d9c7c5..5682c0b44 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletTest.java @@ -21,9 +21,9 @@ package org.apache.archiva.webdav; import com.gargoylesoftware.htmlunit.WebRequest; import com.gargoylesoftware.htmlunit.WebResponse; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; import org.apache.archiva.repository.ManagedRepository; import org.junit.Before; import org.junit.Test; diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/UnauthenticatedDavResourceFactory.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/UnauthenticatedDavResourceFactory.java index 5aadd4653..4dfaed64d 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/UnauthenticatedDavResourceFactory.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/UnauthenticatedDavResourceFactory.java @@ -19,7 +19,7 @@ package org.apache.archiva.webdav; * under the License. */ -import org.apache.archiva.configuration.ArchivaConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; import org.apache.jackrabbit.webdav.DavException; import org.apache.jackrabbit.webdav.DavServletRequest; import org.springframework.context.ApplicationContext; diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/ReinitServlet.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/ReinitServlet.java index 781df5998..c3a4f909a 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/ReinitServlet.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/ReinitServlet.java @@ -19,7 +19,7 @@ package org.apache.archiva.webdav.util; * under the License. */ -import org.apache.archiva.configuration.ArchivaConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; import org.springframework.context.ApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-servlet-simple.xml b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-servlet-simple.xml index 59545f71a..09ecbacb0 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-servlet-simple.xml +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-servlet-simple.xml @@ -31,7 +31,7 @@ - + diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml index 9714ece35..450ceef4a 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml @@ -47,7 +47,7 @@ - + diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context.xml b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context.xml index c54f37936..1aba2f9f2 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context.xml +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context.xml @@ -46,7 +46,7 @@ - + diff --git a/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml index c5be4d834..0bd365661 100644 --- a/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml +++ b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml @@ -55,8 +55,8 @@ archiva-common - org.apache.archiva - archiva-configuration + org.apache.archiva.configuration + archiva-configuration-provider org.apache.archiva diff --git a/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraRepositorySessionFactory.java b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraRepositorySessionFactory.java index 2f3077b3c..1790ce01f 100644 --- a/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraRepositorySessionFactory.java +++ b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraRepositorySessionFactory.java @@ -19,7 +19,7 @@ package org.apache.archiva.metadata.repository.cassandra; * under the License. */ -import org.apache.archiva.configuration.ArchivaConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; import org.apache.archiva.metadata.repository.AbstractRepositorySessionFactory; import org.apache.archiva.metadata.repository.MetadataRepositoryException; import org.apache.archiva.metadata.repository.MetadataResolver; diff --git a/archiva-modules/metadata/metadata-store-provider/metadata-store-file/pom.xml b/archiva-modules/metadata/metadata-store-provider/metadata-store-file/pom.xml index 1ecb1ac4e..ea561448a 100644 --- a/archiva-modules/metadata/metadata-store-provider/metadata-store-file/pom.xml +++ b/archiva-modules/metadata/metadata-store-provider/metadata-store-file/pom.xml @@ -34,8 +34,8 @@ - org.apache.archiva - archiva-configuration + org.apache.archiva.configuration + archiva-configuration-provider org.apache.archiva diff --git a/archiva-modules/metadata/metadata-store-provider/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java b/archiva-modules/metadata/metadata-store-provider/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java index 00e68c118..3cc3d2451 100644 --- a/archiva-modules/metadata/metadata-store-provider/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java +++ b/archiva-modules/metadata/metadata-store-provider/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java @@ -20,8 +20,8 @@ package org.apache.archiva.metadata.repository.file; */ import org.apache.archiva.checksum.ChecksumAlgorithm; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; import org.apache.archiva.metadata.QueryParameter; import org.apache.archiva.metadata.model.ArtifactMetadata; import org.apache.archiva.metadata.model.CiManagement; diff --git a/archiva-modules/metadata/metadata-store-provider/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java b/archiva-modules/metadata/metadata-store-provider/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java index 911dea071..717f68409 100644 --- a/archiva-modules/metadata/metadata-store-provider/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java +++ b/archiva-modules/metadata/metadata-store-provider/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java @@ -19,7 +19,7 @@ package org.apache.archiva.metadata.repository.file; * under the License. */ -import org.apache.archiva.configuration.ArchivaConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; import org.apache.archiva.metadata.model.MetadataFacetFactory; import org.apache.archiva.metadata.repository.AbstractRepositorySessionFactory; import org.apache.archiva.metadata.repository.MetadataRepository; diff --git a/archiva-modules/metadata/metadata-store-provider/metadata-store-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java b/archiva-modules/metadata/metadata-store-provider/metadata-store-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java index 4fd4bab26..0246b2ee8 100644 --- a/archiva-modules/metadata/metadata-store-provider/metadata-store-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java +++ b/archiva-modules/metadata/metadata-store-provider/metadata-store-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java @@ -19,9 +19,9 @@ package org.apache.archiva.metadata.repository.file; * under the License. */ -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.provider.ArchivaConfiguration; +import org.apache.archiva.configuration.model.Configuration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; import org.apache.archiva.metadata.model.MetadataFacetFactory; import org.apache.archiva.metadata.repository.AbstractMetadataRepositoryTest; import org.apache.archiva.metadata.repository.MetadataRepository; diff --git a/archiva-modules/metadata/metadata-store-provider/oak-jcr/oak-jcr-lucene/pom.xml b/archiva-modules/metadata/metadata-store-provider/oak-jcr/oak-jcr-lucene/pom.xml index 06f38aa5a..961fe0d16 100644 --- a/archiva-modules/metadata/metadata-store-provider/oak-jcr/oak-jcr-lucene/pom.xml +++ b/archiva-modules/metadata/metadata-store-provider/oak-jcr/oak-jcr-lucene/pom.xml @@ -176,10 +176,6 @@ org.apache.maven.plugins maven-compiler-plugin - - ${jdk.version} - ${jdk.version} - diff --git a/archiva-modules/plugins/audit/pom.xml b/archiva-modules/plugins/audit/pom.xml index af5c0b949..aea14fc96 100644 --- a/archiva-modules/plugins/audit/pom.xml +++ b/archiva-modules/plugins/audit/pom.xml @@ -33,8 +33,8 @@ - org.apache.archiva - archiva-configuration + org.apache.archiva.configuration + archiva-configuration-provider org.apache.archiva diff --git a/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java b/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java index f0cb5d2cc..8209c5060 100644 --- a/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java +++ b/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java @@ -20,7 +20,7 @@ package org.apache.archiva.audit; */ import junit.framework.TestCase; -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.model.ManagedRepositoryConfiguration; import org.apache.archiva.metadata.model.facets.AuditEvent; import org.apache.archiva.metadata.repository.MetadataRepository; import org.apache.archiva.metadata.repository.RepositorySession; diff --git a/archiva-modules/plugins/problem-reports/pom.xml b/archiva-modules/plugins/problem-reports/pom.xml index 3da850155..8b30065c0 100644 --- a/archiva-modules/plugins/problem-reports/pom.xml +++ b/archiva-modules/plugins/problem-reports/pom.xml @@ -38,8 +38,8 @@ - org.apache.archiva - archiva-configuration + org.apache.archiva.configuration + archiva-configuration-provider org.apache.archiva diff --git a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java index 0e167a523..cd9c6cbf3 100644 --- a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java +++ b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java @@ -21,7 +21,7 @@ package org.apache.archiva.reports.consumers; import org.apache.archiva.checksum.ChecksumAlgorithm; import org.apache.archiva.checksum.ChecksummedFile; -import org.apache.archiva.configuration.FileTypes; +import org.apache.archiva.configuration.provider.FileTypes; import org.apache.archiva.consumers.AbstractMonitoredConsumer; import org.apache.archiva.consumers.ConsumerException; import org.apache.archiva.consumers.KnownRepositoryContentConsumer; diff --git a/pom.xml b/pom.xml index 22b24d5e5..4eaa74622 100644 --- a/pom.xml +++ b/pom.xml @@ -344,7 +344,17 @@ ${project.version} - org.apache.archiva + org.apache.archiva.configuration + archiva-configuration-model + ${project.version} + + + org.apache.archiva.configuration + archiva-configuration-provider + ${project.version} + + + org.apache.archiva.configuration archiva-configuration ${project.version}