You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2011/12/12 01:25:28 UTC
svn commit: r1213120 - in /archiva/trunk/archiva-modules/plugins:
maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/
stage-repository-merge/
stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/
Author: olamy
Date: Mon Dec 12 00:25:27 2011
New Revision: 1213120
URL: http://svn.apache.org/viewvc?rev=1213120&view=rev
Log:
try a better fix for unit failure on windauze
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java
archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml
archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java?rev=1213120&r1=1213119&r2=1213120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java (original)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java Mon Dec 12 00:25:27 2011
@@ -22,6 +22,8 @@ package org.apache.archiva.metadata.repo
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 @@ import java.util.regex.Pattern;
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 class Maven2RepositoryPathTransla
@PostConstruct
public void initialize()
{
-
//artifactMappingProviders = new ArrayList<ArtifactMappingProvider>(
// applicationContext.getBeansOfType( ArtifactMappingProvider.class ).values() );
@@ -323,7 +330,6 @@ public class Maven2RepositoryPathTransla
return metadata;
}
- private static final Pattern MAVEN_PLUGIN_PATTERN = Pattern.compile( "^(maven-.*-plugin)|(.*-maven-plugin)$" );
public boolean isArtifactIdValidMavenPlugin( String artifactId )
{
Modified: archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml?rev=1213120&r1=1213119&r2=1213120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml Mon Dec 12 00:25:27 2011
@@ -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
</Import-Package>
</instructions>
</configuration>
Modified: archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java?rev=1213120&r1=1213119&r2=1213120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java (original)
+++ archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java Mon Dec 12 00:25:27 2011
@@ -35,6 +35,8 @@ import org.apache.archiva.repository.met
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 @@ import java.util.TimeZone;
public class Maven2RepositoryMerger
implements RepositoryMerger
{
+
+ private Logger log = LoggerFactory.getLogger( getClass() );
/**
*
*/
@@ -135,6 +139,8 @@ public class Maven2RepositoryMerger
String sourceRepoPath = sourceRepoConfig.getLocation();
+
+
String artifactPath = pathTranslator.toPath( artifactMetadata.getNamespace(), artifactMetadata.getProject(),
artifactMetadata.getProjectVersion(), artifactMetadata.getId() );