You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by mc...@apache.org on 2007/09/27 13:11:32 UTC
svn commit: r579976 - in /felix/trunk:
bundleplugin/src/main/java/org/apache/felix/bundleplugin/OBRInstall.java
maven-obr-plugin/src/main/java/org/apache/felix/sandbox/obr/plugin/PathFile.java
Author: mcculls
Date: Thu Sep 27 04:11:31 2007
New Revision: 579976
URL: http://svn.apache.org/viewvc?rev=579976&view=rev
Log:
FELIX-370: windows fixes from clement, verified as still working on linux
Modified:
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/OBRInstall.java
felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/sandbox/obr/plugin/PathFile.java
Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/OBRInstall.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/OBRInstall.java?rev=579976&r1=579975&r2=579976&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/OBRInstall.java (original)
+++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/OBRInstall.java Thu Sep 27 04:11:31 2007
@@ -81,7 +81,8 @@
String localRepoPath = localRepository.getBasedir();
String artifactPath = localRepository.pathOf( project.getArtifact() );
- String bundlePath = localRepoPath + File.separatorChar + artifactPath;
+ String bundlePath = localRepoPath + File.separator + artifactPath;
+ bundlePath = bundlePath.replace( '\\', '/' );
PathFile repositoryXml = normalizeRepositoryPath( obrRepository, localRepoPath );
String extensionXml = findOBRExtensions( project.getResources() );
Modified: felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/sandbox/obr/plugin/PathFile.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/sandbox/obr/plugin/PathFile.java?rev=579976&r1=579975&r2=579976&view=diff
==============================================================================
--- felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/sandbox/obr/plugin/PathFile.java (original)
+++ felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/sandbox/obr/plugin/PathFile.java Thu Sep 27 04:11:31 2007
@@ -145,17 +145,17 @@
}
/**
- * get only the name from the filname.
+ * get only the name from the filename.
* @param fullFilename full filename
* @return the name of the file or folder
*/
private String extractFileName(String fullFilename) {
- int index = fullFilename.lastIndexOf(File.separator);
+ int index = fullFilename.lastIndexOf('/'); // Given path
return fullFilename.substring(index + 1, fullFilename.length());
}
/**
- * get the path form the filename.
+ * get the path from the filename.
* @param fullFilename full filename
* @return the path of the file
*/