This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git.
from cffd547 Moving methods to content helper and adding unit tests
new 716087e Package renaming for maven repository classes
new e015e1c Renaming method names
new 2b4254a Adding unit tests for maven repository
new c7a9243 Fixing path matching for repository content
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../repository/AbstractRepositoryPurgeTest.java | 3 +-
.../repository/ManagedRepositoryContent.java | 123 ++++++++----
.../archiva/repository/RepositoryContent.java | 2 +-
.../mock/ManagedRepositoryContentMock.java | 24 ++-
.../scanner/mock/ManagedRepositoryContentMock.java | 24 ++-
.../repository/storage/fs/FilesystemStorage.java | 2 +-
.../indexer/maven/MavenIndexManagerTest.java | 9 +-
.../mock/ManagedRepositoryContentMock.java | 24 ++-
.../{maven2 => maven}/MavenManagedRepository.java | 4 +-
.../{maven2 => maven}/MavenRemoteRepository.java | 2 +-
.../{maven2 => maven}/MavenRepositoryGroup.java | 2 +-
.../{maven2 => maven}/MavenRepositoryProvider.java | 2 +-
.../{maven2 => maven}/MavenSystemManager.java | 4 +-
.../content}/AbstractDefaultRepositoryContent.java | 15 +-
.../content}/ArtifactExtensionMapping.java | 9 +-
.../content}/DefaultPathParser.java | 12 +-
.../maven2 => maven/content}/FilenameParser.java | 5 +-
.../content}/ManagedDefaultRepositoryContent.java | 147 +++++++++------
.../content}/MavenContentHelper.java | 112 +++++------
.../content}/MavenContentProvider.java | 7 +-
.../content}/MavenRepositoryRequestInfo.java | 6 +-
.../content}/RemoteDefaultRepositoryContent.java | 7 +-
.../tree}/ArchivaRepositoryConnectorFactory.java | 5 +-
.../dependency/tree}/DependencyTreeBuilder.java | 5 +-
.../tree}/DependencyTreeBuilderException.java | 5 +-
.../tree}/Maven3DependencyTreeBuilder.java | 7 +-
.../tree}/TreeDependencyNodeVisitor.java | 5 +-
.../maven}/merge/Maven2RepositoryMerger.java | 7 +-
.../metadata/storage}/ArtifactMappingProvider.java | 5 +-
.../ArtifactMetadataVersionComparator.java | 5 +-
.../storage}/DefaultArtifactMappingProvider.java | 5 +-
.../storage}/DummyLifecycleBindingsInjector.java | 5 +-
.../storage}/Maven2RepositoryPathTranslator.java | 6 +-
.../metadata/storage}/Maven2RepositoryStorage.java | 8 +-
.../storage}/MavenArtifactFacetFactory.java | 5 +-
.../maven/metadata/storage}/MavenProjectFacet.java | 5 +-
.../storage}/MavenProjectFacetFactory.java | 6 +-
.../metadata/storage}/MavenProjectParent.java | 5 +-
.../metadata/storage}/RepositoryModelResolver.java | 7 +-
.../AbstractRepositoryLayerTestCase.java | 12 +-
.../MavenRepositoryProviderTest.java | 4 +-
.../repository/{ => maven}/RepositoryURLTest.java | 5 +-
.../AbstractManagedRepositoryContentTest.java} | 34 ++--
.../content/AbstractRepositoryContentTest.java} | 29 ++-
.../content}/ArtifactExtensionMappingTest.java | 9 +-
.../content}/DefaultPathParserTest.java | 6 +-
.../content}/FilenameParserTest.java | 6 +-
.../ManagedDefaultRepositoryContentTest.java | 12 +-
.../maven/content/MavenContentHelperTest.java | 209 +++++++++++++++++++++
.../content}/MavenRepositoryRequestInfoTest.java | 9 +-
.../RemoteDefaultRepositoryContentTest.java | 9 +-
.../tree}/DependencyTreeBuilderTestMaven3.java | 6 +-
.../maven}/merge/Maven2RepositoryMergerTest.java | 8 +-
.../metadata/Maven2RepositoryStorageTest.java | 7 +-
.../{ => maven}/metadata/MetadataToolsTest.java | 12 +-
.../metadata/RepositoryMetadataReaderTest.java | 6 +-
.../metadata/RepositoryMetadataWriterTest.java | 5 +-
...sitoryMetadataResolverMRM1411RepoGroupTest.java | 5 +-
...aven2RepositoryMetadataResolverMRM1411Test.java | 5 +-
...positoryMetadataResolverManagedReleaseTest.java | 5 +-
...ositoryMetadataResolverManagedSnapshotTest.java | 5 +-
.../Maven2RepositoryMetadataResolverTest.java | 5 +-
.../MavenRepositoryMetadataReaderTest.java | 5 +-
.../maven/metadata/storage}/MockWagon.java | 5 +-
.../metadata/storage/mock}/MockConfiguration.java | 2 +-
.../mock/ArchivaIndexManagerMock.java | 5 +-
.../mock/MavenIndexContextMock.java | 5 +-
.../mock}/MockRepositoryArchivaTaskScheduler.java | 5 +-
.../{ => maven/mock}/RepositoryRegistryMock.java | 13 +-
.../maven/mock}/TestMetadataResolver.java | 8 +-
.../maven/mock}/configuration/MockRepoAdmin.java | 9 +-
.../mock}/configuration/StubConfiguration.java | 10 +-
.../mock}/configuration/TestConfiguration.java | 9 +-
.../src/test/resources/spring-context-merge.xml | 2 +-
.../spring-context-metadata-tools-test.xml | 2 +-
.../test/resources/spring-context-no-mock-conf.xml | 2 +-
.../src/test/resources/spring-context-storage.xml | 2 +-
.../rest/services/DefaultBrowseService.java | 6 +-
.../webdav/ArchivaDavResourceFactoryTest.java | 6 +-
.../org/apache/archiva/webdav/DavResourceTest.java | 2 +-
80 files changed, 746 insertions(+), 406 deletions(-)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/{maven2
=> maven}/MavenManagedRepository.java (97%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/{maven2
=> maven}/MavenRemoteRepository.java (99%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/{maven2
=> maven}/MavenRepositoryGroup.java (98%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/{maven2
=> maven}/MavenRepositoryProvider.java (99%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/{maven2
=> maven}/MavenSystemManager.java (97%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/{content/maven2
=> maven/content}/AbstractDefaultRepositoryContent.java (96%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/{content/maven2
=> maven/content}/ArtifactExtensionMapping.java (89%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/{content/maven2
=> maven/content}/DefaultPathParser.java (90%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/{content/maven2
=> maven/content}/FilenameParser.java (98%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/{content/maven2
=> maven/content}/ManagedDefaultRepositoryContent.java (96%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/{content/maven2
=> maven/content}/MavenContentHelper.java (74%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/{content/maven2
=> maven/content}/MavenContentProvider.java (96%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/{content/maven2
=> maven/content}/MavenRepositoryRequestInfo.java (98%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/{content/maven2
=> maven/content}/RemoteDefaultRepositoryContent.java (93%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{dependency/tree/maven2
=> repository/maven/dependency/tree}/ArchivaRepositoryConnectorFactory.java
(96%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{dependency/tree/maven2
=> repository/maven/dependency/tree}/DependencyTreeBuilder.java (92%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{dependency/tree/maven2
=> repository/maven/dependency/tree}/DependencyTreeBuilderException.java (90%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{dependency/tree/maven2
=> repository/maven/dependency/tree}/Maven3DependencyTreeBuilder.java (98%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{dependency/tree/maven2
=> repository/maven/dependency/tree}/TreeDependencyNodeVisitor.java (96%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{stagerepository
=> repository/maven}/merge/Maven2RepositoryMerger.java (98%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{metadata/repository/storage/maven2
=> repository/maven/metadata/storage}/ArtifactMappingProvider.java (89%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{metadata/repository/storage/maven2
=> repository/maven/metadata/storage}/ArtifactMetadataVersionComparator.java
(93%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{metadata/repository/storage/maven2
=> repository/maven/metadata/storage}/DefaultArtifactMappingProvider.java (96%)
copy
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{metadata/repository/storage/maven2
=> repository/maven/metadata/storage}/DummyLifecycleBindingsInjector.java (92%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{metadata/repository/storage/maven2
=> repository/maven/metadata/storage}/Maven2RepositoryPathTranslator.java (98%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{metadata/repository/storage/maven2
=> repository/maven/metadata/storage}/Maven2RepositoryStorage.java (99%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{metadata/repository/storage/maven2
=> repository/maven/metadata/storage}/MavenArtifactFacetFactory.java (93%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{metadata/repository/storage/maven2
=> repository/maven/metadata/storage}/MavenProjectFacet.java (97%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{metadata/repository/storage/maven2
=> repository/maven/metadata/storage}/MavenProjectFacetFactory.java (89%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{metadata/repository/storage/maven2
=> repository/maven/metadata/storage}/MavenProjectParent.java (92%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{metadata/repository/storage/maven2
=> repository/maven/metadata/storage}/RepositoryModelResolver.java (99%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/{
=> maven}/AbstractRepositoryLayerTestCase.java (89%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/{maven2
=> maven}/MavenRepositoryProviderTest.java (99%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/{
=> maven}/RepositoryURLTest.java (97%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/{main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java
=>
test/java/org/apache/archiva/repository/maven/content/AbstractManagedRepositoryContentTest.java}
(51%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java
=> repository/maven/content/AbstractRepositoryContentTest.java} (95%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/{content/maven2
=> maven/content}/ArtifactExtensionMappingTest.java (91%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/{content/maven2
=> maven/content}/DefaultPathParserTest.java (99%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/{content/maven2
=> maven/content}/FilenameParserTest.java (97%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{metadata/repository/storage/maven2
=> repository/maven/content}/ManagedDefaultRepositoryContentTest.java (97%)
create mode 100644
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/MavenContentHelperTest.java
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/{content/maven2
=> maven/content}/MavenRepositoryRequestInfoTest.java (98%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{metadata/repository/storage/maven2
=> repository/maven/content}/RemoteDefaultRepositoryContentTest.java (91%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{dependency/tree/maven2
=> repository/maven/dependency/tree}/DependencyTreeBuilderTestMaven3.java (96%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{stagerepository
=> repository/maven}/merge/Maven2RepositoryMergerTest.java (97%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/{
=> maven}/metadata/Maven2RepositoryStorageTest.java (94%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/{
=> maven}/metadata/MetadataToolsTest.java (98%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/{
=> maven}/metadata/RepositoryMetadataReaderTest.java (95%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/{
=> maven}/metadata/RepositoryMetadataWriterTest.java (96%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{metadata/repository/storage/maven2
=>
repository/maven/metadata/storage}/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java
(99%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{metadata/repository/storage/maven2
=>
repository/maven/metadata/storage}/Maven2RepositoryMetadataResolverMRM1411Test.java
(99%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{metadata/repository/storage/maven2
=>
repository/maven/metadata/storage}/Maven2RepositoryMetadataResolverManagedReleaseTest.java
(97%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{metadata/repository/storage/maven2
=>
repository/maven/metadata/storage}/Maven2RepositoryMetadataResolverManagedSnapshotTest.java
(97%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{metadata/repository/storage/maven2
=>
repository/maven/metadata/storage}/Maven2RepositoryMetadataResolverTest.java
(99%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{metadata/repository/storage/maven2
=> repository/maven/metadata/storage}/MavenRepositoryMetadataReaderTest.java
(97%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{metadata/repository/storage/maven2
=> repository/maven/metadata/storage}/MockWagon.java (98%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{metadata/repository/storage/maven2/conf
=> repository/maven/metadata/storage/mock}/MockConfiguration.java (98%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/{index
=> maven}/mock/ArchivaIndexManagerMock.java (99%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/{index
=> maven}/mock/MavenIndexContextMock.java (97%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{metadata/repository
=> repository/maven/mock}/MockRepositoryArchivaTaskScheduler.java (94%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/{
=> maven/mock}/RepositoryRegistryMock.java (81%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{metadata/repository
=> repository/maven/mock}/TestMetadataResolver.java (91%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{
=> repository/maven/mock}/configuration/MockRepoAdmin.java (97%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{
=> repository/maven/mock}/configuration/StubConfiguration.java (89%)
rename
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{
=> repository/maven/mock}/configuration/TestConfiguration.java (90%)
