svn commit: r1214868 - in /archiva/trunk/archiva-modules: metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/ plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/ plug...

[olamy]

Author: olamy
Date: Thu Dec 15 17:06:44 2011
New Revision: 1214868

URL: http://svn.apache.org/viewvc?rev=1214868&view=rev
Log:
use the same path separator as RepositoryPathTranslator to prevent windauze 
issue

Modified:
    
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java
    
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/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java

Modified: 
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java?rev=1214868&r1=1214867&r2=1214868&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java
 (original)
+++ 
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java
 Thu Dec 15 17:06:44 2011
@@ -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 );

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=1214868&r1=1214867&r2=1214868&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
 Thu Dec 15 17:06:44 2011
@@ -43,8 +43,6 @@ public class Maven2RepositoryPathTransla
 
     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]+).*" );

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=1214868&r1=1214867&r2=1214868&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
 Thu Dec 15 17:06:44 2011
@@ -35,6 +35,7 @@ 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.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 ) );