diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java index 4dbab61fe..734f4133f 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java @@ -22,6 +22,8 @@ import org.apache.archiva.metadata.model.ArtifactMetadata; import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; import org.apache.archiva.common.utils.VersionUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; @@ -38,11 +40,17 @@ public class Maven2RepositoryPathTranslator implements RepositoryPathTranslator { - private static final char PATH_SEPARATOR = '/'; + + private Logger log = LoggerFactory.getLogger( getClass() ); + + private static final char PATH_SEPARATOR = File.separatorChar;// '/'; private static final char GROUP_SEPARATOR = '.'; private static final Pattern TIMESTAMP_PATTERN = Pattern.compile( "([0-9]{8}.[0-9]{6})-([0-9]+).*" ); + + + private static final Pattern MAVEN_PLUGIN_PATTERN = Pattern.compile( "^(maven-.*-plugin)|(.*-maven-plugin)$" ); /** * @@ -59,7 +67,6 @@ public Maven2RepositoryPathTranslator() @PostConstruct public void initialize() { - //artifactMappingProviders = new ArrayList( // applicationContext.getBeansOfType( ArtifactMappingProvider.class ).values() ); @@ -323,7 +330,6 @@ else if ( c == '.' ) return metadata; } - private static final Pattern MAVEN_PLUGIN_PATTERN = Pattern.compile( "^(maven-.*-plugin)|(.*-maven-plugin)$" ); public boolean isArtifactIdValidMavenPlugin( String artifactId ) { diff --git a/archiva-modules/plugins/stage-repository-merge/pom.xml b/archiva-modules/plugins/stage-repository-merge/pom.xml index 491ad48ed..71d05dcad 100644 --- a/archiva-modules/plugins/stage-repository-merge/pom.xml +++ b/archiva-modules/plugins/stage-repository-merge/pom.xml @@ -91,7 +91,8 @@ org.apache.archiva.model;version=${project.version}, org.apache.archiva.repository*;version=${project.version}, org.apache.commons.io;version="[1.4,2)", - org.springframework*;version="[3,4)" + org.springframework*;version="[3,4)", + org.slf4j;resolution:=optional diff --git a/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java b/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java index da4d46c15..ab7bd991c 100644 --- a/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java +++ b/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java @@ -35,6 +35,8 @@ import org.apache.archiva.repository.metadata.RepositoryMetadataReader; import org.apache.archiva.repository.metadata.RepositoryMetadataWriter; import org.apache.commons.io.IOUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import javax.inject.Inject; @@ -59,6 +61,8 @@ public class Maven2RepositoryMerger implements RepositoryMerger { + + private Logger log = LoggerFactory.getLogger( getClass() ); /** * */ @@ -135,6 +139,8 @@ private void createFolderStructure( String sourceRepoId, String targetRepoId, Ar String sourceRepoPath = sourceRepoConfig.getLocation(); + + String artifactPath = pathTranslator.toPath( artifactMetadata.getNamespace(), artifactMetadata.getProject(), artifactMetadata.getProjectVersion(), artifactMetadata.getId() );