@@ -23,7 +23,7 @@ import org.apache.archiva.metadata.model.ArtifactMetadata; | |||
import org.apache.archiva.metadata.repository.MetadataRepository; | |||
import org.apache.archiva.metadata.repository.RepositorySession; | |||
import org.apache.archiva.metadata.repository.RepositorySessionFactory; | |||
import org.apache.archiva.metadata.repository.storage.maven2.Maven2RepositoryPathTranslator; | |||
import org.apache.archiva.repository.maven.metadata.storage.Maven2RepositoryPathTranslator; | |||
import org.apache.archiva.repository.base.BasicManagedRepository; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
import org.apache.archiva.repository.ReleaseScheme; | |||
@@ -44,7 +44,6 @@ import org.springframework.test.context.ContextConfiguration; | |||
import javax.inject.Inject; | |||
import java.io.IOException; | |||
import java.net.URI; | |||
import java.net.URISyntaxException; | |||
import java.nio.file.Files; | |||
import java.nio.file.Path; |
@@ -46,43 +46,7 @@ import java.util.stream.Stream; | |||
public interface ManagedRepositoryContent extends RepositoryContent | |||
{ | |||
/** | |||
* Returns the version reference for the given coordinates. | |||
* @param groupId the group id | |||
* @param artifactId the artifact id | |||
* @param version the version number | |||
* @return a version reference | |||
*/ | |||
VersionedReference toVersion( String groupId, String artifactId, String version ); | |||
/** | |||
* Returns the version reference that represents the generic version, which means that | |||
* snapshot versions are converted to <VERSION>-SNAPSHOT | |||
* @param artifactReference the artifact reference | |||
* @return the generic version | |||
*/ | |||
VersionedReference toGenericVersion( ArtifactReference artifactReference ); | |||
/** | |||
* Return the version reference that matches exactly the version string of the artifact | |||
* | |||
* @param artifactReference The artifact reference | |||
* @return the version reference | |||
*/ | |||
VersionedReference toVersion( ArtifactReference artifactReference); | |||
/** | |||
* Returns a artifact reference for the given coordinates. | |||
* @param groupId the group id | |||
* @param artifactId the artifact id | |||
* @param version the version | |||
* @param type the type | |||
* @param classifier the classifier | |||
* @return a artifact reference object | |||
*/ | |||
ArtifactReference toArtifact( String groupId, String artifactId, String version, String type, String classifier); | |||
/// ***************** New generation interface ********************** | |||
/** | |||
* Removes the specified content item and all content stored under the given item. | |||
@@ -290,6 +254,54 @@ public interface ManagedRepositoryContent extends RepositoryContent | |||
*/ | |||
void copyArtifact( Path sourceFile, ItemSelector destination ) throws IllegalArgumentException; | |||
/// ***************** End of new generation interface ********************** | |||
/** | |||
* Returns the version reference for the given coordinates. | |||
* @param groupId the group id | |||
* @param artifactId the artifact id | |||
* @param version the version number | |||
* @return a version reference | |||
*/ | |||
VersionedReference toVersion( String groupId, String artifactId, String version ); | |||
/** | |||
* Returns the version reference that represents the generic version, which means that | |||
* snapshot versions are converted to <VERSION>-SNAPSHOT | |||
* @param artifactReference the artifact reference | |||
* @return the generic version | |||
*/ | |||
VersionedReference toGenericVersion( ArtifactReference artifactReference ); | |||
/** | |||
* Return the version reference that matches exactly the version string of the artifact | |||
* | |||
* @param artifactReference The artifact reference | |||
* @return the version reference | |||
*/ | |||
VersionedReference toVersion( ArtifactReference artifactReference); | |||
/** | |||
* Returns a artifact reference for the given coordinates. | |||
* @param groupId the group id | |||
* @param artifactId the artifact id | |||
* @param version the version | |||
* @param type the type | |||
* @param classifier the classifier | |||
* @return a artifact reference object | |||
*/ | |||
ArtifactReference toArtifact( String groupId, String artifactId, String version, String type, String classifier); | |||
/** | |||
* Delete from the managed repository all files / directories associated with the | |||
* provided version reference. |
@@ -61,7 +61,7 @@ public interface RepositoryContent | |||
/** | |||
* Return a item selector that matches the given path. This is kind of reverse method for the {@link #toPath(ItemSelector)} | |||
* method and fills the selector with the known information. It may not make sense for every path, and the following | |||
* must <b>not be true</b>: | |||
* must <b>not always be true</b>: | |||
* <pre> | |||
* selector.equals(r.toItemSelector(r.toPath(selector))) | |||
* </pre> |
@@ -26,8 +26,8 @@ import org.apache.archiva.repository.base.ArchivaRepositoryRegistry; | |||
import org.apache.archiva.repository.RepositoryType; | |||
import org.apache.archiva.repository.features.IndexCreationFeature; | |||
import org.apache.archiva.repository.features.RemoteIndexFeature; | |||
import org.apache.archiva.repository.maven2.MavenManagedRepository; | |||
import org.apache.archiva.repository.maven2.MavenRemoteRepository; | |||
import org.apache.archiva.repository.maven.MavenManagedRepository; | |||
import org.apache.archiva.repository.maven.MavenRemoteRepository; | |||
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; | |||
import org.apache.maven.index.MAVEN; | |||
import org.apache.maven.index.QueryCreator; | |||
@@ -45,17 +45,12 @@ import javax.inject.Inject; | |||
import java.io.IOException; | |||
import java.net.URI; | |||
import java.net.URISyntaxException; | |||
import java.nio.file.DirectoryStream; | |||
import java.nio.file.Files; | |||
import java.nio.file.Path; | |||
import java.nio.file.Paths; | |||
import java.nio.file.attribute.*; | |||
import java.util.ArrayList; | |||
import java.util.Collections; | |||
import java.util.EnumSet; | |||
import java.util.List; | |||
import java.util.stream.Collectors; | |||
import java.util.stream.Stream; | |||
import static org.junit.Assert.*; | |||
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository.maven2; | |||
package org.apache.archiva.repository.maven; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -25,7 +25,7 @@ import org.apache.archiva.indexer.ArchivaIndexingContext; | |||
import org.apache.archiva.repository.*; | |||
import org.apache.archiva.repository.base.AbstractManagedRepository; | |||
import org.apache.archiva.repository.storage.fs.FilesystemStorage; | |||
import org.apache.archiva.repository.content.maven2.MavenRepositoryRequestInfo; | |||
import org.apache.archiva.repository.maven.content.MavenRepositoryRequestInfo; | |||
import org.apache.archiva.repository.features.ArtifactCleanupFeature; | |||
import org.apache.archiva.repository.features.IndexCreationFeature; | |||
import org.apache.archiva.repository.features.RepositoryFeature; |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository.maven2; | |||
package org.apache.archiva.repository.maven; | |||
import org.apache.archiva.common.filelock.DefaultFileLockManager; | |||
import org.apache.archiva.common.filelock.FileLockManager; |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository.maven2; | |||
package org.apache.archiva.repository.maven; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository.maven2; | |||
package org.apache.archiva.repository.maven; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository.maven2; | |||
package org.apache.archiva.repository.maven; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -19,7 +19,7 @@ package org.apache.archiva.repository.maven2; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.dependency.tree.maven2.ArchivaRepositoryConnectorFactory; | |||
import org.apache.archiva.repository.maven.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.content.maven2; | |||
package org.apache.archiva.repository.maven.content; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.repository.content.maven2; | |||
* "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 | |||
@@ -21,8 +20,8 @@ package org.apache.archiva.repository.content.maven2; | |||
import org.apache.archiva.common.utils.VersionUtil; | |||
import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; | |||
import org.apache.archiva.metadata.repository.storage.maven2.ArtifactMappingProvider; | |||
import org.apache.archiva.metadata.repository.storage.maven2.Maven2RepositoryPathTranslator; | |||
import org.apache.archiva.repository.maven.metadata.storage.ArtifactMappingProvider; | |||
import org.apache.archiva.repository.maven.metadata.storage.Maven2RepositoryPathTranslator; | |||
import org.apache.archiva.model.ArchivaArtifact; | |||
import org.apache.archiva.model.ArtifactReference; | |||
import org.apache.archiva.model.ProjectReference; | |||
@@ -31,7 +30,6 @@ import org.apache.archiva.repository.LayoutException; | |||
import org.apache.archiva.repository.RepositoryContent; | |||
import org.apache.archiva.repository.content.ItemSelector; | |||
import org.apache.archiva.repository.content.PathParser; | |||
import org.apache.archiva.repository.content.Version; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository.content.maven2; | |||
package org.apache.archiva.repository.maven.content; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.repository.content.maven2; | |||
* "License"); you may not use this file except in compliance | |||
* with the License. You may obtain a copy of the License at | |||
* | |||
* http://www.apache.org/licenses/LICENSE-2.0 | |||
* | |||
* http://www.apache.org/licenses/LICENSE-2.0 | |||
* Unless required by applicable law or agreed to in writing, | |||
* software distributed under the License is distributed on an | |||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | |||
@@ -19,8 +18,8 @@ package org.apache.archiva.repository.content.maven2; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.metadata.repository.storage.maven2.ArtifactMappingProvider; | |||
import org.apache.archiva.metadata.repository.storage.maven2.DefaultArtifactMappingProvider; | |||
import org.apache.archiva.repository.maven.metadata.storage.ArtifactMappingProvider; | |||
import org.apache.archiva.repository.maven.metadata.storage.DefaultArtifactMappingProvider; | |||
/** | |||
* ArtifactExtensionMapping |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository.content.maven2; | |||
package org.apache.archiva.repository.maven.content; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.repository.content.maven2; | |||
* "License"); you may not use this file except in compliance | |||
* with the License. You may obtain a copy of the License at | |||
* | |||
* http://www.apache.org/licenses/LICENSE-2.0 | |||
* | |||
* http://www.apache.org/licenses/LICENSE-2.0 | |||
* Unless required by applicable law or agreed to in writing, | |||
* software distributed under the License is distributed on an | |||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | |||
@@ -20,12 +19,11 @@ package org.apache.archiva.repository.content.maven2; | |||
*/ | |||
import org.apache.archiva.metadata.model.ArtifactMetadata; | |||
import org.apache.archiva.metadata.model.FacetedMetadata; | |||
import org.apache.archiva.metadata.model.maven2.MavenArtifactFacet; | |||
import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; | |||
import org.apache.archiva.metadata.repository.storage.maven2.ArtifactMappingProvider; | |||
import org.apache.archiva.metadata.repository.storage.maven2.DefaultArtifactMappingProvider; | |||
import org.apache.archiva.metadata.repository.storage.maven2.Maven2RepositoryPathTranslator; | |||
import org.apache.archiva.repository.maven.metadata.storage.ArtifactMappingProvider; | |||
import org.apache.archiva.repository.maven.metadata.storage.DefaultArtifactMappingProvider; | |||
import org.apache.archiva.repository.maven.metadata.storage.Maven2RepositoryPathTranslator; | |||
import org.apache.archiva.model.ArtifactReference; | |||
import org.apache.archiva.repository.LayoutException; | |||
import org.apache.archiva.repository.content.ItemSelector; |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository.content.maven2; | |||
package org.apache.archiva.repository.maven.content; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.repository.content.maven2; | |||
* "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.content.maven2; | |||
package org.apache.archiva.repository.maven.content; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.repository.content.maven2; | |||
* "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 | |||
@@ -25,8 +24,8 @@ import org.apache.archiva.common.utils.VersionUtil; | |||
import org.apache.archiva.configuration.FileTypes; | |||
import org.apache.archiva.maven2.metadata.MavenMetadataReader; | |||
import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; | |||
import org.apache.archiva.metadata.repository.storage.maven2.ArtifactMappingProvider; | |||
import org.apache.archiva.metadata.repository.storage.maven2.DefaultArtifactMappingProvider; | |||
import org.apache.archiva.repository.maven.metadata.storage.ArtifactMappingProvider; | |||
import org.apache.archiva.repository.maven.metadata.storage.DefaultArtifactMappingProvider; | |||
import org.apache.archiva.model.ArchivaArtifact; | |||
import org.apache.archiva.model.ArtifactReference; | |||
import org.apache.archiva.model.ProjectReference; |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository.content.maven2; | |||
package org.apache.archiva.repository.maven.content; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -10,7 +10,6 @@ package org.apache.archiva.repository.content.maven2; | |||
* 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 |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository.content.maven2; | |||
package org.apache.archiva.repository.maven.content; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.repository.content.maven2; | |||
* "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 | |||
@@ -21,7 +20,7 @@ package org.apache.archiva.repository.content.maven2; | |||
import org.apache.archiva.common.filelock.FileLockManager; | |||
import org.apache.archiva.configuration.FileTypes; | |||
import org.apache.archiva.metadata.repository.storage.maven2.ArtifactMappingProvider; | |||
import org.apache.archiva.repository.maven.metadata.storage.ArtifactMappingProvider; | |||
import org.apache.archiva.repository.ManagedRepository; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
import org.apache.archiva.repository.RemoteRepository; |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository.content.maven2; | |||
package org.apache.archiva.repository.maven.content; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.repository.content.maven2; | |||
* "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 | |||
@@ -23,6 +22,7 @@ import org.apache.archiva.model.ArtifactReference; | |||
import org.apache.archiva.repository.*; | |||
import org.apache.archiva.repository.content.PathParser; | |||
import org.apache.archiva.repository.features.RepositoryFeature; | |||
import org.apache.archiva.repository.maven.content.DefaultPathParser; | |||
import org.apache.archiva.repository.metadata.base.MetadataTools; | |||
import org.apache.commons.lang3.StringUtils; | |||
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository.content.maven2; | |||
package org.apache.archiva.repository.maven.content; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.repository.content.maven2; | |||
* "License"); you may not use this file except in compliance | |||
* with the License. You may obtain a copy of the License at | |||
* | |||
* http://www.apache.org/licenses/LICENSE-2.0 | |||
* | |||
* http://www.apache.org/licenses/LICENSE-2.0 | |||
* Unless required by applicable law or agreed to in writing, | |||
* software distributed under the License is distributed on an | |||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | |||
@@ -19,7 +18,7 @@ package org.apache.archiva.repository.content.maven2; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.metadata.repository.storage.maven2.ArtifactMappingProvider; | |||
import org.apache.archiva.repository.maven.metadata.storage.ArtifactMappingProvider; | |||
import org.apache.archiva.model.ArtifactReference; | |||
import org.apache.archiva.model.RepositoryURL; | |||
import org.apache.archiva.repository.LayoutException; |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.dependency.tree.maven2; | |||
package org.apache.archiva.repository.maven.dependency.tree; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
* or more contributor license agreements. See the NOTICE file | |||
@@ -8,8 +8,7 @@ package org.apache.archiva.dependency.tree.maven2; | |||
* "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.dependency.tree.maven2; | |||
package org.apache.archiva.repository.maven.dependency.tree; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
* or more contributor license agreements. See the NOTICE file | |||
@@ -8,8 +8,7 @@ package org.apache.archiva.dependency.tree.maven2; | |||
* "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.dependency.tree.maven2; | |||
package org.apache.archiva.repository.maven.dependency.tree; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
* or more contributor license agreements. See the NOTICE file | |||
@@ -8,8 +8,7 @@ package org.apache.archiva.dependency.tree.maven2; | |||
* "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.dependency.tree.maven2; | |||
package org.apache.archiva.repository.maven.dependency.tree; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
* or more contributor license agreements. See the NOTICE file | |||
@@ -8,8 +8,7 @@ package org.apache.archiva.dependency.tree.maven2; | |||
* "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 | |||
@@ -34,7 +33,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.maven2.MavenSystemManager; | |||
import org.apache.archiva.repository.maven.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.dependency.tree.maven2; | |||
package org.apache.archiva.repository.maven.dependency.tree; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
* or more contributor license agreements. See the NOTICE file | |||
@@ -8,8 +8,7 @@ package org.apache.archiva.dependency.tree.maven2; | |||
* "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.stagerepository.merge; | |||
package org.apache.archiva.repository.maven.merge; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.stagerepository.merge; | |||
* "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 | |||
@@ -41,6 +40,8 @@ import org.apache.archiva.repository.metadata.base.RepositoryMetadataWriter; | |||
import org.apache.archiva.repository.storage.fs.FilesystemAsset; | |||
import org.apache.archiva.repository.storage.fs.FilesystemStorage; | |||
import org.apache.archiva.repository.storage.StorageAsset; | |||
import org.apache.archiva.stagerepository.merge.RepositoryMerger; | |||
import org.apache.archiva.stagerepository.merge.RepositoryMergerException; | |||
import org.apache.commons.io.FileUtils; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.metadata.repository.storage.maven2; | |||
package org.apache.archiva.repository.maven.metadata.storage; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.metadata.repository.storage.maven2; | |||
* "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.metadata.repository.storage.maven2; | |||
package org.apache.archiva.repository.maven.metadata.storage; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
* or more contributor license agreements. See the NOTICE file | |||
@@ -8,8 +8,7 @@ package org.apache.archiva.metadata.repository.storage.maven2; | |||
* "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.metadata.repository.storage.maven2; | |||
package org.apache.archiva.repository.maven.metadata.storage; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.metadata.repository.storage.maven2; | |||
* "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.metadata.repository.storage.maven2; | |||
package org.apache.archiva.repository.maven.metadata.storage; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.metadata.repository.storage.maven2; | |||
* "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.metadata.repository.storage.maven2; | |||
package org.apache.archiva.repository.maven.metadata.storage; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.metadata.repository.storage.maven2; | |||
* "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 | |||
@@ -31,7 +30,6 @@ import org.springframework.stereotype.Service; | |||
import javax.annotation.PostConstruct; | |||
import javax.inject.Inject; | |||
import java.nio.file.Path; | |||
import java.util.List; | |||
import java.util.regex.Matcher; | |||
import java.util.regex.Pattern; |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.metadata.repository.storage.maven2; | |||
package org.apache.archiva.repository.maven.metadata.storage; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.metadata.repository.storage.maven2; | |||
* "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 | |||
@@ -41,10 +40,9 @@ import org.apache.archiva.proxy.model.ProxyConnector; | |||
import org.apache.archiva.proxy.model.RepositoryProxyHandler; | |||
import org.apache.archiva.repository.*; | |||
import org.apache.archiva.repository.content.PathParser; | |||
import org.apache.archiva.repository.maven2.MavenSystemManager; | |||
import org.apache.archiva.repository.maven.MavenSystemManager; | |||
import org.apache.archiva.repository.metadata.RepositoryMetadataException; | |||
import org.apache.archiva.repository.storage.StorageAsset; | |||
import org.apache.archiva.xml.XMLException; | |||
import org.apache.commons.lang3.ArrayUtils; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.apache.maven.model.*; |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.metadata.repository.storage.maven2; | |||
package org.apache.archiva.repository.maven.metadata.storage; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.metadata.repository.storage.maven2; | |||
* "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.metadata.repository.storage.maven2; | |||
package org.apache.archiva.repository.maven.metadata.storage; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.metadata.repository.storage.maven2; | |||
* "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.metadata.repository.storage.maven2; | |||
package org.apache.archiva.repository.maven.metadata.storage; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.metadata.repository.storage.maven2; | |||
* "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,6 @@ package org.apache.archiva.metadata.repository.storage.maven2; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.metadata.model.MetadataFacetFactory; | |||
import org.apache.archiva.metadata.model.facets.AbstractMetadataFacetFactory; | |||
import org.springframework.stereotype.Service; | |||
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.metadata.repository.storage.maven2; | |||
package org.apache.archiva.repository.maven.metadata.storage; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.metadata.repository.storage.maven2; | |||
* "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.metadata.repository.storage.maven2; | |||
package org.apache.archiva.repository.maven.metadata.storage; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.metadata.repository.storage.maven2; | |||
* "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 | |||
@@ -31,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.maven2.MavenSystemManager; | |||
import org.apache.archiva.repository.maven.MavenSystemManager; | |||
import org.apache.archiva.repository.metadata.RepositoryMetadataException; | |||
import org.apache.archiva.repository.storage.StorageAsset; | |||
import org.apache.commons.lang3.StringUtils; |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository; | |||
package org.apache.archiva.repository.maven; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.repository; | |||
* "License"); you may not use this file except in compliance | |||
* with the License. You may obtain a copy of the License at | |||
* | |||
* http://www.apache.org/licenses/LICENSE-2.0 | |||
* | |||
* http://www.apache.org/licenses/LICENSE-2.0 | |||
* Unless required by applicable law or agreed to in writing, | |||
* software distributed under the License is distributed on an | |||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | |||
@@ -19,8 +18,11 @@ package org.apache.archiva.repository; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.repository.maven2.MavenManagedRepository; | |||
import org.apache.archiva.repository.maven2.MavenRemoteRepository; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
import org.apache.archiva.repository.RemoteRepositoryContent; | |||
import org.apache.archiva.repository.RepositoryContentProvider; | |||
import org.apache.archiva.repository.maven.MavenManagedRepository; | |||
import org.apache.archiva.repository.maven.MavenRemoteRepository; | |||
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; | |||
import org.junit.Rule; | |||
import org.junit.rules.TestName; |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository.maven2; | |||
package org.apache.archiva.repository.maven; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -24,7 +24,7 @@ import org.apache.archiva.configuration.ArchivaRuntimeConfiguration; | |||
import org.apache.archiva.configuration.ManagedRepositoryConfiguration; | |||
import org.apache.archiva.configuration.RemoteRepositoryConfiguration; | |||
import org.apache.archiva.configuration.RepositoryGroupConfiguration; | |||
import org.apache.archiva.metadata.repository.storage.maven2.conf.MockConfiguration; | |||
import org.apache.archiva.repository.maven.metadata.storage.mock.MockConfiguration; | |||
import org.apache.archiva.repository.*; | |||
import org.apache.archiva.repository.features.ArtifactCleanupFeature; | |||
import org.apache.archiva.repository.features.IndexCreationFeature; |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository; | |||
package org.apache.archiva.repository.maven; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.repository; | |||
* "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.metadata.repository.storage.maven2; | |||
package org.apache.archiva.repository.maven.content; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.metadata.repository.storage.maven2; | |||
* "License"); you may not use this file except in compliance | |||
* with the License. You may obtain a copy of the License at | |||
* | |||
* http://www.apache.org/licenses/LICENSE-2.0 | |||
* | |||
* http://www.apache.org/licenses/LICENSE-2.0 | |||
* Unless required by applicable law or agreed to in writing, | |||
* software distributed under the License is distributed on an | |||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | |||
@@ -20,7 +19,7 @@ package org.apache.archiva.metadata.repository.storage.maven2; | |||
*/ | |||
import org.apache.archiva.model.ArtifactReference; | |||
import org.apache.archiva.repository.AbstractRepositoryLayerTestCase; | |||
import org.apache.archiva.repository.maven.AbstractRepositoryLayerTestCase; | |||
import org.apache.archiva.repository.LayoutException; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
import org.apache.archiva.repository.content.Artifact; |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository.content.maven2; | |||
package org.apache.archiva.repository.maven.content; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.repository.content.maven2; | |||
* "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,8 +21,8 @@ package org.apache.archiva.repository.content.maven2; | |||
import org.apache.archiva.metadata.model.ArtifactMetadata; | |||
import org.apache.archiva.metadata.model.maven2.MavenArtifactFacet; | |||
import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; | |||
import org.apache.archiva.metadata.repository.storage.maven2.ArtifactMappingProvider; | |||
import org.apache.archiva.metadata.repository.storage.maven2.Maven2RepositoryPathTranslator; | |||
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; |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository.content.maven2; | |||
package org.apache.archiva.repository.maven.content; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.repository.content.maven2; | |||
* "License"); you may not use this file except in compliance | |||
* with the License. You may obtain a copy of the License at | |||
* | |||
* http://www.apache.org/licenses/LICENSE-2.0 | |||
* | |||
* http://www.apache.org/licenses/LICENSE-2.0 | |||
* Unless required by applicable law or agreed to in writing, | |||
* software distributed under the License is distributed on an | |||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | |||
@@ -22,6 +21,7 @@ package org.apache.archiva.repository.content.maven2; | |||
import org.apache.archiva.model.ArtifactReference; | |||
import org.apache.archiva.repository.LayoutException; | |||
import org.apache.archiva.repository.content.PathParser; | |||
import org.apache.archiva.repository.maven.content.DefaultPathParser; | |||
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.junit.Test; |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository.content.maven2; | |||
package org.apache.archiva.repository.maven.content; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.repository.content.maven2; | |||
* "License"); you may not use this file except in compliance | |||
* with the License. You may obtain a copy of the License at | |||
* | |||
* http://www.apache.org/licenses/LICENSE-2.0 | |||
* | |||
* http://www.apache.org/licenses/LICENSE-2.0 | |||
* Unless required by applicable law or agreed to in writing, | |||
* software distributed under the License is distributed on an | |||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | |||
@@ -20,6 +19,7 @@ package org.apache.archiva.repository.content.maven2; | |||
*/ | |||
import junit.framework.TestCase; | |||
import org.apache.archiva.repository.maven.content.FilenameParser; | |||
import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner; | |||
import org.junit.Test; | |||
import org.junit.runner.RunWith; |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.metadata.repository.storage.maven2; | |||
package org.apache.archiva.repository.maven.content; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.metadata.repository.storage.maven2; | |||
* "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 | |||
@@ -31,9 +30,8 @@ import org.apache.archiva.repository.EditableManagedRepository; | |||
import org.apache.archiva.repository.LayoutException; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
import org.apache.archiva.repository.content.ItemSelector; | |||
import org.apache.archiva.repository.content.maven2.ManagedDefaultRepositoryContent; | |||
import org.apache.archiva.repository.content.maven2.MavenContentHelper; | |||
import org.apache.archiva.repository.maven2.MavenManagedRepository; | |||
import org.apache.archiva.repository.maven.MavenManagedRepository; | |||
import org.apache.archiva.repository.maven.metadata.storage.ArtifactMappingProvider; | |||
import org.apache.commons.io.FileUtils; | |||
import org.junit.Before; | |||
import org.junit.Test; |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository.content.maven2; | |||
package org.apache.archiva.repository.maven.content; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.repository.content.maven2; | |||
* "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 | |||
@@ -24,12 +23,12 @@ 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.metadata.repository.storage.maven2.ArtifactMappingProvider; | |||
import org.apache.archiva.repository.maven.metadata.storage.ArtifactMappingProvider; | |||
import org.apache.archiva.model.ArtifactReference; | |||
import org.apache.archiva.repository.LayoutException; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
import org.apache.archiva.repository.RepositoryContentProvider; | |||
import org.apache.archiva.repository.maven2.MavenManagedRepository; | |||
import org.apache.archiva.repository.maven.MavenManagedRepository; | |||
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.junit.Before; |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.metadata.repository.storage.maven2; | |||
package org.apache.archiva.repository.maven.content; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.metadata.repository.storage.maven2; | |||
* "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 | |||
@@ -25,7 +24,9 @@ import org.apache.archiva.repository.ManagedRepositoryContent; | |||
import org.apache.archiva.repository.RemoteRepository; | |||
import org.apache.archiva.repository.RemoteRepositoryContent; | |||
import org.apache.archiva.repository.content.ItemSelector; | |||
import org.apache.archiva.repository.content.maven2.RemoteDefaultRepositoryContent; | |||
import org.apache.archiva.repository.maven.content.AbstractDefaultRepositoryContentTestCase; | |||
import org.apache.archiva.repository.maven.content.RemoteDefaultRepositoryContent; | |||
import org.apache.archiva.repository.maven.metadata.storage.ArtifactMappingProvider; | |||
import org.junit.Before; | |||
import javax.inject.Inject; |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.dependency.tree.maven2; | |||
package org.apache.archiva.repository.maven.dependency.tree; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.dependency.tree.maven2; | |||
* "License"); you may not use this file except in compliance | |||
* with the License. You may obtain a copy of the License at | |||
* | |||
* http://www.apache.org/licenses/LICENSE-2.0 | |||
* | |||
* http://www.apache.org/licenses/LICENSE-2.0 | |||
* Unless required by applicable law or agreed to in writing, | |||
* software distributed under the License is distributed on an | |||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | |||
@@ -27,6 +26,7 @@ import org.apache.archiva.configuration.ManagedRepositoryConfiguration; | |||
import org.apache.archiva.maven2.model.Artifact; | |||
import org.apache.archiva.maven2.model.TreeEntry; | |||
import org.apache.archiva.repository.RepositoryRegistry; | |||
import org.apache.archiva.repository.maven.dependency.tree.Maven3DependencyTreeBuilder; | |||
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; | |||
import org.junit.Before; | |||
import org.junit.Test; |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.stagerepository.merge; | |||
package org.apache.archiva.repository.maven.merge; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.stagerepository.merge; | |||
* "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 | |||
@@ -29,10 +28,9 @@ import org.apache.archiva.metadata.repository.MetadataRepository; | |||
import org.apache.archiva.metadata.repository.MetadataRepositoryException; | |||
import org.apache.archiva.metadata.repository.RepositorySession; | |||
import org.apache.archiva.metadata.repository.RepositorySessionFactory; | |||
import org.apache.archiva.repository.Repository; | |||
import org.apache.archiva.repository.maven.merge.Maven2RepositoryMerger; | |||
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; | |||
import org.junit.Before; | |||
import org.junit.BeforeClass; | |||
import org.junit.Test; | |||
import org.junit.runner.RunWith; | |||
import org.mockito.MockitoAnnotations; |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository.metadata; | |||
package org.apache.archiva.repository.maven.metadata; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.repository.metadata; | |||
* "License"); you may not use this file except in compliance | |||
* with the License. You may obtain a copy of the License at | |||
* | |||
* http://www.apache.org/licenses/LICENSE-2.0 | |||
* | |||
* http://www.apache.org/licenses/LICENSE-2.0 | |||
* Unless required by applicable law or agreed to in writing, | |||
* software distributed under the License is distributed on an | |||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | |||
@@ -20,7 +19,7 @@ package org.apache.archiva.repository.metadata; | |||
*/ | |||
import org.apache.archiva.metadata.repository.storage.RepositoryStorage; | |||
import org.apache.archiva.repository.maven2.MavenManagedRepository; | |||
import org.apache.archiva.repository.maven.MavenManagedRepository; | |||
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; | |||
import org.junit.Assert; | |||
import org.junit.Test; |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository.metadata; | |||
package org.apache.archiva.repository.maven.metadata; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.repository.metadata; | |||
* "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 | |||
@@ -21,20 +20,21 @@ package org.apache.archiva.repository.metadata; | |||
import org.apache.archiva.common.utils.VersionComparator; | |||
import org.apache.archiva.configuration.ProxyConnectorConfiguration; | |||
import org.apache.archiva.metadata.repository.storage.maven2.conf.MockConfiguration; | |||
import org.apache.archiva.repository.maven.metadata.storage.mock.MockConfiguration; | |||
import org.apache.archiva.model.ProjectReference; | |||
import org.apache.archiva.model.VersionedReference; | |||
import org.apache.archiva.policies.CachedFailuresPolicy; | |||
import org.apache.archiva.policies.ChecksumPolicy; | |||
import org.apache.archiva.policies.ReleasesPolicy; | |||
import org.apache.archiva.policies.SnapshotsPolicy; | |||
import org.apache.archiva.repository.AbstractRepositoryLayerTestCase; | |||
import org.apache.archiva.repository.maven.AbstractRepositoryLayerTestCase; | |||
import org.apache.archiva.repository.LayoutException; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
import org.apache.archiva.repository.RemoteRepositoryContent; | |||
import org.apache.archiva.repository.RepositoryContentProvider; | |||
import org.apache.archiva.repository.metadata.RepositoryMetadataException; | |||
import org.apache.archiva.repository.metadata.base.MetadataTools; | |||
import org.apache.archiva.repository.maven2.MavenManagedRepository; | |||
import org.apache.archiva.repository.maven.MavenManagedRepository; | |||
import org.apache.commons.io.FileUtils; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.junit.Test; |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository.metadata; | |||
package org.apache.archiva.repository.maven.metadata; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.repository.metadata; | |||
* "License"); you may not use this file except in compliance | |||
* with the License. You may obtain a copy of the License at | |||
* | |||
* http://www.apache.org/licenses/LICENSE-2.0 | |||
* | |||
* http://www.apache.org/licenses/LICENSE-2.0 | |||
* Unless required by applicable law or agreed to in writing, | |||
* software distributed under the License is distributed on an | |||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | |||
@@ -22,6 +21,7 @@ package org.apache.archiva.repository.metadata; | |||
import junit.framework.TestCase; | |||
import org.apache.archiva.maven2.metadata.MavenMetadataReader; | |||
import org.apache.archiva.model.ArchivaRepositoryMetadata; | |||
import org.apache.archiva.repository.metadata.RepositoryMetadataException; | |||
import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner; | |||
import org.junit.Test; | |||
import org.junit.runner.RunWith; |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository.metadata; | |||
package org.apache.archiva.repository.maven.metadata; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.repository.metadata; | |||
* "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.metadata.repository.storage.maven2; | |||
package org.apache.archiva.repository.maven.metadata.storage; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.metadata.repository.storage.maven2; | |||
* "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.metadata.repository.storage.maven2; | |||
package org.apache.archiva.repository.maven.metadata.storage; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.metadata.repository.storage.maven2; | |||
* "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.metadata.repository.storage.maven2; | |||
package org.apache.archiva.repository.maven.metadata.storage; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.metadata.repository.storage.maven2; | |||
* "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.metadata.repository.storage.maven2; | |||
package org.apache.archiva.repository.maven.metadata.storage; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.metadata.repository.storage.maven2; | |||
* "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.metadata.repository.storage.maven2; | |||
package org.apache.archiva.repository.maven.metadata.storage; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.metadata.repository.storage.maven2; | |||
* "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.metadata.repository.storage.maven2; | |||
package org.apache.archiva.repository.maven.metadata.storage; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.metadata.repository.storage.maven2; | |||
* "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.metadata.repository.storage.maven2; | |||
package org.apache.archiva.repository.maven.metadata.storage; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.metadata.repository.storage.maven2; | |||
* "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.metadata.repository.storage.maven2.conf; | |||
package org.apache.archiva.repository.maven.metadata.storage.mock; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository.index.mock; | |||
package org.apache.archiva.repository.maven.mock; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.repository.index.mock; | |||
* "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.index.mock; | |||
package org.apache.archiva.repository.maven.mock; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.repository.index.mock; | |||
* "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.metadata.repository; | |||
package org.apache.archiva.repository.maven.mock; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
* or more contributor license agreements. See the NOTICE file | |||
@@ -8,8 +8,7 @@ package org.apache.archiva.metadata.repository; | |||
* "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; | |||
package org.apache.archiva.repository.maven.mock; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.repository; | |||
* "License"); you may not use this file except in compliance | |||
* with the License. You may obtain a copy of the License at | |||
* | |||
* http://www.apache.org/licenses/LICENSE-2.0 | |||
* | |||
* http://www.apache.org/licenses/LICENSE-2.0 | |||
* Unless required by applicable law or agreed to in writing, | |||
* software distributed under the License is distributed on an | |||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | |||
@@ -19,6 +18,9 @@ package org.apache.archiva.repository; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.repository.ManagedRepository; | |||
import org.apache.archiva.repository.Repository; | |||
import org.apache.archiva.repository.RepositoryException; | |||
import org.apache.archiva.repository.base.ArchivaRepositoryRegistry; | |||
import java.util.Map; | |||
@@ -30,7 +32,8 @@ public class RepositoryRegistryMock extends ArchivaRepositoryRegistry | |||
private Map<String, ManagedRepository> managedRepositories = new TreeMap<>(); | |||
@Override | |||
public ManagedRepository putRepository(ManagedRepository managedRepository) throws RepositoryException { | |||
public ManagedRepository putRepository(ManagedRepository managedRepository) throws RepositoryException | |||
{ | |||
managedRepositories.put(managedRepository.getId(), managedRepository); | |||
return managedRepository; | |||
} | |||
@@ -41,7 +44,7 @@ public class RepositoryRegistryMock extends ArchivaRepositoryRegistry | |||
} | |||
@Override | |||
public Repository getRepository(String repoId) { | |||
public Repository getRepository( String repoId) { | |||
if (managedRepositories.containsKey(repoId)) { | |||
return managedRepositories.get(repoId); | |||
} else { |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.metadata.repository; | |||
package org.apache.archiva.repository.maven.mock; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.metadata.repository; | |||
* "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,9 @@ package org.apache.archiva.metadata.repository; | |||
import org.apache.archiva.metadata.model.ArtifactMetadata; | |||
import org.apache.archiva.metadata.model.ProjectVersionMetadata; | |||
import org.apache.archiva.metadata.model.ProjectVersionReference; | |||
import org.apache.archiva.metadata.repository.MetadataResolutionException; | |||
import org.apache.archiva.metadata.repository.MetadataResolver; | |||
import org.apache.archiva.metadata.repository.RepositorySession; | |||
import org.springframework.stereotype.Service; | |||
import java.util.Collection; |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.configuration; | |||
package org.apache.archiva.repository.maven.mock.configuration; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
* or more contributor license agreements. See the NOTICE file | |||
@@ -8,8 +8,7 @@ package org.apache.archiva.configuration; | |||
* "License"); you may not use this file except in compliance | |||
* with the License. You may obtain a copy of the License at | |||
* | |||
* http://www.apache.org/licenses/LICENSE-2.0 | |||
* | |||
* http://www.apache.org/licenses/LICENSE-2.0 | |||
* Unless required by applicable law or agreed to in writing, | |||
* software distributed under the License is distributed on an | |||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | |||
@@ -30,6 +29,10 @@ import org.apache.archiva.admin.model.networkproxy.NetworkProxyAdmin; | |||
import org.apache.archiva.admin.model.proxyconnector.ProxyConnectorAdmin; | |||
import org.apache.archiva.admin.model.proxyconnector.ProxyConnectorOrderComparator; | |||
import org.apache.archiva.admin.model.remote.RemoteRepositoryAdmin; | |||
import org.apache.archiva.configuration.ArchivaConfiguration; | |||
import org.apache.archiva.configuration.ManagedRepositoryConfiguration; | |||
import org.apache.archiva.configuration.ProxyConnectorConfiguration; | |||
import org.apache.archiva.configuration.RemoteRepositoryConfiguration; | |||
import org.apache.archiva.indexer.ArchivaIndexingContext; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.modelmapper.ModelMapper; |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.configuration; | |||
package org.apache.archiva.repository.maven.mock.configuration; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.configuration; | |||
* "License"); you may not use this file except in compliance | |||
* with the License. You may obtain a copy of the License at | |||
* | |||
* http://www.apache.org/licenses/LICENSE-2.0 | |||
* | |||
* http://www.apache.org/licenses/LICENSE-2.0 | |||
* Unless required by applicable law or agreed to in writing, | |||
* software distributed under the License is distributed on an | |||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | |||
@@ -21,6 +20,11 @@ package org.apache.archiva.configuration; | |||
import org.apache.archiva.components.registry.RegistryException; | |||
import org.apache.archiva.components.registry.RegistryListener; | |||
import org.apache.archiva.configuration.ArchivaConfiguration; | |||
import org.apache.archiva.configuration.Configuration; | |||
import org.apache.archiva.configuration.ConfigurationListener; | |||
import org.apache.archiva.configuration.IndeterminateConfigurationException; | |||
import org.apache.archiva.configuration.RepositoryScanningConfiguration; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.springframework.stereotype.Service; | |||
@@ -1,7 +1,11 @@ | |||
package org.apache.archiva.configuration; | |||
package org.apache.archiva.repository.maven.mock.configuration; | |||
import org.apache.archiva.components.registry.RegistryException; | |||
import org.apache.archiva.components.registry.RegistryListener; | |||
import org.apache.archiva.configuration.ArchivaConfiguration; | |||
import org.apache.archiva.configuration.Configuration; | |||
import org.apache.archiva.configuration.ConfigurationListener; | |||
import org.apache.archiva.configuration.IndeterminateConfigurationException; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.springframework.stereotype.Service; | |||
@@ -19,8 +23,7 @@ import java.util.Locale; | |||
* "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 |
@@ -33,7 +33,7 @@ | |||
<alias name="archivaConfiguration#mocked" alias="archivaConfiguration#default" /> | |||
<bean name="repositorySessionFactory#mock" | |||
class="org.apache.archiva.stagerepository.merge.Maven2RepositoryMergerTest" factory-method="getRepositorySessionFactory" /> | |||
class="org.apache.archiva.repository.maven.merge.Maven2RepositoryMergerTest" factory-method="getRepositorySessionFactory" /> | |||
<alias alias="repositorySessionFactory#jcr" name="repositorySessionFactory#mock" /> | |||
</beans> |
@@ -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.metadata.repository.storage.maven2.conf.MockConfiguration"/> | |||
<bean name="archivaConfiguration#mock" class="org.apache.archiva.repository.maven.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"/> |
@@ -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.metadata.repository.storage.maven2.conf,org.apache.archiva.repository.content.maven2,org.apache.archiva.repository.maven2"/> | |||
<context:component-scan base-package="org.apache.archiva.repository.maven.metadata.storage.mock,org.apache.archiva.repository.content.maven2,org.apache.archiva.repository.maven"/> | |||
@@ -31,7 +31,7 @@ | |||
<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"/> | |||
<bean name="archivaConfiguration#test" class="org.apache.archiva.metadata.repository.storage.maven2.conf.MockConfiguration"/> | |||
<bean name="archivaConfiguration#test" class="org.apache.archiva.repository.maven.metadata.storage.mock.MockConfiguration"/> | |||
<alias name="archivaConfiguration#test" alias="archivaConfiguration#default"/> | |||
<alias name="archivaConfiguration#test" alias="archivaConfiguration"/> | |||
@@ -21,7 +21,7 @@ package org.apache.archiva.rest.services; | |||
import org.apache.archiva.admin.model.beans.ManagedRepository; | |||
import org.apache.archiva.common.utils.VersionComparator; | |||
import org.apache.archiva.common.utils.VersionUtil; | |||
import org.apache.archiva.dependency.tree.maven2.DependencyTreeBuilder; | |||
import org.apache.archiva.repository.maven.dependency.tree.DependencyTreeBuilder; | |||
import org.apache.archiva.maven2.model.Artifact; | |||
import org.apache.archiva.maven2.model.TreeEntry; | |||
import org.apache.archiva.metadata.generic.GenericMetadataFacet; | |||
@@ -30,8 +30,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.metadata.repository.storage.maven2.ArtifactMetadataVersionComparator; | |||
import org.apache.archiva.metadata.repository.storage.maven2.MavenProjectFacet; | |||
import org.apache.archiva.repository.maven.metadata.storage.ArtifactMetadataVersionComparator; | |||
import org.apache.archiva.repository.maven.metadata.storage.MavenProjectFacet; | |||
import org.apache.archiva.model.ArchivaArtifact; | |||
import org.apache.archiva.model.ArchivaRepositoryMetadata; | |||
import org.apache.archiva.proxy.ProxyRegistry; |
@@ -34,7 +34,7 @@ import org.apache.archiva.configuration.ArchivaConfiguration; | |||
import org.apache.archiva.configuration.Configuration; | |||
import org.apache.archiva.configuration.FileTypes; | |||
import org.apache.archiva.configuration.RepositoryGroupConfiguration; | |||
import org.apache.archiva.metadata.repository.storage.maven2.ArtifactMappingProvider; | |||
import org.apache.archiva.repository.maven.metadata.storage.ArtifactMappingProvider; | |||
import org.apache.archiva.proxy.ProxyRegistry; | |||
import org.apache.archiva.repository.EditableManagedRepository; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
@@ -47,8 +47,8 @@ import org.apache.archiva.repository.RepositoryContentProvider; | |||
import org.apache.archiva.repository.RepositoryException; | |||
import org.apache.archiva.repository.RepositoryRegistry; | |||
import org.apache.archiva.repository.RepositoryType; | |||
import org.apache.archiva.repository.content.maven2.ManagedDefaultRepositoryContent; | |||
import org.apache.archiva.repository.content.maven2.MavenRepositoryRequestInfo; | |||
import org.apache.archiva.repository.maven.content.ManagedDefaultRepositoryContent; | |||
import org.apache.archiva.repository.maven.content.MavenRepositoryRequestInfo; | |||
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.apache.jackrabbit.webdav.DavException; |
@@ -26,7 +26,7 @@ import org.apache.archiva.repository.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.maven2.MavenManagedRepository; | |||
import org.apache.archiva.repository.maven.MavenManagedRepository; | |||
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; | |||
import org.apache.archiva.webdav.util.MimeTypes; | |||
import org.apache.commons.lang3.StringUtils; |