summaryrefslogtreecommitdiffstats
path: root/archiva-modules/plugins
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2011-12-10 16:25:26 +0000
committerOlivier Lamy <olamy@apache.org>2011-12-10 16:25:26 +0000
commit732b69424382f9ef7ef846d02e93a6ab1c36cda1 (patch)
tree055eca05fada208637e845dd74eaf89946cd5647 /archiva-modules/plugins
parentc3fd5740457482031f6c2bcd150a2cf28e8fb3cb (diff)
downloadarchiva-732b69424382f9ef7ef846d02e93a6ab1c36cda1.tar.gz
archiva-732b69424382f9ef7ef846d02e93a6ab1c36cda1.zip
try to fix unit test on windauze
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1212821 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/plugins')
-rw-r--r--archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java18
1 files changed, 9 insertions, 9 deletions
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 c6eaab044..da4d46c15 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
@@ -19,24 +19,26 @@ package org.apache.archiva.stagerepository.merge;
* under the License.
*/
-import org.apache.archiva.metadata.model.ArtifactMetadata;
-import org.apache.archiva.metadata.repository.MetadataRepository;
-import org.apache.archiva.metadata.repository.filter.Filter;
-import org.apache.archiva.metadata.repository.filter.IncludesFilter;
-import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator;
-import org.apache.commons.io.IOUtils;
import org.apache.archiva.common.utils.VersionComparator;
import org.apache.archiva.common.utils.VersionUtil;
import org.apache.archiva.configuration.ArchivaConfiguration;
import org.apache.archiva.configuration.Configuration;
import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.archiva.metadata.model.ArtifactMetadata;
+import org.apache.archiva.metadata.repository.MetadataRepository;
+import org.apache.archiva.metadata.repository.filter.Filter;
+import org.apache.archiva.metadata.repository.filter.IncludesFilter;
+import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator;
import org.apache.archiva.model.ArchivaRepositoryMetadata;
import org.apache.archiva.repository.RepositoryException;
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.springframework.stereotype.Service;
+import javax.inject.Inject;
+import javax.inject.Named;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -49,8 +51,6 @@ import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.TimeZone;
-import javax.inject.Inject;
-import javax.inject.Named;
/**
*
@@ -142,7 +142,7 @@ public class Maven2RepositoryMerger
File targetArtifactFile = new File( targetRepoPath, artifactPath );
- int lastIndex = artifactPath.lastIndexOf( '/' );
+ int lastIndex = artifactPath.lastIndexOf( File.separatorChar );
File targetFile = new File( targetRepoPath, artifactPath.substring( 0, lastIndex ) );