Skip to content
Permalink
Browse files
Refactoring packages for maven repository module
  • Loading branch information
effrafax committed Dec 24, 2021
1 parent ea4413d commit 2507f8d057ef785ed7188122d7dc58e6a062b9ed
Showing 77 changed files with 114 additions and 122 deletions.
@@ -25,7 +25,7 @@
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;
@@ -21,14 +21,13 @@
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;
@@ -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
@@ -9,8 +9,7 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -22,6 +21,7 @@
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.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;
@@ -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;
@@ -30,8 +30,7 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -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
@@ -9,8 +9,7 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -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
@@ -9,8 +9,7 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -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
@@ -9,8 +9,7 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -19,7 +18,7 @@
* 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;
@@ -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 @@
*/

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;
@@ -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 @@
* 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 @@

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.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;
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.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;
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.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;
@@ -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
@@ -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
@@ -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
@@ -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