From 0587fafcfe278a640e6541ec604594c8aec917bd Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 10 Jun 2011 17:02:32 +0000 Subject: [PATCH] fix now missing legacy repo layout with maven3 git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1134389 13f79535-47bb-0310-9956-ffa450edef68 --- .../artifact/LegacyRepositoryLayout.java | 85 +++++++++++++++++++ .../resources/META-INF/plexus/components.xml | 29 +++++++ .../LegacyToDefaultConverterTest.java | 9 +- 3 files changed, 120 insertions(+), 3 deletions(-) create mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyRepositoryLayout.java create mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/main/resources/META-INF/plexus/components.xml diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyRepositoryLayout.java b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyRepositoryLayout.java new file mode 100644 index 000000000..015179b76 --- /dev/null +++ b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyRepositoryLayout.java @@ -0,0 +1,85 @@ +package org.apache.maven.archiva.converter.artifact; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "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 + * + * 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 + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.handler.ArtifactHandler; +import org.apache.maven.artifact.metadata.ArtifactMetadata; +import org.apache.maven.artifact.repository.ArtifactRepository; +import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; + +/** + * @author jdcasey + */ +public class LegacyRepositoryLayout + implements ArtifactRepositoryLayout +{ + + private static final String PATH_SEPARATOR = "/"; + + public String getId() + { + return "legacy"; + } + + public String pathOf( Artifact artifact ) + { + ArtifactHandler artifactHandler = artifact.getArtifactHandler(); + + StringBuilder path = new StringBuilder( 128 ); + + path.append( artifact.getGroupId() ).append( '/' ); + path.append( artifactHandler.getDirectory() ).append( '/' ); + path.append( artifact.getArtifactId() ).append( '-' ).append( artifact.getVersion() ); + + if ( artifact.hasClassifier() ) + { + path.append( '-' ).append( artifact.getClassifier() ); + } + + if ( artifactHandler.getExtension() != null && artifactHandler.getExtension().length() > 0 ) + { + path.append( '.' ).append( artifactHandler.getExtension() ); + } + + return path.toString(); + } + + public String pathOfLocalRepositoryMetadata( ArtifactMetadata metadata, ArtifactRepository repository ) + { + return pathOfRepositoryMetadata( metadata, metadata.getLocalFilename( repository ) ); + } + + private String pathOfRepositoryMetadata( ArtifactMetadata metadata, String filename ) + { + StringBuilder path = new StringBuilder( 128 ); + + path.append( metadata.getGroupId() ).append( PATH_SEPARATOR ).append( "poms" ).append( PATH_SEPARATOR ); + + path.append( filename ); + + return path.toString(); + } + + public String pathOfRemoteRepositoryMetadata( ArtifactMetadata metadata ) + { + return pathOfRepositoryMetadata( metadata, metadata.getRemoteFilename() ); + } + +} diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/resources/META-INF/plexus/components.xml b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/resources/META-INF/plexus/components.xml new file mode 100644 index 000000000..a582cd3d5 --- /dev/null +++ b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/resources/META-INF/plexus/components.xml @@ -0,0 +1,29 @@ + + + + + + + org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout + legacy + org.apache.maven.archiva.converter.artifact.LegacyRepositoryLayout + + + diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java index 9154d06e8..b81612d1e 100644 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java +++ b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java @@ -81,14 +81,17 @@ public class LegacyToDefaultConverterTest ArtifactRepositoryFactory factory = plexusSisuBridge.lookup( ArtifactRepositoryFactory.class ); - ArtifactRepositoryLayout layout = - (ArtifactRepositoryLayout) plexusSisuBridge.lookup( ArtifactRepositoryLayout.class, "legacy" ); + Map layoutsMap = plexusSisuBridge.lookupMap( ArtifactRepositoryLayout.class ); + + System.out.println("hints " + layoutsMap.keySet().toString() ); + + ArtifactRepositoryLayout layout = plexusSisuBridge.lookup( ArtifactRepositoryLayout.class, "legacy" ); File sourceBase = getTestFile( "src/test/source-repository" ); sourceRepository = factory.createArtifactRepository( "source", sourceBase.toURL().toString(), layout, null, null ); - layout = (ArtifactRepositoryLayout) plexusSisuBridge.lookup( ArtifactRepositoryLayout.class, "default" ); + layout = plexusSisuBridge.lookup( ArtifactRepositoryLayout.class, "default" ); File targetBase = getTestFile( "target/test-target-repository" ); copyDirectoryStructure( getTestFile( "src/test/target-repository" ), targetBase ); -- 2.39.5