Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactoring packages for maven repository module

This commit is contained in:
Martin Stockhammer 2021-12-24 14:17:39 +01:00
parent ea4413d1a0
commit 2507f8d057
77 changed files with 114 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
View File

@ -25,7 +25,7 @@ import org.apache.archiva.metadata.repository.RepositorySession;
import org.apache.archiva.metadata.repository.RepositorySessionFactory;
import org.apache.archiva.repository.ManagedRepositoryContent;
import org.apache.archiva.repository.base.RepositoryHandlerDependencies;
import org.apache.archiva.repository.maven.metadata.storage.Maven2RepositoryPathTranslator;
import org.apache.archiva.maven.repository.metadata.storage.Maven2RepositoryPathTranslator;
import org.apache.archiva.repository.base.managed.BasicManagedRepository;
import org.apache.archiva.repository.ReleaseScheme;
import org.apache.archiva.repository.RepositoryContentProvider;

5
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/maven/indexer/MavenIndexManagerTest.java
View File

@ -21,14 +21,13 @@ package org.apache.archiva.maven.indexer;
import org.apache.archiva.common.utils.FileUtils;
import org.apache.archiva.indexer.ArchivaIndexingContext;
import org.apache.archiva.indexer.IndexCreationFailedException;
import org.apache.archiva.maven.indexer.MavenIndexManager;
import org.apache.archiva.repository.RepositoryType;
import org.apache.archiva.repository.base.ArchivaRepositoryRegistry;
import org.apache.archiva.repository.base.RepositoryHandlerDependencies;
import org.apache.archiva.repository.features.IndexCreationFeature;
import org.apache.archiva.repository.features.RemoteIndexFeature;
import org.apache.archiva.repository.maven.MavenManagedRepository;
import org.apache.archiva.repository.maven.MavenRemoteRepository;
import org.apache.archiva.maven.repository.MavenManagedRepository;
import org.apache.archiva.maven.repository.MavenRemoteRepository;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.apache.maven.index.MAVEN;
import org.apache.maven.index.QueryCreator;

5
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/MavenManagedRepository.java → archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/MavenManagedRepository.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven;
package org.apache.archiva.maven.repository;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -10,7 +10,6 @@ package org.apache.archiva.repository.maven;
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@ -22,6 +21,7 @@ package org.apache.archiva.repository.maven;
import org.apache.archiva.common.filelock.DefaultFileLockManager;
import org.apache.archiva.common.filelock.FileLockManager;
import org.apache.archiva.indexer.ArchivaIndexingContext;
import org.apache.archiva.maven.repository.content.MavenRepositoryRequestInfo;
import org.apache.archiva.repository.ReleaseScheme;
import org.apache.archiva.repository.RepositoryCapabilities;
import org.apache.archiva.repository.RepositoryRequestInfo;
@ -34,7 +34,6 @@ import org.apache.archiva.repository.features.ArtifactCleanupFeature;
import org.apache.archiva.repository.features.IndexCreationFeature;
import org.apache.archiva.repository.features.RepositoryFeature;
import org.apache.archiva.repository.features.StagingRepositoryFeature;
import org.apache.archiva.repository.maven.content.MavenRepositoryRequestInfo;
import org.apache.archiva.repository.storage.fs.FilesystemStorage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

3
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/MavenRemoteRepository.java → archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/MavenRemoteRepository.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven;
package org.apache.archiva.maven.repository;
import org.apache.archiva.common.filelock.DefaultFileLockManager;
import org.apache.archiva.common.filelock.FileLockManager;
@ -31,7 +31,6 @@ import java.util.Locale;
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

3
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/MavenRepositoryGroup.java → archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/MavenRepositoryGroup.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven;
package org.apache.archiva.maven.repository;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -10,7 +10,6 @@ package org.apache.archiva.repository.maven;
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

3
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/MavenRepositoryProvider.java → archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/MavenRepositoryProvider.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven;
package org.apache.archiva.maven.repository;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -10,7 +10,6 @@ package org.apache.archiva.repository.maven;
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

5
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/MavenSystemManager.java → archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/MavenSystemManager.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven;
package org.apache.archiva.maven.repository;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -10,7 +10,6 @@ package org.apache.archiva.repository.maven;
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@ -19,7 +18,7 @@ package org.apache.archiva.repository.maven;
* under the License.
*/
import org.apache.archiva.repository.maven.dependency.tree.ArchivaRepositoryConnectorFactory;
import org.apache.archiva.maven.repository.dependency.tree.ArchivaRepositoryConnectorFactory;
import org.apache.maven.repository.internal.DefaultArtifactDescriptorReader;
import org.apache.maven.repository.internal.DefaultVersionRangeResolver;
import org.apache.maven.repository.internal.DefaultVersionResolver;

4
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/AbstractDefaultRepositoryContent.java → archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/AbstractDefaultRepositoryContent.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.content;
package org.apache.archiva.maven.repository.content;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -19,12 +19,12 @@ package org.apache.archiva.repository.maven.content;
*/
import org.apache.archiva.common.utils.VersionUtil;
import org.apache.archiva.maven.repository.metadata.storage.ArtifactMappingProvider;
import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator;
import org.apache.archiva.repository.RepositoryContent;
import org.apache.archiva.repository.content.ItemSelector;
import org.apache.archiva.repository.content.LayoutException;
import org.apache.archiva.repository.content.base.ArchivaItemSelector;
import org.apache.archiva.repository.maven.metadata.storage.ArtifactMappingProvider;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

6
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/ArtifactExtensionMapping.java → archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/ArtifactExtensionMapping.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.content;
package org.apache.archiva.maven.repository.content;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -18,8 +18,8 @@ package org.apache.archiva.repository.maven.content;
* under the License.
*/
import org.apache.archiva.repository.maven.metadata.storage.ArtifactMappingProvider;
import org.apache.archiva.repository.maven.metadata.storage.DefaultArtifactMappingProvider;
import org.apache.archiva.maven.repository.metadata.storage.ArtifactMappingProvider;
import org.apache.archiva.maven.repository.metadata.storage.DefaultArtifactMappingProvider;
/**
* ArtifactExtensionMapping

2
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/ArtifactInfo.java → archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/ArtifactInfo.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.content;
package org.apache.archiva.maven.repository.content;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/FilenameParser.java → archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/FilenameParser.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.content;
package org.apache.archiva.maven.repository.content;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/ManagedDefaultRepositoryContent.java → archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/ManagedDefaultRepositoryContent.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.content;
package org.apache.archiva.maven.repository.content;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/MavenContentHelper.java → archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/MavenContentHelper.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.content;
package org.apache.archiva.maven.repository.content;
/*
* Licensed to the Apache Software Foundation (ASF) under one

4
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/MavenContentProvider.java → archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/MavenContentProvider.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.content;
package org.apache.archiva.maven.repository.content;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -20,6 +20,7 @@ package org.apache.archiva.repository.maven.content;
import org.apache.archiva.common.filelock.FileLockManager;
import org.apache.archiva.configuration.FileTypes;
import org.apache.archiva.maven.repository.metadata.storage.ArtifactMappingProvider;
import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator;
import org.apache.archiva.repository.ManagedRepository;
import org.apache.archiva.repository.ManagedRepositoryContent;
@ -31,7 +32,6 @@ import org.apache.archiva.repository.RepositoryContentProvider;
import org.apache.archiva.repository.RepositoryException;
import org.apache.archiva.repository.RepositoryType;
import org.apache.archiva.repository.content.BaseRepositoryContentLayout;
import org.apache.archiva.repository.maven.metadata.storage.ArtifactMappingProvider;
import org.springframework.stereotype.Service;
import javax.inject.Inject;

2
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/MavenRepositoryRequestInfo.java → archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/MavenRepositoryRequestInfo.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.content;
package org.apache.archiva.maven.repository.content;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/MavenTypes.java → archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/MavenTypes.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.content;
package org.apache.archiva.maven.repository.content;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/RemoteDefaultRepositoryContent.java → archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/RemoteDefaultRepositoryContent.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.content;
package org.apache.archiva.maven.repository.content;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/dependency/tree/ArchivaRepositoryConnectorFactory.java → archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/dependency/tree/ArchivaRepositoryConnectorFactory.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.dependency.tree;
package org.apache.archiva.maven.repository.dependency.tree;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file

2
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/dependency/tree/DependencyTreeBuilder.java → archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/dependency/tree/DependencyTreeBuilder.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.dependency.tree;
package org.apache.archiva.maven.repository.dependency.tree;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file

2
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/dependency/tree/DependencyTreeBuilderException.java → archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/dependency/tree/DependencyTreeBuilderException.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.dependency.tree;
package org.apache.archiva.maven.repository.dependency.tree;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file

4
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/dependency/tree/Maven3DependencyTreeBuilder.java → archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/dependency/tree/Maven3DependencyTreeBuilder.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.dependency.tree;
package org.apache.archiva.maven.repository.dependency.tree;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@ -31,7 +31,7 @@ import org.apache.archiva.model.ArchivaRepositoryMetadata;
import org.apache.archiva.repository.ManagedRepository;
import org.apache.archiva.repository.RemoteRepository;
import org.apache.archiva.repository.RepositoryRegistry;
import org.apache.archiva.repository.maven.MavenSystemManager;
import org.apache.archiva.maven.repository.MavenSystemManager;
import org.apache.archiva.repository.metadata.RepositoryMetadataException;
import org.apache.archiva.repository.metadata.base.MetadataTools;
import org.apache.archiva.repository.storage.StorageAsset;

2
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/dependency/tree/TreeDependencyNodeVisitor.java → archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/dependency/tree/TreeDependencyNodeVisitor.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.dependency.tree;
package org.apache.archiva.maven.repository.dependency.tree;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file

2
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/merge/Maven2RepositoryMerger.java → archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/merge/Maven2RepositoryMerger.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.merge;
package org.apache.archiva.maven.repository.merge;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/ArtifactMappingProvider.java → archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/ArtifactMappingProvider.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.metadata.storage;
package org.apache.archiva.maven.repository.metadata.storage;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/ArtifactMetadataVersionComparator.java → archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/ArtifactMetadataVersionComparator.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.metadata.storage;
package org.apache.archiva.maven.repository.metadata.storage;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file

2
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/DefaultArtifactMappingProvider.java → archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/DefaultArtifactMappingProvider.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.metadata.storage;
package org.apache.archiva.maven.repository.metadata.storage;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/DummyLifecycleBindingsInjector.java → archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/DummyLifecycleBindingsInjector.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.metadata.storage;
package org.apache.archiva.maven.repository.metadata.storage;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryPathTranslator.java → archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryPathTranslator.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.metadata.storage;
package org.apache.archiva.maven.repository.metadata.storage;
/*
* Licensed to the Apache Software Foundation (ASF) under one

4
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryStorage.java → archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryStorage.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.metadata.storage;
package org.apache.archiva.maven.repository.metadata.storage;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -55,7 +55,7 @@ import org.apache.archiva.repository.content.ContentItem;
import org.apache.archiva.repository.content.ItemSelector;
import org.apache.archiva.repository.content.LayoutException;
import org.apache.archiva.repository.content.base.ArchivaItemSelector;
import org.apache.archiva.repository.maven.MavenSystemManager;
import org.apache.archiva.maven.repository.MavenSystemManager;
import org.apache.archiva.repository.metadata.RepositoryMetadataException;
import org.apache.archiva.repository.storage.StorageAsset;
import org.apache.commons.lang3.ArrayUtils;

2
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/MavenArtifactFacetFactory.java → archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/MavenArtifactFacetFactory.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.metadata.storage;
package org.apache.archiva.maven.repository.metadata.storage;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/MavenProjectFacet.java → archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/MavenProjectFacet.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.metadata.storage;
package org.apache.archiva.maven.repository.metadata.storage;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/MavenProjectFacetFactory.java → archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/MavenProjectFacetFactory.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.metadata.storage;
package org.apache.archiva.maven.repository.metadata.storage;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/MavenProjectParent.java → archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/MavenProjectParent.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.metadata.storage;
package org.apache.archiva.maven.repository.metadata.storage;
/*
* Licensed to the Apache Software Foundation (ASF) under one

4
archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/RepositoryModelResolver.java → archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/RepositoryModelResolver.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.metadata.storage;
package org.apache.archiva.maven.repository.metadata.storage;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -30,7 +30,7 @@ import org.apache.archiva.proxy.model.NetworkProxy;
import org.apache.archiva.repository.ManagedRepository;
import org.apache.archiva.repository.RemoteRepository;
import org.apache.archiva.repository.RepositoryCredentials;
import org.apache.archiva.repository.maven.MavenSystemManager;
import org.apache.archiva.maven.repository.MavenSystemManager;
import org.apache.archiva.repository.metadata.RepositoryMetadataException;
import org.apache.archiva.repository.storage.StorageAsset;
import org.apache.commons.lang3.StringUtils;

4
archiva-modules/archiva-maven/archiva-maven-repository/src/main/resources/META-INF/spring-context.xml
View File

@ -28,8 +28,8 @@
default-lazy-init="true">
<context:annotation-config/>
<context:component-scan base-package="org.apache.archiva.repository.maven.dependency.tree,org.apache.archiva.repository.maven.metadata.storage,
org.apache.archiva.repository.maven.content,org.apache.maven.index"/>
<context:component-scan base-package="org.apache.archiva.maven.repository,org.apache.archiva.maven.repository.dependency.tree,org.apache.archiva.maven.repository.metadata.storage,
org.apache.archiva.maven.repository.content,org.apache.maven.index"/>

2
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/AbstractRepositoryLayerTestCase.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/AbstractRepositoryLayerTestCase.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven;
package org.apache.archiva.maven.repository;
/*
* Licensed to the Apache Software Foundation (ASF) under one

5
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/MavenRepositoryProviderTest.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/MavenRepositoryProviderTest.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven;
package org.apache.archiva.maven.repository;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -10,7 +10,6 @@ package org.apache.archiva.repository.maven;
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@ -38,7 +37,7 @@ import org.apache.archiva.repository.features.ArtifactCleanupFeature;
import org.apache.archiva.repository.features.IndexCreationFeature;
import org.apache.archiva.repository.features.RemoteIndexFeature;
import org.apache.archiva.repository.features.StagingRepositoryFeature;
import org.apache.archiva.repository.maven.metadata.storage.mock.MockConfiguration;
import org.apache.archiva.maven.repository.metadata.storage.mock.MockConfiguration;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

2
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/RepositoryURLTest.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/RepositoryURLTest.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven;
package org.apache.archiva.maven.repository;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/AbstractBaseRepositoryContentLayoutTest.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/AbstractBaseRepositoryContentLayoutTest.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.content;
package org.apache.archiva.maven.repository.content;
/*
* Licensed to the Apache Software Foundation (ASF) under one

4
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/AbstractRepositoryContentTest.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/AbstractRepositoryContentTest.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.content;
package org.apache.archiva.maven.repository.content;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -18,6 +18,7 @@ package org.apache.archiva.repository.maven.content;
* under the License.
*/
import org.apache.archiva.maven.repository.AbstractRepositoryLayerTestCase;
import org.apache.archiva.repository.ManagedRepositoryContent;
import org.apache.archiva.repository.RepositoryContent;
import org.apache.archiva.repository.content.Artifact;
@ -28,7 +29,6 @@ import org.apache.archiva.repository.content.Namespace;
import org.apache.archiva.repository.content.Project;
import org.apache.archiva.repository.content.Version;
import org.apache.archiva.repository.content.base.ArchivaItemSelector;
import org.apache.archiva.repository.maven.AbstractRepositoryLayerTestCase;
import org.apache.commons.lang3.StringUtils;
import org.junit.Test;

6
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/ArtifactExtensionMappingTest.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/ArtifactExtensionMappingTest.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.content;
package org.apache.archiva.maven.repository.content;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -19,10 +19,10 @@ package org.apache.archiva.repository.maven.content;
*/
import org.apache.archiva.maven.metadata.model.MavenArtifactFacet;
import org.apache.archiva.maven.repository.metadata.storage.ArtifactMappingProvider;
import org.apache.archiva.maven.repository.metadata.storage.Maven2RepositoryPathTranslator;
import org.apache.archiva.metadata.model.ArtifactMetadata;
import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator;
import org.apache.archiva.repository.maven.metadata.storage.ArtifactMappingProvider;
import org.apache.archiva.repository.maven.metadata.storage.Maven2RepositoryPathTranslator;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.junit.Test;
import org.junit.runner.RunWith;

2
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/FilenameParserTest.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/FilenameParserTest.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.content;
package org.apache.archiva.maven.repository.content;
/*
* Licensed to the Apache Software Foundation (ASF) under one

6
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/ManagedDefaultRepositoryContentTest.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/ManagedDefaultRepositoryContentTest.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.content;
package org.apache.archiva.maven.repository.content;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -24,6 +24,8 @@ import org.apache.archiva.configuration.ArchivaConfiguration;
import org.apache.archiva.configuration.FileType;
import org.apache.archiva.configuration.FileTypes;
import org.apache.archiva.maven.metadata.MavenMetadataReader;
import org.apache.archiva.maven.repository.MavenManagedRepository;
import org.apache.archiva.maven.repository.metadata.storage.ArtifactMappingProvider;
import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator;
import org.apache.archiva.repository.EditableManagedRepository;
import org.apache.archiva.repository.ManagedRepository;
@ -42,8 +44,6 @@ import org.apache.archiva.repository.content.Project;
import org.apache.archiva.repository.content.Version;
import org.apache.archiva.repository.content.base.ArchivaContentItem;
import org.apache.archiva.repository.content.base.ArchivaItemSelector;
import org.apache.archiva.repository.maven.MavenManagedRepository;
import org.apache.archiva.repository.maven.metadata.storage.ArtifactMappingProvider;
import org.apache.archiva.repository.storage.StorageAsset;
import org.apache.commons.io.FileUtils;
import org.junit.Before;

2
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/MavenContentHelperTest.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/MavenContentHelperTest.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.content;
package org.apache.archiva.maven.repository.content;
/*
* Licensed to the Apache Software Foundation (ASF) under one

6
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/MavenRepositoryRequestInfoTest.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/MavenRepositoryRequestInfoTest.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.content;
package org.apache.archiva.maven.repository.content;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -23,13 +23,13 @@ import org.apache.archiva.common.utils.FileUtils;
import org.apache.archiva.configuration.ArchivaConfiguration;
import org.apache.archiva.configuration.FileType;
import org.apache.archiva.configuration.FileTypes;
import org.apache.archiva.maven.repository.MavenManagedRepository;
import org.apache.archiva.maven.repository.metadata.storage.ArtifactMappingProvider;
import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator;
import org.apache.archiva.repository.ManagedRepositoryContent;
import org.apache.archiva.repository.RepositoryContentProvider;
import org.apache.archiva.repository.content.ItemSelector;
import org.apache.archiva.repository.content.LayoutException;
import org.apache.archiva.repository.maven.MavenManagedRepository;
import org.apache.archiva.repository.maven.metadata.storage.ArtifactMappingProvider;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.apache.commons.lang3.StringUtils;
import org.junit.Before;

4
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/RemoteDefaultRepositoryContentTest.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/RemoteDefaultRepositoryContentTest.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.content;
package org.apache.archiva.maven.repository.content;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -18,6 +18,7 @@ package org.apache.archiva.repository.maven.content;
* under the License.
*/
import org.apache.archiva.maven.repository.metadata.storage.ArtifactMappingProvider;
import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator;
import org.apache.archiva.repository.ManagedRepositoryContent;
import org.apache.archiva.repository.RemoteRepository;
@ -25,7 +26,6 @@ import org.apache.archiva.repository.RepositoryContent;
import org.apache.archiva.repository.content.Artifact;
import org.apache.archiva.repository.content.ItemSelector;
import org.apache.archiva.repository.content.LayoutException;
import org.apache.archiva.repository.maven.metadata.storage.ArtifactMappingProvider;
import org.junit.Before;
import javax.inject.Inject;

2
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/dependency/tree/DependencyTreeBuilderTestMaven3.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/dependency/tree/DependencyTreeBuilderTestMaven3.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.dependency.tree;
package org.apache.archiva.maven.repository.dependency.tree;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/merge/Maven2RepositoryMergerTest.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/merge/Maven2RepositoryMergerTest.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.merge;
package org.apache.archiva.maven.repository.merge;
/*
* Licensed to the Apache Software Foundation (ASF) under one

4
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/Maven2RepositoryStorageTest.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/Maven2RepositoryStorageTest.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.metadata;
package org.apache.archiva.maven.repository.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -18,8 +18,8 @@ package org.apache.archiva.repository.maven.metadata;
* under the License.
*/
import org.apache.archiva.maven.repository.MavenManagedRepository;
import org.apache.archiva.metadata.repository.storage.RepositoryStorage;
import org.apache.archiva.repository.maven.MavenManagedRepository;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.junit.Assert;
import org.junit.Test;

8
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/MetadataToolsTest.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/MetadataToolsTest.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.metadata;
package org.apache.archiva.maven.repository.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -20,6 +20,9 @@ package org.apache.archiva.repository.maven.metadata;
import org.apache.archiva.common.utils.VersionComparator;
import org.apache.archiva.configuration.ProxyConnectorConfiguration;
import org.apache.archiva.maven.repository.AbstractRepositoryLayerTestCase;
import org.apache.archiva.maven.repository.MavenManagedRepository;
import org.apache.archiva.maven.repository.metadata.storage.mock.MockConfiguration;
import org.apache.archiva.policies.CachedFailuresPolicy;
import org.apache.archiva.policies.ChecksumPolicy;
import org.apache.archiva.policies.ReleasesPolicy;
@ -30,9 +33,6 @@ import org.apache.archiva.repository.RepositoryContentProvider;
import org.apache.archiva.repository.content.ItemSelector;
import org.apache.archiva.repository.content.LayoutException;
import org.apache.archiva.repository.content.base.ArchivaItemSelector;
import org.apache.archiva.repository.maven.AbstractRepositoryLayerTestCase;
import org.apache.archiva.repository.maven.MavenManagedRepository;
import org.apache.archiva.repository.maven.metadata.storage.mock.MockConfiguration;
import org.apache.archiva.repository.metadata.RepositoryMetadataException;
import org.apache.archiva.repository.metadata.base.MetadataTools;
import org.apache.commons.io.FileUtils;

2
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/RepositoryMetadataReaderTest.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/RepositoryMetadataReaderTest.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.metadata;
package org.apache.archiva.maven.repository.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/RepositoryMetadataWriterTest.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/RepositoryMetadataWriterTest.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.metadata;
package org.apache.archiva.maven.repository.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.metadata.storage;
package org.apache.archiva.maven.repository.metadata.storage;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryMetadataResolverMRM1411Test.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverMRM1411Test.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.metadata.storage;
package org.apache.archiva.maven.repository.metadata.storage;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryMetadataResolverManagedReleaseTest.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverManagedReleaseTest.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.metadata.storage;
package org.apache.archiva.maven.repository.metadata.storage;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryMetadataResolverManagedSnapshotTest.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverManagedSnapshotTest.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.metadata.storage;
package org.apache.archiva.maven.repository.metadata.storage;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryMetadataResolverTest.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverTest.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.metadata.storage;
package org.apache.archiva.maven.repository.metadata.storage;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/MavenRepositoryMetadataReaderTest.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/MavenRepositoryMetadataReaderTest.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.metadata.storage;
package org.apache.archiva.maven.repository.metadata.storage;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/MockWagon.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/MockWagon.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.metadata.storage;
package org.apache.archiva.maven.repository.metadata.storage;
/*
* Licensed to the Apache Software Foundation (ASF) under one

3
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/mock/MockConfiguration.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/mock/MockConfiguration.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.metadata.storage.mock;
package org.apache.archiva.maven.repository.metadata.storage.mock;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -10,7 +10,6 @@ package org.apache.archiva.repository.maven.metadata.storage.mock;
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

2
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/mock/ArchivaIndexManagerMock.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/ArchivaIndexManagerMock.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.mock;
package org.apache.archiva.maven.repository.mock;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/mock/MavenIndexContextMock.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/MavenIndexContextMock.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.mock;
package org.apache.archiva.maven.repository.mock;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/mock/MockRepositoryArchivaTaskScheduler.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/MockRepositoryArchivaTaskScheduler.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.mock;
package org.apache.archiva.maven.repository.mock;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file

2
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/mock/RepositoryRegistryMock.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/RepositoryRegistryMock.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.mock;
package org.apache.archiva.maven.repository.mock;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/mock/TestMetadataResolver.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/TestMetadataResolver.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.mock;
package org.apache.archiva.maven.repository.mock;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/mock/configuration/MockRepoAdmin.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/configuration/MockRepoAdmin.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.mock.configuration;
package org.apache.archiva.maven.repository.mock.configuration;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file

2
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/mock/configuration/StubConfiguration.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/configuration/StubConfiguration.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.mock.configuration;
package org.apache.archiva.maven.repository.mock.configuration;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/mock/configuration/TestConfiguration.java → archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/configuration/TestConfiguration.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.repository.maven.mock.configuration;
package org.apache.archiva.maven.repository.mock.configuration;
import org.apache.archiva.components.registry.Registry;
import org.apache.archiva.components.registry.RegistryException;

2
archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-merge.xml
View File

@ -33,7 +33,7 @@
<alias name="archivaConfiguration#mocked" alias="archivaConfiguration#default" />
<bean name="repositorySessionFactory#mock"
class="org.apache.archiva.repository.maven.merge.Maven2RepositoryMergerTest" factory-method="getRepositorySessionFactory" />
class="org.apache.archiva.maven.repository.merge.Maven2RepositoryMergerTest" factory-method="getRepositorySessionFactory" />
<alias alias="repositorySessionFactory#jcr" name="repositorySessionFactory#mock" />
</beans>

2
archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-metadata-tools-test.xml
View File

@ -24,7 +24,7 @@
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"
default-lazy-init="true">
<bean name="archivaConfiguration#mock" class="org.apache.archiva.repository.maven.metadata.storage.mock.MockConfiguration"/>
<bean name="archivaConfiguration#mock" class="org.apache.archiva.maven.repository.metadata.storage.mock.MockConfiguration"/>
<alias name="archivaConfiguration#mock" alias="archivaConfiguration#default"/>
<bean name="metadataTools#test" class="org.apache.archiva.repository.metadata.base.MetadataTools">
<property name="configuration" ref="archivaConfiguration#mock"/>

2
archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-repo-request-test.xml
View File

@ -27,7 +27,7 @@
http://www.springframework.org/schema/context/spring-context-3.0.xsd">
<context:property-placeholder system-properties-mode="OVERRIDE"/>
<context:component-scan base-package="org.apache.archiva.repository.content.maven2" />
<context:component-scan base-package="org.apache.archiva.maven.repository.content" />
<bean name="archivaConfiguration#repo-request-test" class="org.apache.archiva.configuration.DefaultArchivaConfiguration">
<property name="registry" ref="registry#configured"/>
</bean>

2
archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-repository-conf.xml
View File

@ -27,7 +27,7 @@
http://www.springframework.org/schema/context/spring-context-3.0.xsd">
<context:annotation-config/>
<context:component-scan base-package="org.apache.archiva.repository.maven.metadata.storage.mock,org.apache.archiva.repository.maven.mock,org.apache.archiva.repository.maven"/>
<context:component-scan base-package="org.apache.archiva.maven.repository.metadata.storage.mock,org.apache.archiva.maven.repository.mock,org.apache.archiva.maven.repository"/>
<alias name="archivaTaskScheduler#repositoryMock" alias="archivaTaskScheduler#repository" />

4
archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-storage.xml
View File

@ -28,10 +28,10 @@
default-lazy-init="true">
<context:annotation-config/>
<context:component-scan base-package="org.apache.archiva.policies.urlcache,org.apache.archiva.proxy,org.apache.archiva.proxy.maven,org.apache.archiva.indexer,org.apache.maven.index,org.apache.archiva.repository,org.apache.archiva.configuration,org.apache.archiva.metadata.repository,org.apache.archiva.repository.index.mock"/>
<context:component-scan base-package="org.apache.archiva.policies.urlcache,org.apache.archiva.proxy,org.apache.archiva.maven.proxy,org.apache.archiva.indexer,org.apache.maven.index,org.apache.archiva.repository,org.apache.archiva.configuration,org.apache.archiva.metadata.repository,org.apache.archiva.maven.repository.mock"/>
<bean name="archivaConfiguration#test" class="org.apache.archiva.repository.maven.metadata.storage.mock.MockConfiguration"/>
<bean name="archivaConfiguration#test" class="org.apache.archiva.maven.repository.metadata.storage.mock.MockConfiguration"/>
<alias name="archivaConfiguration#test" alias="archivaConfiguration#default"/>
<alias name="archivaConfiguration#test" alias="archivaConfiguration"/>

2
archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context.xml
View File

@ -28,7 +28,7 @@
default-lazy-init="true">
<context:annotation-config/>
<context:component-scan base-package="org.apache.archiva.repository,org.apache.archiva.configuration,org.apache.archiva.metadata.repository,org.apache.archiva.repository.maven.mock"/>
<context:component-scan base-package="org.apache.archiva.repository,org.apache.archiva.configuration,org.apache.archiva.metadata.repository,org.apache.archiva.maven.repository.mock"/>
<bean name="archivaConfiguration#test" class="org.apache.archiva.configuration.DefaultArchivaConfiguration">

6
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
View File

@ -23,7 +23,7 @@ import org.apache.archiva.common.utils.VersionComparator;
import org.apache.archiva.common.utils.VersionUtil;
import org.apache.archiva.repository.ManagedRepositoryContent;
import org.apache.archiva.repository.content.base.ArchivaItemSelector;
import org.apache.archiva.repository.maven.dependency.tree.DependencyTreeBuilder;
import org.apache.archiva.maven.repository.dependency.tree.DependencyTreeBuilder;
import org.apache.archiva.maven.model.Artifact;
import org.apache.archiva.maven.model.TreeEntry;
import org.apache.archiva.metadata.generic.GenericMetadataFacet;
@ -32,8 +32,8 @@ import org.apache.archiva.metadata.model.MetadataFacet;
import org.apache.archiva.metadata.model.ProjectVersionMetadata;
import org.apache.archiva.metadata.model.ProjectVersionReference;
import org.apache.archiva.metadata.repository.*;
import org.apache.archiva.repository.maven.metadata.storage.ArtifactMetadataVersionComparator;
import org.apache.archiva.repository.maven.metadata.storage.MavenProjectFacet;
import org.apache.archiva.maven.repository.metadata.storage.ArtifactMetadataVersionComparator;
import org.apache.archiva.maven.repository.metadata.storage.MavenProjectFacet;
import org.apache.archiva.model.ArchivaRepositoryMetadata;
import org.apache.archiva.proxy.ProxyRegistry;
import org.apache.archiva.proxy.model.RepositoryProxyHandler;

8
archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java
View File

@ -46,10 +46,10 @@ import org.apache.archiva.repository.RepositoryException;
import org.apache.archiva.repository.RepositoryRegistry;
import org.apache.archiva.repository.RepositoryType;
import org.apache.archiva.repository.base.RepositoryHandlerDependencies;
import org.apache.archiva.repository.maven.content.ManagedDefaultRepositoryContent;
import org.apache.archiva.repository.maven.content.MavenContentHelper;
import org.apache.archiva.repository.maven.content.MavenRepositoryRequestInfo;
import org.apache.archiva.repository.maven.metadata.storage.ArtifactMappingProvider;
import org.apache.archiva.maven.repository.content.ManagedDefaultRepositoryContent;
import org.apache.archiva.maven.repository.content.MavenContentHelper;
import org.apache.archiva.maven.repository.content.MavenRepositoryRequestInfo;
import org.apache.archiva.maven.repository.metadata.storage.ArtifactMappingProvider;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.apache.commons.lang3.StringUtils;
import org.apache.jackrabbit.webdav.DavException;

2
archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/DavResourceTest.java
View File

@ -26,7 +26,7 @@ import org.apache.archiva.repository.content.LayoutException;
import org.apache.archiva.repository.RepositoryRegistry;
import org.apache.archiva.repository.storage.fs.FilesystemAsset;
import org.apache.archiva.metadata.audit.AuditListener;
import org.apache.archiva.repository.maven.MavenManagedRepository;
import org.apache.archiva.maven.repository.MavenManagedRepository;
import org.apache.archiva.repository.storage.fs.FilesystemStorage;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.apache.archiva.webdav.util.MimeTypes;