use the same path separator as RepositoryPathTranslator to prevent windauze issue

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1214868 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java
index edd8539bd832f8dc025aba634ae393e48377dafa..b1447eab35c57e4d9de7f8484e25c4c5991cf9df 100644 (file)
--- a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java
+++ b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java
@@ -25,6 +25,8 @@ import java.io.File;
 
 public interface RepositoryPathTranslator
 {
+    static final char PATH_SEPARATOR = '/';
+
     String toPath( String namespace, String projectId, String projectVersion, String filename );
 
     String toPath( String namespace, String projectId );

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 051c94ea08d13c1aa6025b9bda7c6ee98863db25..6d2a1b2fcc8ed33fa9ccc5a3a8a895b5ddb15df0 100644 (file)
--- 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
@@ -43,8 +43,6 @@ public class Maven2RepositoryPathTranslator
 
     private Logger log = LoggerFactory.getLogger( getClass() );
 
-    private static final char PATH_SEPARATOR = '/';
-
     private static final char GROUP_SEPARATOR = '.';
 
     private static final Pattern TIMESTAMP_PATTERN = Pattern.compile( "([0-9]{8}.[0-9]{6})-([0-9]+).*" );

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 5558c4d268c491e35bf01f4e18566fadb07dae05..77931fe892deec963ae98bedbdcdfa07291c4741 100644 (file)
--- 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,7 @@ import org.apache.archiva.repository.metadata.RepositoryMetadataException;
 import org.apache.archiva.repository.metadata.RepositoryMetadataReader;
 import org.apache.archiva.repository.metadata.RepositoryMetadataWriter;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.SystemUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -150,7 +151,7 @@ public class Maven2RepositoryMerger
 
         log.debug( "artifactPath {}", artifactPath );
 
-        int lastIndex = artifactPath.lastIndexOf( File.separatorChar );
+        int lastIndex = artifactPath.lastIndexOf( RepositoryPathTranslator.PATH_SEPARATOR );
 
         File targetFile = new File( targetRepoPath, artifactPath.substring( 0, lastIndex ) );