You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2022/04/10 07:02:08 UTC
[archiva] branch gh-action-dependabot-release-drafter updated (e6b45b54b -> 8250cdc33)
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a change to branch gh-action-dependabot-release-drafter
in repository https://gitbox.apache.org/repos/asf/archiva.git
discard e6b45b54b add gh action, dependabot and release-drafter and get rid of travis
add 5e8ae2434 Refactoring - consolidating package names
add 55b1e5d09 Updating permissions for v2 rest service
add c818808b7 Adding additional operations for access control
add 78413e37c code cleanup
add a8e5b3a7b Package refactoring
add 136576af8 Refactoring package names for maven metadata module
add ea4413d1a Refactoring package names for maven proxy module
add 2507f8d05 Refactoring packages for maven repository module
add a24de67e7 Refactoring packages for maven scheduler module
add 1fafee574 Cleanup of package names
add a8fa3d574 Refactoring of package name for archiva-proxy
add ff0684974 Refactoring packages for mock classes
add d3fd08be1 Package refactoring
add 7536a8912 Fixing error with bad repository path
add 3756ba57f Switching to generics for cache implementation
add e236e7f98 Unifying mocks to mockito
add 79a91fe1f Moving test classes for consistent package usage
add 23abc2077 Changes for new spring version
add 31869b91d Switching to new ehcache version
add 8c70e270b Removing joda-time dependency
add 468c99b29 Updating assertj version
add d124a9eab Adding .asf.yaml file
add 70bd7fdd3 Fixing RAT excludes
add 512ff100d [MRM-2028] Fixing NPE on artifact removal
add 2cb4db31b Adding github metadata to .asf.yaml
add 239669209 Enabling github wiki
add a0c5e5a0b Splitting configuration module. Adding mapper interface.
add 9a102721d Changing mapper interface
add f73e942e0 Refactoring of repository feature interface
add 99bd81ac0 Updating mapper for managed repo
add 0a2dab167 Improving event API
add f41b35042 Adding rest events
add f718fc4db Create dependabot.yml
add 3feca72bd dependabot for branch archiva-2.x as well
add 725a3e1fe test
add fb47ca709 test
add 0b270de6c use configuration from archiva parent
add 8250cdc33 add gh action, dependabot and release-drafter and get rid of travis
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (e6b45b54b)
\
N -- N -- N refs/heads/gh-action-dependabot-release-drafter (8250cdc33)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.asf.yaml | 25 +
.github/dependabot.yml | 15 +
.github/release-drafter.yml | 5 +-
.github/workflows/release-drafter.yml | 15 +-
.../org/apache/archiva/common/AbstractMapper.java} | 36 +-
.../apache/archiva/common/ModelMapperFactory.java | 42 +
.../apache/archiva/common/MultiModelMapper.java | 93 ++
.../archiva-configuration-model/pom.xml | 44 +
.../model}/AbstractRepositoryConfiguration.java | 5 +-
.../AbstractRepositoryConnectorConfiguration.java | 5 +-
.../model}/ArchivaDefaultConfiguration.java | 5 +-
.../model}/ArchivaRuntimeConfiguration.java | 5 +-
.../configuration/model}/CacheConfiguration.java | 5 +-
.../configuration/model}/Configuration.java | 8 +-
.../configuration/model/ConfigurationModel.java} | 13 +-
.../configuration/model}/ConfigurationNames.java | 5 +-
.../model}/FileLockConfiguration.java | 5 +-
.../archiva/configuration/model}/FileType.java | 5 +-
.../configuration/model}/LdapConfiguration.java | 5 +-
.../configuration/model}/LdapGroupMapping.java | 5 +-
.../configuration/model}/LegacyArtifactPath.java | 5 +-
.../model}/ManagedRepositoryConfiguration.java | 7 +-
.../configuration/model}/NetworkConfiguration.java | 5 +-
.../model}/NetworkProxyConfiguration.java | 5 +-
.../model}/OrganisationInformation.java | 5 +-
.../model}/ProxyConnectorConfiguration.java | 5 +-
.../model}/ProxyConnectorRuleConfiguration.java | 5 +-
.../model}/RedbackRuntimeConfiguration.java | 5 +-
.../model}/RemoteRepositoryConfiguration.java | 7 +-
.../configuration/model}/RepositoryCheckPath.java | 5 +-
.../model}/RepositoryGroupConfiguration.java | 7 +-
.../model}/RepositoryScanningConfiguration.java | 5 +-
.../model}/SyncConnectorConfiguration.java | 5 +-
.../configuration/model}/UserInterfaceOptions.java | 5 +-
.../configuration/model}/WebappConfiguration.java | 5 +-
.../functors/FiletypeSelectionPredicate.java | 7 +-
.../model}/functors/FiletypeToMapClosure.java | 7 +-
.../model}/functors/NetworkProxyComparator.java | 7 +-
.../functors/NetworkProxySelectionPredicate.java | 7 +-
...ProxyConnectorConfigurationOrderComparator.java | 7 +-
.../functors/ProxyConnectorSelectionPredicate.java | 7 +-
.../RepositoryConfigurationComparator.java | 7 +-
.../{ => archiva-configuration-provider}/pom.xml | 43 +-
.../provider}/ArchivaConfiguration.java | 6 +-
.../provider}/ConfigurationEvent.java | 5 +-
.../provider}/ConfigurationListener.java | 5 +-
.../provider}/ConfigurationRuntimeException.java | 5 +-
.../provider}/DefaultArchivaConfiguration.java | 38 +-
.../archiva/configuration/provider}/FileTypes.java | 10 +-
.../IndeterminateConfigurationException.java | 5 +-
.../provider}/InvalidConfigurationException.java | 5 +-
.../provider}/MavenProxyPropertyLoader.java | 10 +-
.../io/registry/ConfigurationRegistryReader.java | 41 +-
.../io/registry/ConfigurationRegistryWriter.java | 63 +-
.../configuration/provider}/util/ConfigMapper.java | 2 +-
.../src/main/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
.../src/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
.../provider}/ArchivaConfigurationMRM789Test.java | 10 +-
.../provider}/ArchivaConfigurationTest.java | 30 +-
.../configuration/provider}/ConfigurationTest.java | 9 +-
.../configuration/provider}/FileTypesTest.java | 5 +-
.../provider}/LegacyArtifactPathTest.java | 6 +-
.../provider}/MavenProxyPropertyLoaderTest.java | 9 +-
...yConnectorConfigurationOrderComparatorTest.java | 8 +-
.../RepositoryConfigurationComparatorTest.java | 10 +-
.../src/test/resources/log4j2-test.xml | 0
.../archiva/configuration/test-default-archiva.xml | 0
.../src/test/resources/spring-context.xml | 36 +-
.../archiva-base/archiva-configuration/pom.xml | 140 +--
.../src/main/mdo/configuration.mdo | 2 +-
.../functors/ConsumerWantsFilePredicate.java | 2 +-
.../archiva-consumer-archetype/pom.xml | 10 +-
.../src/main/java/SimpleArtifactConsumer.java | 4 +-
.../src/test/java/RepositoryProviderMock.java | 22 +-
.../resourcesstatic/archetype-resources/pom.xml | 4 +-
.../archiva-core-consumers/pom.xml | 11 +-
.../core/ArtifactMissingChecksumsConsumer.java | 4 +-
.../archiva/consumers/core/AutoRemoveConsumer.java | 6 +-
.../consumers/core/MetadataUpdaterConsumer.java | 2 +-
.../core/repository/AbstractRepositoryPurge.java | 9 +-
.../core/repository/RepositoryPurgeConsumer.java | 8 +-
.../src/test/conf/repository-manager.xml | 6 +-
.../core/AbstractArtifactConsumerTest.java | 6 +-
.../mock/repository}/RepositoryProviderMock.java | 27 +-
.../repository/AbstractRepositoryPurgeTest.java | 27 +-
...leanupReleasedSnapshotsRepositoryPurgeTest.java | 36 +-
.../repository/DaysOldRepositoryPurgeTest.java | 46 +-
.../repository/RepositoryPurgeConsumerTest.java | 59 +-
.../RetentionCountRepositoryPurgeTest.java | 27 +-
.../spring-context-cleanup-released-snapshots.xml | 6 +-
.../spring-context-purge-consumer-test.xml | 10 +-
.../src/test/resources/spring-context.xml | 2 +-
.../archiva-indexer-consumers/pom.xml | 4 +-
.../consumers/lucene/NexusIndexerConsumer.java | 6 +-
.../consumers/lucene/NexusIndexerConsumerTest.java | 4 +-
.../archiva-metadata-consumer/pom.xml | 4 +-
.../metadata/ArchivaMetadataCreationConsumer.java | 6 +-
.../pom.xml} | 33 +-
.../archiva/event/AbstractEventManager.java} | 58 +-
.../apache/archiva/event/BasicEventManager.java} | 32 +-
.../main/java/org/apache/archiva/event/Event.java | 48 +-
.../org/apache/archiva/event/EventContext.java | 48 ++
.../apache/archiva/event/EventContextBuilder.java | 77 ++
.../org/apache/archiva/event/EventHandler.java | 0
.../java/org/apache/archiva/event/EventSource.java | 0
.../java/org/apache/archiva/event/EventType.java | 15 +-
.../archiva/event/context/RepositoryContext.java | 90 ++
.../apache/archiva/event/context/RestContext.java | 111 +++
.../apache/archiva/event/context/UserContext.java | 71 ++
.../org/apache/archiva/event/package-info.java | 37 +
.../archiva/event/BasicEventManagerTest.java} | 11 +-
.../archiva-base/archiva-event-central/pom.xml | 44 +
.../event/central/CentralEventManager.java} | 25 +-
.../src/main/resources/META-INF/spring-context.xml | 11 +-
.../archiva-base/archiva-policies/pom.xml | 11 -
.../src/main/resources/META-INF/spring-context.xml | 2 +
.../src/test/resources/spring-context.xml | 2 +
archiva-modules/archiva-base/archiva-proxy/pom.xml | 4 +-
.../proxy/{ => base}/ArchivaProxyRegistry.java | 12 +-
.../{ => base}/DefaultRepositoryProxyHandler.java | 11 +-
.../proxy/{ => base}/NotFoundException.java | 5 +-
.../proxy/{ => base}/NotModifiedException.java | 5 +-
.../{ => base}/ProxyConnectorOrderComparator.java | 5 +-
.../archiva/proxy/{ => base}/ProxyException.java | 5 +-
.../src/main/resources/META-INF/spring-context.xml | 2 +-
.../archiva-repository-admin-default/pom.xml | 8 +-
.../admin/repository/AbstractRepositoryAdmin.java | 10 +-
.../DefaultRepositoryCommonValidator.java | 4 +-
.../admin/DefaultArchivaAdministration.java | 42 +-
.../group/DefaultRepositoryGroupAdmin.java | 14 +-
.../managed/DefaultManagedRepositoryAdmin.java | 23 +-
.../networkproxy/DefaultNetworkProxyAdmin.java | 6 +-
.../proxyconnector/DefaultProxyConnectorAdmin.java | 6 +-
.../DefaultProxyConnectorRuleAdmin.java | 6 +-
.../remote/DefaultRemoteRepositoryAdmin.java | 10 +-
.../DefaultArchivaRuntimeConfigurationAdmin.java | 20 +-
.../DefaultRedbackRuntimeConfigurationAdmin.java | 38 +-
.../admin/mock/ArchivaIndexManagerMock.java | 18 +-
.../repository/AbstractRepositoryAdminTest.java | 2 +-
.../managed/ManagedRepositoryAdminTest.java | 2 +-
.../archiva-base/archiva-repository-api/pom.xml | 8 +-
.../org/apache/archiva/repository/Repository.java | 5 +-
.../repository/RepositoryContentFactory.java | 4 +-
.../archiva/repository/RepositoryHandler.java | 21 +-
.../repository/RepositoryHandlerManager.java | 2 +-
.../archiva/repository/RepositoryProvider.java | 6 +-
.../archiva/repository/RepositoryRegistry.java | 33 +-
.../archiva/repository/event/RepositoryEvent.java | 36 +-
.../features/ArtifactCleanupFeature.java | 5 -
.../repository/features/IndexCreationFeature.java | 5 -
.../repository/features/RemoteIndexFeature.java | 5 -
.../repository/features/RepositoryFeature.java | 5 -
.../features/StagingRepositoryFeature.java | 5 -
.../archiva-base/archiva-repository-layer/pom.xml | 8 +-
.../base/DefaultMergedRemoteIndexesScheduler.java | 2 +-
.../repository/base/AbstractRepository.java | 16 +-
.../repository/base/AbstractRepositoryHandler.java | 24 +-
.../repository/base/ArchivaRepositoryRegistry.java | 63 +-
.../repository/base/ConfigurationHandler.java | 8 +-
.../base/group/RepositoryGroupHandler.java | 10 +-
.../base/managed/ManagedRepositoryHandler.java | 16 +-
.../base/remote/RemoteRepositoryHandler.java | 8 +-
.../repository/metadata/base/MetadataTools.java | 12 +-
.../base/ArchivaRepositoryRegistryTest.java | 8 +-
.../base/group/RepositoryGroupHandlerTest.java | 14 +-
.../BasicManagedRepositoryValidatorTest.java | 2 +-
.../base/managed/ManagedRepositoryHandlerTest.java | 8 +-
.../base/remote/RemoteRepositoryHandlerTest.java | 6 +-
.../repository/mock/RepositoryProviderMock.java | 26 +-
.../archiva-repository-scanner/pom.xml | 14 +-
.../scanner/DefaultRepositoryScanner.java | 2 +-
.../scanner/RepositoryContentConsumers.java | 2 +-
.../scanner/ArchivaAdministrationStub.java | 2 +-
.../scanner/RepositoryContentConsumersTest.java | 58 +-
.../scanner/mock/ManagedRepositoryContentMock.java | 3 +-
.../src/test/resources/spring-context.xml | 2 +-
.../security/common/ArchivaRoleConstants.java | 71 +-
.../main/resources/META-INF/redback/redback.xml | 70 +-
archiva-modules/archiva-base/pom.xml | 2 +
.../common/proxy}/DebugTransferListener.java | 5 +-
.../common/proxy}/DefaultWagonFactory.java | 5 +-
.../maven => maven/common/proxy}/WagonFactory.java | 5 +-
.../common/proxy}/WagonFactoryException.java | 5 +-
.../common/proxy}/WagonFactoryRequest.java | 5 +-
.../src/main/resources/META-INF/spring-context.xml | 2 +-
.../archiva-maven/archiva-maven-indexer/pom.xml | 14 +-
.../indexer}/DefaultIndexUpdateSideEffect.java | 5 +-
.../maven => maven/indexer}/MavenIndexContext.java | 5 +-
.../maven => maven/indexer}/MavenIndexManager.java | 27 +-
.../indexer}/search/MavenRepositorySearch.java | 9 +-
.../search/NoClassifierArtifactInfoFilter.java | 7 +-
.../{ => maven}/indexer/util/SearchUtil.java | 5 +-
.../src/main/resources/META-INF/spring-context.xml | 2 +-
.../indexer}/MavenIndexManagerTest.java | 43 +-
.../search/AbstractMavenRepositorySearch.java | 88 +-
.../search/MavenRepositorySearchOSGITest.java | 14 +-
.../search/MavenRepositorySearchPaginateTest.java | 8 +-
.../indexer}/search/MavenRepositorySearchTest.java | 234 ++---
.../src/test/resources/spring-context.xml | 2 +-
.../metadata}/MavenMetadataReader.java | 2 +-
.../metadata}/model/MavenArtifactFacet.java | 2 +-
.../src/main/resources/META-INF/spring-context.xml | 2 +-
.../archiva/{maven2 => maven}/model/Artifact.java | 5 +-
.../archiva/{maven2 => maven}/model/TreeEntry.java | 5 +-
.../archiva/{maven2 => maven}/model/ModelTest.java | 5 +-
.../archiva-maven/archiva-maven-proxy/pom.xml | 33 +-
.../proxy}/MavenRepositoryProxyHandler.java | 18 +-
.../src/main/resources/META-INF/spring-context.xml | 2 +-
.../{ => maven}/proxy/AbstractProxyTestCase.java | 27 +-
.../proxy/CacheFailuresTransferTest.java | 43 +-
.../{ => maven}/proxy/ChecksumTransferTest.java | 25 +-
.../{ => maven}/proxy/ErrorHandlingTest.java | 101 +--
.../{ => maven}/proxy/HttpProxyTransferTest.java | 14 +-
.../proxy/ManagedDefaultTransferTest.java | 26 +-
.../{ => maven}/proxy/MetadataTransferTest.java | 19 +-
.../{ => maven}/proxy/MockConfiguration.java | 19 +-
.../{ => maven}/proxy/SnapshotTransferTest.java | 5 +-
.../archiva/{ => maven}/proxy/WagonDelegate.java | 5 +-
.../common => maven/proxy}/WagonFactoryTest.java | 13 +-
.../MockRepositoryArchivaTaskScheduler.java | 5 +-
.../mock/repository}/ArchivaIndexManagerMock.java | 5 +-
.../repository}/ManagedRepositoryContentMock.java | 7 +-
.../repository}/RemoteRepositoryContentMock.java | 5 +-
.../repository}/RepositoryContentProviderMock.java | 5 +-
.../mock/repository}/RepositoryProviderMock.java | 29 +-
.../src/test/resources/META-INF/spring-context.xml | 2 +-
.../src/test/resources/spring-context.xml | 10 +-
.../archiva-maven/archiva-maven-repository/pom.xml | 15 +-
.../repository}/MavenManagedRepository.java | 15 +-
.../repository}/MavenRemoteRepository.java | 11 +-
.../repository}/MavenRepositoryGroup.java | 5 +-
.../repository}/MavenRepositoryProvider.java | 51 +-
.../repository}/MavenSystemManager.java | 7 +-
.../content/AbstractDefaultRepositoryContent.java | 4 +-
.../content/ArtifactExtensionMapping.java | 6 +-
.../repository}/content/ArtifactInfo.java | 2 +-
.../repository}/content/FilenameParser.java | 2 +-
.../content/ManagedDefaultRepositoryContent.java | 7 +-
.../repository}/content/MavenContentHelper.java | 4 +-
.../repository}/content/MavenContentProvider.java | 6 +-
.../content/MavenRepositoryRequestInfo.java | 2 +-
.../repository}/content/MavenTypes.java | 2 +-
.../content/RemoteDefaultRepositoryContent.java | 2 +-
.../tree/ArchivaRepositoryConnectorFactory.java | 2 +-
.../dependency/tree/DependencyTreeBuilder.java | 4 +-
.../tree/DependencyTreeBuilderException.java | 2 +-
.../tree/Maven3DependencyTreeBuilder.java | 8 +-
.../dependency/tree/TreeDependencyNodeVisitor.java | 6 +-
.../repository}/merge/Maven2RepositoryMerger.java | 10 +-
.../metadata/storage/ArtifactMappingProvider.java | 2 +-
.../storage/ArtifactMetadataVersionComparator.java | 2 +-
.../storage/DefaultArtifactMappingProvider.java | 2 +-
.../storage/DummyLifecycleBindingsInjector.java | 2 +-
.../storage/Maven2RepositoryPathTranslator.java | 4 +-
.../metadata/storage/Maven2RepositoryStorage.java | 8 +-
.../storage/MavenArtifactFacetFactory.java | 4 +-
.../metadata/storage/MavenProjectFacet.java | 2 +-
.../metadata/storage/MavenProjectFacetFactory.java | 2 +-
.../metadata/storage/MavenProjectParent.java | 2 +-
.../metadata/storage/RepositoryModelResolver.java | 12 +-
.../src/main/resources/META-INF/spring-context.xml | 4 +-
.../AbstractRepositoryLayerTestCase.java | 2 +-
.../repository}/MavenRepositoryProviderTest.java | 43 +-
.../repository}/RepositoryURLTest.java | 2 +-
.../AbstractBaseRepositoryContentLayoutTest.java | 2 +-
.../content/AbstractRepositoryContentTest.java | 4 +-
.../content/ArtifactExtensionMappingTest.java | 8 +-
.../repository}/content/FilenameParserTest.java | 2 +-
.../ManagedDefaultRepositoryContentTest.java | 14 +-
.../content/MavenContentHelperTest.java | 4 +-
.../content/MavenRepositoryRequestInfoTest.java | 12 +-
.../RemoteDefaultRepositoryContentTest.java | 4 +-
.../tree/DependencyTreeBuilderTestMaven3.java | 12 +-
.../merge/Maven2RepositoryMergerTest.java | 10 +-
.../metadata/Maven2RepositoryStorageTest.java | 4 +-
.../repository}/metadata/MetadataToolsTest.java | 10 +-
.../metadata/RepositoryMetadataReaderTest.java | 4 +-
.../metadata/RepositoryMetadataWriterTest.java | 4 +-
...sitoryMetadataResolverMRM1411RepoGroupTest.java | 18 +-
...aven2RepositoryMetadataResolverMRM1411Test.java | 16 +-
...positoryMetadataResolverManagedReleaseTest.java | 4 +-
...ositoryMetadataResolverManagedSnapshotTest.java | 2 +-
.../Maven2RepositoryMetadataResolverTest.java | 20 +-
.../storage/MavenRepositoryMetadataReaderTest.java | 4 +-
.../repository}/metadata/storage/MockWagon.java | 2 +-
.../metadata/storage/mock/MockConfiguration.java | 27 +-
.../repository}/mock/ArchivaIndexManagerMock.java | 20 +-
.../repository}/mock/MavenIndexContextMock.java | 2 +-
.../mock/MockRepositoryArchivaTaskScheduler.java | 2 +-
.../repository}/mock/RepositoryRegistryMock.java | 2 +-
.../repository}/mock/TestMetadataResolver.java | 2 +-
.../mock/configuration/MockRepoAdmin.java | 10 +-
.../mock/configuration/StubConfiguration.java | 12 +-
.../mock/configuration/TestConfiguration.java | 10 +-
.../src/test/resources/spring-context-merge.xml | 2 +-
.../spring-context-metadata-tools-test.xml | 2 +-
.../resources/spring-context-repo-request-test.xml | 4 +-
.../resources/spring-context-repository-conf.xml | 2 +-
.../src/test/resources/spring-context-storage.xml | 6 +-
.../src/test/resources/spring-context.xml | 6 +-
.../archiva-maven/archiva-maven-scheduler/pom.xml | 4 +-
.../indexing}/ArchivaIndexingTaskExecutor.java | 10 +-
.../DefaultDownloadRemoteIndexScheduler.java | 17 +-
.../indexing}/DefaultIndexUpdateSideEffect.java | 5 +-
.../indexing}/DownloadRemoteIndexTask.java | 11 +-
.../indexing}/DownloadRemoteIndexTaskRequest.java | 7 +-
.../src/main/resources/META-INF/spring-context.xml | 2 +-
.../indexing}/ArchivaIndexingTaskExecutorTest.java | 7 +-
.../indexing}/DownloadRemoteIndexTaskTest.java | 9 +-
.../src/test/resources/spring-context.xml | 4 +-
.../archiva-scheduler-indexing/pom.xml | 4 +-
.../archiva-scheduler-repository-api/pom.xml | 4 +-
.../archiva-scheduler-repository/pom.xml | 4 +-
.../DefaultRepositoryArchivaTaskScheduler.java | 8 +-
...tArchivaRepositoryScanningTaskExecutorTest.java | 4 +-
.../repository}/mock/ArchivaIndexManagerMock.java | 23 +-
.../repository}/mock/MavenIndexContextMock.java | 5 +-
.../mock/MockArchivaAdministration.java | 7 +-
.../mock/MockRemoteRepositoryAdmin.java | 7 +-
.../src/test/resources/spring-context.xml | 6 +-
.../archiva-rest/archiva-rest-api/pom.xml | 8 +
.../archiva-rest-api/src/enunciate/archiva.css | 765 -----------------
.../archiva-rest-api/src/enunciate/archiva.fmt | 937 ---------------------
.../src/enunciate/enunciate.xml.org | 47 --
.../rest/api/model/ArtifactTransferRequest.java | 2 +-
.../archiva/rest/api/services/BrowseService.java | 4 +-
.../api/services/MergeRepositoriesService.java | 2 +-
.../rest/api/services/RepositoriesService.java | 2 +-
.../archiva/rest/api/services/SearchService.java | 2 +-
.../archiva/rest/api/v2/event/RestEvent.java} | 26 +-
.../rest/api/v2/event/RestRequestEvent.java | 53 ++
.../rest/api/v2/event/RestResponseEvent.java | 51 ++
.../rest/api/{model/v2 => v2/model}/Artifact.java | 4 +-
.../v2 => v2/model}/ArtifactTransferRequest.java | 4 +-
.../{model/v2 => v2/model}/BeanInformation.java | 4 +-
.../{model/v2 => v2/model}/CacheConfiguration.java | 5 +-
.../rest/api/{model/v2 => v2/model}/FileInfo.java | 4 +-
.../api/{model/v2 => v2/model}/IndexingTask.java | 6 +-
.../{model/v2 => v2/model}/LdapConfiguration.java | 4 +-
.../v2 => v2/model}/MavenManagedRepository.java | 35 +-
.../model}/MavenManagedRepositoryUpdate.java | 11 +-
.../v2 => v2/model}/MavenRemoteRepository.java | 2 +-
.../{model/v2 => v2/model}/MergeConfiguration.java | 4 +-
.../api/{model/v2 => v2/model}/Repository.java | 4 +-
.../{model/v2 => v2/model}/RepositoryGroup.java | 8 +-
.../v2 => v2/model}/RepositoryStatistics.java | 4 +-
.../archiva/rest/api/v2/model/RestModel.java} | 12 +-
.../api/{model/v2 => v2/model}/ScanStatus.java | 6 +-
.../rest/api/{model/v2 => v2/model}/ScanTask.java | 5 +-
.../v2 => v2/model}/SecurityConfiguration.java | 4 +-
.../{model/v2 => v2/model}/ValidationError.java | 4 +-
.../api/v2/model/map/MavenRepositoryMapper.java | 148 ++++
.../model/map/RestServiceMapper.java} | 29 +-
.../api/v2/model/map/ServiceMapperFactory.java | 71 ++
.../model}/repository/ArtifactCleanupInfo.java | 2 +-
.../model}/repository/IndexCreationInfo.java | 6 +-
.../model}/repository/RemoteIndexInfo.java | 4 +-
.../v2 => v2/model}/repository/StagingInfo.java | 3 +-
.../{services/v2 => v2/svc}/ArchivaRestError.java | 7 +-
.../v2 => v2/svc}/ArchivaRestServiceException.java | 2 +-
.../api/{services/v2 => v2/svc}/ErrorKeys.java | 12 +-
.../api/{services/v2 => v2/svc}/ErrorMessage.java | 5 +-
.../v2 => v2/svc}/RepositoryGroupService.java | 9 +-
.../{services/v2 => v2/svc}/RepositoryService.java | 10 +-
.../{services/v2 => v2/svc}/RestConfiguration.java | 2 +-
.../svc}/SecurityConfigurationService.java | 12 +-
.../v2 => v2/svc}/ValidationException.java | 5 +-
.../svc}/maven/MavenManagedRepositoryService.java | 177 ++--
.../api/{services/v2 => v2/svc}/package-info.java | 8 +-
.../src/main/resources/META-INF/spring-context.xml | 10 +-
.../resources/archiva/openapi-configuration.yaml | 4 +-
.../v2/model/map/MavenRepositoryMapperTest.java | 276 ++++++
.../archiva-rest/archiva-rest-services/pom.xml | 25 +-
.../archiva/rest/services/AbstractRestService.java | 2 +-
.../rest/services/DefaultBrowseService.java | 10 +-
.../services/DefaultMergeRepositoriesService.java | 2 +-
.../DefaultRedbackRuntimeConfigurationService.java | 3 +-
.../services/DefaultRemoteRepositoriesService.java | 4 +-
.../rest/services/DefaultRepositoriesService.java | 12 +-
.../rest/services/DefaultSearchService.java | 2 +-
.../rest/services/utils/ArtifactBuilder.java | 4 +-
.../ArchivaRestServiceExceptionMapper.java | 9 +-
.../rest/v2/interceptor/AuditInterceptor.java | 86 ++
.../archiva/rest/v2/interceptor/Priorities.java} | 12 +-
.../archiva/rest/v2/svc/AbstractService.java | 51 ++
.../svc}/DefaultRepositoryGroupService.java | 20 +-
.../v2 => v2/svc}/DefaultRepositoryService.java | 16 +-
.../svc}/DefaultSecurityConfigurationService.java | 22 +-
.../DefaultMavenManagedRepositoryService.java | 122 ++-
.../src/main/resources/META-INF/spring-context.xml | 7 +-
.../archiva/rest/services/BrowseServiceTest.java | 2 +-
.../services/MergeRepositoriesServiceTest.java | 4 +-
.../rest/services/RepositoriesServiceTest.java | 2 +-
.../archiva/rest/services/SearchServiceTest.java | 2 +-
.../rest/services/utils/ArtifactBuilderTest.java | 4 +-
.../v2 => v2/svc}/AbstractNativeRestServices.java | 4 +-
.../svc}/NativeRepositoryGroupServiceTest.java | 7 +-
.../v2 => v2/svc}/NativeRepositoryServiceTest.java | 4 +-
.../NativeSecurityConfigurationServiceTest.java | 11 +-
.../NativeMavenManagedRepositoryServiceTest.java | 44 +-
.../META-INF/spring-context-native-test.xml | 2 +-
.../resources/META-INF/spring-context-test.xml | 2 +-
archiva-modules/archiva-web/archiva-rss/pom.xml | 10 +-
.../NewArtifactsRssFeedProcessorTest.java | 27 +-
.../NewVersionsOfArtifactRssFeedProcessorTest.java | 44 +-
.../archiva-rss/src/test/resources/log4j2-test.xml | 2 +-
.../archiva-web/archiva-security/pom.xml | 16 +-
.../security/ArchivaStandardRolesCheck.java | 4 +-
.../archiva/security/DefaultUserRepositories.java | 12 +-
.../archiva/security/AbstractSecurityTest.java | 6 +-
.../security/ArchivaServletAuthenticatorTest.java | 32 +-
.../src/test/resources/spring-context.xml | 2 +-
.../archiva-web/archiva-web-common/pom.xml | 4 +-
.../archiva/web/api/DefaultFileUploadService.java | 3 +-
.../apache/archiva/web/api/FileUploadService.java | 2 +-
.../org/apache/archiva/web/rss/RssFeedServlet.java | 2 +-
.../web/startup/SecuritySynchronization.java | 6 +-
.../archiva/web/AbstractRestServicesTest.java | 313 +++++++
.../archiva/{ => web}/RuntimeInfoServiceTest.java | 7 +-
.../TestRepositorySessionFactoryBean.java | 5 +-
.../mock}/security/UserRepositoriesStub.java | 9 +-
.../remotedownload/AbstractDownloadTest.java | 5 +-
.../DownloadArtifactFromQueryTest.java | 5 +-
.../remotedownload/DownloadArtifactsTest.java | 5 +-
.../DownloadMergedIndexNonDefaultPathTest.java | 8 +-
.../remotedownload/DownloadMergedIndexTest.java | 8 +-
.../remotedownload/DownloadSnapshotTest.java | 5 +-
.../RemoteRepositoryConnectivityCheckTest.java | 5 +-
.../apache/archiva/web/rss/RssFeedServletTest.java | 8 +-
.../{ => web}/upload/UploadArtifactsTest.java | 39 +-
.../webtest/memory/TestMetadataRepository.java | 5 +-
.../webtest/memory/TestMetadataResolver.java | 5 +-
.../memory/TestRepositorySessionFactory.java | 3 +-
.../src/test/resources/log4j2-test.xml | 3 +-
.../spring-context-artifacts-download.xml | 4 +-
.../spring-context-merge-index-download.xml | 4 +-
.../test/resources/spring-context-rss-servlet.xml | 8 +-
.../test/resources/spring-context-test-common.xml | 2 +-
.../test/resources/spring-context-test-upload.xml | 6 +-
.../src/test/resources/spring-context-with-jcr.xml | 2 +-
archiva-modules/archiva-web/archiva-webapp/pom.xml | 17 +-
.../src/main/webapp/WEB-INF/applicationContext.xml | 24 +
.../src/test/resources/log4j2-test.xml | 2 +-
archiva-modules/archiva-web/archiva-webdav/pom.xml | 17 +-
.../archiva/webdav/ArchivaDavResourceFactory.java | 10 +-
.../archiva/webdav/ArchivaVirtualDavResource.java | 17 +-
.../apache/archiva/webdav/RepositoryServlet.java | 6 +-
.../archiva/webdav/util/WebdavMethodUtil.java | 6 +-
.../AbstractRepositoryServletProxiedTestCase.java | 4 +-
.../webdav/AbstractRepositoryServletTestCase.java | 19 +-
.../webdav/ArchivaDavResourceFactoryTest.java | 323 ++++---
.../org/apache/archiva/webdav/DavResourceTest.java | 2 +-
.../webdav/OverridingRepositoryProxyHandler.java | 2 +-
.../webdav/RepositoryServletDeployTest.java | 4 +-
.../webdav/RepositoryServletNoProxyTest.java | 2 +-
...toryServletProxiedPluginSnapshotPolicyTest.java | 2 +-
.../RepositoryServletProxiedReleasePolicyTest.java | 2 +-
...RepositoryServletProxiedSnapshotPolicyTest.java | 4 +-
...ervletProxiedTimestampedSnapshotPolicyTest.java | 2 +-
.../RepositoryServletRepositoryGroupTest.java | 8 +-
.../webdav/RepositoryServletSecurityTest.java | 266 +++---
.../archiva/webdav/RepositoryServletTest.java | 6 +-
.../webdav/UnauthenticatedDavResourceFactory.java | 2 +-
.../{ => mock}/httpunit/MkColMethodWebRequest.java | 5 +-
.../mock}/metadata/audit/TestAuditListener.java | 6 +-
.../apache/archiva/webdav/util/ReinitServlet.java | 2 +-
.../src/test/resources/log4j2-test.xml | 2 +-
.../test/resources/repository-servlet-simple.xml | 2 +-
.../spring-context-servlet-security-test.xml | 2 +-
.../src/test/resources/spring-context.xml | 2 +-
.../metadata/model/ProjectVersionMetadata.java | 5 +-
.../repository/DefaultMetadataResolver.java | 8 +-
.../src/main/resources/META-INF/spring-context.xml | 4 +-
.../model/RepositoryWalkingStatisticsProvider.java | 2 +-
.../metadata-store-cassandra/pom.xml | 23 +-
.../CassandraRepositorySessionFactory.java | 2 +-
.../cassandra/DefaultCassandraArchivaManager.java | 1 -
.../cassandra/CassandraMetadataRepositoryTest.java | 22 +-
.../cassandra/RepositoriesNamespaceTest.java | 1 -
.../metadata-store-file/pom.xml | 4 +-
.../repository/file/FileMetadataRepository.java | 4 +-
.../file/FileRepositorySessionFactory.java | 2 +-
.../file/FileMetadataRepositoryTest.java | 6 +-
.../repository/jcr/JcrMetadataRepository.java | 2 +-
.../JcrRepositoryStatisticsGatheringTest.java | 11 +-
.../oak-jcr/oak-jcr-lucene/pom.xml | 4 -
archiva-modules/plugins/audit/pom.xml | 14 +-
.../org/apache/archiva/audit/AuditManagerTest.java | 245 ++----
archiva-modules/plugins/problem-reports/pom.xml | 4 +-
.../consumers/DuplicateArtifactsConsumer.java | 2 +-
.../plugins/repository-statistics/pom.xml | 4 +-
.../stats/RepositoryStatisticsManagerTest.java | 320 +++----
pom.xml | 80 +-
504 files changed, 4804 insertions(+), 5228 deletions(-)
create mode 100644 .asf.yaml
copy archiva-modules/{archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/RemoteDefaultRepositoryContent.java => archiva-base/archiva-common/src/main/java/org/apache/archiva/common/AbstractMapper.java} (56%)
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-common/src/main/java/org/apache/archiva/common/MultiModelMapper.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%)
copy archiva-modules/{archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/ArtifactMappingProvider.java => archiva-base/archiva-configuration/archiva-configuration-model/src/main/java/org/apache/archiva/configuration/model/ConfigurationModel.java} (77%)
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%)
copy archiva-modules/archiva-base/archiva-configuration/{ => archiva-configuration-provider}/pom.xml (85%)
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 (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}/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 (96%)
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%)
rename archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/{repository/mock => consumers/core/mock/repository}/RepositoryProviderMock.java (95%)
copy archiva-modules/archiva-base/{archiva-proxy/src/main/resources/META-INF/spring-context.xml => archiva-event-api/pom.xml} (51%)
rename archiva-modules/archiva-base/{archiva-common/src/main/java/org/apache/archiva/event/EventManager.java => archiva-event-api/src/main/java/org/apache/archiva/event/AbstractEventManager.java} (50%)
copy archiva-modules/{archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/v2/ArtifactTransferRequest.java => archiva-base/archiva-event-api/src/main/java/org/apache/archiva/event/BasicEventManager.java} (58%)
rename archiva-modules/archiva-base/{archiva-common => archiva-event-api}/src/main/java/org/apache/archiva/event/Event.java (65%)
create mode 100644 archiva-modules/archiva-base/archiva-event-api/src/main/java/org/apache/archiva/event/EventContext.java
create mode 100644 archiva-modules/archiva-base/archiva-event-api/src/main/java/org/apache/archiva/event/EventContextBuilder.java
rename archiva-modules/archiva-base/{archiva-common => archiva-event-api}/src/main/java/org/apache/archiva/event/EventHandler.java (100%)
rename archiva-modules/archiva-base/{archiva-common => archiva-event-api}/src/main/java/org/apache/archiva/event/EventSource.java (100%)
rename archiva-modules/archiva-base/{archiva-common => archiva-event-api}/src/main/java/org/apache/archiva/event/EventType.java (93%)
create mode 100644 archiva-modules/archiva-base/archiva-event-api/src/main/java/org/apache/archiva/event/context/RepositoryContext.java
create mode 100644 archiva-modules/archiva-base/archiva-event-api/src/main/java/org/apache/archiva/event/context/RestContext.java
create mode 100644 archiva-modules/archiva-base/archiva-event-api/src/main/java/org/apache/archiva/event/context/UserContext.java
create mode 100644 archiva-modules/archiva-base/archiva-event-api/src/main/java/org/apache/archiva/event/package-info.java
rename archiva-modules/archiva-base/{archiva-common/src/test/java/org/apache/archiva/event/EventManagerTest.java => archiva-event-api/src/test/java/org/apache/archiva/event/BasicEventManagerTest.java} (94%)
create mode 100644 archiva-modules/archiva-base/archiva-event-central/pom.xml
copy archiva-modules/archiva-base/{archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryHandlerManager.java => archiva-event-central/src/main/java/org/apache/archiva/event/central/CentralEventManager.java} (55%)
copy archiva-modules/{archiva-maven/archiva-maven-metadata => archiva-base/archiva-event-central}/src/main/resources/META-INF/spring-context.xml (85%)
rename archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/{ => base}/ArchivaProxyRegistry.java (95%)
rename archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/{ => base}/DefaultRepositoryProxyHandler.java (99%)
rename archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/{ => base}/NotFoundException.java (92%)
rename archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/{ => base}/NotModifiedException.java (94%)
rename archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/{ => base}/ProxyConnectorOrderComparator.java (95%)
rename archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/{ => base}/ProxyException.java (92%)
rename archiva-modules/archiva-maven/archiva-maven-common/src/main/java/org/apache/archiva/{proxy/maven => maven/common/proxy}/DebugTransferListener.java (96%)
rename archiva-modules/archiva-maven/archiva-maven-common/src/main/java/org/apache/archiva/{proxy/maven => maven/common/proxy}/DefaultWagonFactory.java (97%)
rename archiva-modules/archiva-maven/archiva-maven-common/src/main/java/org/apache/archiva/{proxy/maven => maven/common/proxy}/WagonFactory.java (92%)
rename archiva-modules/archiva-maven/archiva-maven-common/src/main/java/org/apache/archiva/{proxy/maven => maven/common/proxy}/WagonFactoryException.java (91%)
rename archiva-modules/archiva-maven/archiva-maven-common/src/main/java/org/apache/archiva/{proxy/maven => maven/common/proxy}/WagonFactoryRequest.java (97%)
rename archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/{indexer/maven => maven/indexer}/DefaultIndexUpdateSideEffect.java (94%)
rename archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/{indexer/maven => maven/indexer}/MavenIndexContext.java (98%)
rename archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/{indexer/maven => maven/indexer}/MavenIndexManager.java (98%)
rename archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/{indexer/maven => maven/indexer}/search/MavenRepositorySearch.java (99%)
rename archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/{ => maven}/indexer/search/NoClassifierArtifactInfoFilter.java (87%)
rename archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/{ => maven}/indexer/util/SearchUtil.java (93%)
rename archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/{indexer/maven => maven/indexer}/MavenIndexManagerTest.java (88%)
rename archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/{indexer/maven => maven/indexer}/search/AbstractMavenRepositorySearch.java (80%)
rename archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/{indexer/maven => maven/indexer}/search/MavenRepositorySearchOSGITest.java (91%)
rename archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/{indexer/maven => maven/indexer}/search/MavenRepositorySearchPaginateTest.java (94%)
rename archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/{indexer/maven => maven/indexer}/search/MavenRepositorySearchTest.java (78%)
rename archiva-modules/archiva-maven/archiva-maven-metadata/src/main/java/org/apache/archiva/{metadata/maven => maven/metadata}/MavenMetadataReader.java (99%)
rename archiva-modules/archiva-maven/archiva-maven-metadata/src/main/java/org/apache/archiva/{metadata/maven => maven/metadata}/model/MavenArtifactFacet.java (98%)
rename archiva-modules/archiva-maven/archiva-maven-model/src/main/java/org/apache/archiva/{maven2 => maven}/model/Artifact.java (99%)
rename archiva-modules/archiva-maven/archiva-maven-model/src/main/java/org/apache/archiva/{maven2 => maven}/model/TreeEntry.java (96%)
rename archiva-modules/archiva-maven/archiva-maven-model/src/test/java/org/apache/archiva/{maven2 => maven}/model/ModelTest.java (96%)
rename archiva-modules/archiva-maven/archiva-maven-proxy/src/main/java/org/apache/archiva/{proxy/maven => maven/proxy}/MavenRepositoryProxyHandler.java (96%)
rename archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/{ => maven}/proxy/AbstractProxyTestCase.java (97%)
rename archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/{ => maven}/proxy/CacheFailuresTransferTest.java (85%)
rename archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/{ => maven}/proxy/ChecksumTransferTest.java (97%)
rename archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/{ => maven}/proxy/ErrorHandlingTest.java (87%)
rename archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/{ => maven}/proxy/HttpProxyTransferTest.java (96%)
rename archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/{ => maven}/proxy/ManagedDefaultTransferTest.java (96%)
rename archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/{ => maven}/proxy/MetadataTransferTest.java (99%)
rename archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/{ => maven}/proxy/MockConfiguration.java (91%)
rename archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/{ => maven}/proxy/SnapshotTransferTest.java (99%)
rename archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/{ => maven}/proxy/WagonDelegate.java (98%)
rename archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/{proxy/common => maven/proxy}/WagonFactoryTest.java (79%)
rename archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/{ => maven/proxy/mock}/metadata/repository/MockRepositoryArchivaTaskScheduler.java (93%)
rename archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/{repository/mock => maven/proxy/mock/repository}/ArchivaIndexManagerMock.java (96%)
rename archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/{repository/mock => maven/proxy/mock/repository}/ManagedRepositoryContentMock.java (99%)
rename archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/{repository/mock => maven/proxy/mock/repository}/RemoteRepositoryContentMock.java (96%)
rename archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/{repository/mock => maven/proxy/mock/repository}/RepositoryContentProviderMock.java (95%)
rename archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/{repository/mock => maven/proxy/mock/repository}/RepositoryProviderMock.java (95%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/MavenManagedRepository.java (91%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/MavenRemoteRepository.java (92%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/MavenRepositoryGroup.java (97%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/MavenRepositoryProvider.java (94%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/MavenSystemManager.java (96%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/content/AbstractDefaultRepositoryContent.java (99%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/content/ArtifactExtensionMapping.java (93%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/content/ArtifactInfo.java (96%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/content/FilenameParser.java (99%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/content/ManagedDefaultRepositoryContent.java (99%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/content/MavenContentHelper.java (98%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/content/MavenContentProvider.java (96%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/content/MavenRepositoryRequestInfo.java (99%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/content/MavenTypes.java (94%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/content/RemoteDefaultRepositoryContent.java (96%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/dependency/tree/ArchivaRepositoryConnectorFactory.java (98%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/dependency/tree/DependencyTreeBuilder.java (92%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/dependency/tree/DependencyTreeBuilderException.java (94%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/dependency/tree/Maven3DependencyTreeBuilder.java (98%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/dependency/tree/TreeDependencyNodeVisitor.java (94%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/merge/Maven2RepositoryMerger.java (98%)
copy archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/ArtifactMappingProvider.java (94%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/ArtifactMetadataVersionComparator.java (96%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/DefaultArtifactMappingProvider.java (98%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/DummyLifecycleBindingsInjector.java (95%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/Maven2RepositoryPathTranslator.java (99%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/Maven2RepositoryStorage.java (99%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/MavenArtifactFacetFactory.java (92%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/MavenProjectFacet.java (98%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/MavenProjectFacetFactory.java (96%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/MavenProjectParent.java (95%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/RepositoryModelResolver.java (98%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/AbstractRepositoryLayerTestCase.java (98%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/MavenRepositoryProviderTest.java (93%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/RepositoryURLTest.java (98%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/content/AbstractBaseRepositoryContentLayoutTest.java (97%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/content/AbstractRepositoryContentTest.java (99%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/content/ArtifactExtensionMappingTest.java (92%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/content/FilenameParserTest.java (99%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/content/ManagedDefaultRepositoryContentTest.java (99%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/content/MavenContentHelperTest.java (98%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/content/MavenRepositoryRequestInfoTest.java (98%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/content/RemoteDefaultRepositoryContentTest.java (96%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/dependency/tree/DependencyTreeBuilderTestMaven3.java (92%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/merge/Maven2RepositoryMergerTest.java (96%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/Maven2RepositoryStorageTest.java (95%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/MetadataToolsTest.java (98%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/RepositoryMetadataReaderTest.java (97%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/RepositoryMetadataWriterTest.java (96%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java (97%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/Maven2RepositoryMetadataResolverMRM1411Test.java (97%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/Maven2RepositoryMetadataResolverManagedReleaseTest.java (97%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/Maven2RepositoryMetadataResolverManagedSnapshotTest.java (98%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/Maven2RepositoryMetadataResolverTest.java (98%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/MavenRepositoryMetadataReaderTest.java (97%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/MockWagon.java (98%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/mock/MockConfiguration.java (86%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/mock/ArchivaIndexManagerMock.java (98%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/mock/MavenIndexContextMock.java (98%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/mock/MockRepositoryArchivaTaskScheduler.java (97%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/mock/RepositoryRegistryMock.java (97%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/mock/TestMetadataResolver.java (98%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/mock/configuration/MockRepoAdmin.java (97%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/mock/configuration/StubConfiguration.java (90%)
rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/mock/configuration/TestConfiguration.java (91%)
rename archiva-modules/archiva-maven/archiva-maven-scheduler/src/main/java/org/apache/archiva/{scheduler/indexing/maven => maven/scheduler/indexing}/ArchivaIndexingTaskExecutor.java (98%)
rename archiva-modules/archiva-maven/archiva-maven-scheduler/src/main/java/org/apache/archiva/{scheduler/indexing/maven => maven/scheduler/indexing}/DefaultDownloadRemoteIndexScheduler.java (93%)
rename archiva-modules/archiva-maven/archiva-maven-scheduler/src/main/java/org/apache/archiva/{scheduler/indexing/maven => maven/scheduler/indexing}/DefaultIndexUpdateSideEffect.java (93%)
rename archiva-modules/archiva-maven/archiva-maven-scheduler/src/main/java/org/apache/archiva/{scheduler/indexing/maven => maven/scheduler/indexing}/DownloadRemoteIndexTask.java (98%)
rename archiva-modules/archiva-maven/archiva-maven-scheduler/src/main/java/org/apache/archiva/{scheduler/indexing/maven => maven/scheduler/indexing}/DownloadRemoteIndexTaskRequest.java (94%)
rename archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/java/org/apache/archiva/{scheduler/indexing/maven => maven/scheduler/indexing}/ArchivaIndexingTaskExecutorTest.java (99%)
rename archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/java/org/apache/archiva/{scheduler/indexing/maven => maven/scheduler/indexing}/DownloadRemoteIndexTaskTest.java (97%)
rename archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/{ => scheduler/repository}/mock/ArchivaIndexManagerMock.java (98%)
rename archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/{ => scheduler/repository}/mock/MavenIndexContextMock.java (97%)
rename archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/{ => scheduler/repository}/mock/MockArchivaAdministration.java (97%)
rename archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/{ => scheduler/repository}/mock/MockRemoteRepositoryAdmin.java (94%)
delete mode 100644 archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/enunciate/archiva.css
delete mode 100644 archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/enunciate/archiva.fmt
delete mode 100644 archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/enunciate/enunciate.xml.org
copy archiva-modules/{archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryHandlerManager.java => archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/v2/event/RestEvent.java} (55%)
create mode 100644 archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/v2/event/RestRequestEvent.java
create mode 100644 archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/v2/event/RestResponseEvent.java
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{model/v2 => v2/model}/Artifact.java (92%)
copy archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{model/v2 => v2/model}/ArtifactTransferRequest.java (91%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{model/v2 => v2/model}/BeanInformation.java (97%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{model/v2 => v2/model}/CacheConfiguration.java (98%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{model/v2 => v2/model}/FileInfo.java (97%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{model/v2 => v2/model}/IndexingTask.java (95%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{model/v2 => v2/model}/LdapConfiguration.java (99%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{model/v2 => v2/model}/MavenManagedRepository.java (80%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{model/v2 => v2/model}/MavenManagedRepositoryUpdate.java (81%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{model/v2 => v2/model}/MavenRemoteRepository.java (99%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{model/v2 => v2/model}/MergeConfiguration.java (97%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{model/v2 => v2/model}/Repository.java (98%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{model/v2 => v2/model}/RepositoryGroup.java (96%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{model/v2 => v2/model}/RepositoryStatistics.java (98%)
copy archiva-modules/{archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/ArtifactMappingProvider.java => archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/v2/model/RestModel.java} (77%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{model/v2 => v2/model}/ScanStatus.java (94%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{model/v2 => v2/model}/ScanTask.java (97%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{model/v2 => v2/model}/SecurityConfiguration.java (98%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{model/v2 => v2/model}/ValidationError.java (97%)
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
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{model/v2/ArtifactTransferRequest.java => v2/model/map/RestServiceMapper.java} (59%)
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
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{model/v2 => v2/model}/repository/ArtifactCleanupInfo.java (98%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{model/v2 => v2/model}/repository/IndexCreationInfo.java (94%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{model/v2 => v2/model}/repository/RemoteIndexInfo.java (96%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{model/v2 => v2/model}/repository/StagingInfo.java (95%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{services/v2 => v2/svc}/ArchivaRestError.java (95%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{services/v2 => v2/svc}/ArchivaRestServiceException.java (98%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{services/v2 => v2/svc}/ErrorKeys.java (97%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{services/v2 => v2/svc}/ErrorMessage.java (96%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{services/v2 => v2/svc}/RepositoryGroupService.java (98%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{services/v2 => v2/svc}/RepositoryService.java (97%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{services/v2 => v2/svc}/RestConfiguration.java (97%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{services/v2 => v2/svc}/SecurityConfigurationService.java (97%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{services/v2 => v2/svc}/ValidationException.java (95%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{services/v2 => v2/svc}/maven/MavenManagedRepositoryService.java (73%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/{services/v2 => v2/svc}/package-info.java (97%)
copy archiva-modules/{archiva-maven/archiva-maven-common => archiva-web/archiva-rest/archiva-rest-api}/src/main/resources/META-INF/spring-context.xml (88%)
create mode 100644 archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/test/java/org/apache/archiva/rest/api/v2/model/map/MavenRepositoryMapperTest.java
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/{services/interceptors/v2 => v2/interceptor}/ArchivaRestServiceExceptionMapper.java (89%)
create mode 100644 archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/v2/interceptor/AuditInterceptor.java
rename archiva-modules/{archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/ArtifactMappingProvider.java => archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/v2/interceptor/Priorities.java} (77%)
create mode 100644 archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/v2/svc/AbstractService.java
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/{services/v2 => v2/svc}/DefaultRepositoryGroupService.java (95%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/{services/v2 => v2/svc}/DefaultRepositoryService.java (95%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/{services/v2 => v2/svc}/DefaultSecurityConfigurationService.java (97%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/{services/v2 => v2/svc/maven}/DefaultMavenManagedRepositoryService.java (83%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/{services/v2 => v2/svc}/AbstractNativeRestServices.java (99%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/{services/v2 => v2/svc}/NativeRepositoryGroupServiceTest.java (98%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/{services/v2 => v2/svc}/NativeRepositoryServiceTest.java (98%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/{services/v2 => v2/svc}/NativeSecurityConfigurationServiceTest.java (97%)
rename archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/{services/v2 => v2/svc/maven}/NativeMavenManagedRepositoryServiceTest.java (67%)
create mode 100644 archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/AbstractRestServicesTest.java
rename archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/{ => web}/RuntimeInfoServiceTest.java (95%)
rename archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/{ => web}/TestRepositorySessionFactoryBean.java (96%)
rename archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/{ => web/mock}/security/UserRepositoriesStub.java (88%)
rename archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/{ => web}/remotedownload/AbstractDownloadTest.java (99%)
rename archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/{ => web}/remotedownload/DownloadArtifactFromQueryTest.java (98%)
rename archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/{ => web}/remotedownload/DownloadArtifactsTest.java (99%)
rename archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/{ => web}/remotedownload/DownloadMergedIndexNonDefaultPathTest.java (97%)
rename archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/{ => web}/remotedownload/DownloadMergedIndexTest.java (97%)
rename archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/{ => web}/remotedownload/DownloadSnapshotTest.java (98%)
rename archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/{ => web}/remotedownload/RemoteRepositoryConnectivityCheckTest.java (98%)
rename archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/{ => web}/upload/UploadArtifactsTest.java (88%)
rename archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/{ => web}/webtest/memory/TestMetadataRepository.java (97%)
rename archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/{ => web}/webtest/memory/TestMetadataResolver.java (98%)
rename archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/{ => web}/webtest/memory/TestRepositorySessionFactory.java (97%)
rename archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/{ => mock}/httpunit/MkColMethodWebRequest.java (91%)
rename archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/{ => webdav/mock}/metadata/audit/TestAuditListener.java (88%)
rename archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/{stats => jcr}/JcrRepositoryStatisticsGatheringTest.java (95%)