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 2008/08/02 18:40:00 UTC
svn commit: r682008 - in
/felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin:
ObrDeploy.java ObrDeployFile.java
Author: mcculls
Date: Sat Aug 2 09:39:59 2008
New Revision: 682008
URL: http://svn.apache.org/viewvc?rev=682008&view=rev
Log:
FELIX-553: handle opaque URIs
Modified:
felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java
felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeployFile.java
Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java?rev=682008&r1=682007&r2=682008&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java (original)
+++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java Sat Aug 2 09:39:59 2008
@@ -179,7 +179,8 @@
}
URI tempURI = ObrUtils.findRepositoryXml( "", remoteOBR );
- String repositoryName = new File( tempURI.getPath() ).getName();
+ String repositoryPath = tempURI.isOpaque() ? tempURI.getSchemeSpecificPart() : tempURI.getPath();
+ String repositoryName = new File( repositoryPath ).getName();
Log log = getLog();
ObrUpdate update;
Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeployFile.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeployFile.java?rev=682008&r1=682007&r2=682008&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeployFile.java (original)
+++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeployFile.java Sat Aug 2 09:39:59 2008
@@ -146,7 +146,8 @@
}
URI tempURI = ObrUtils.findRepositoryXml( "", remoteOBR );
- String repositoryName = new File( tempURI.getPath() ).getName();
+ String repositoryPath = tempURI.isOpaque() ? tempURI.getSchemeSpecificPart() : tempURI.getPath();
+ String repositoryName = new File( repositoryPath ).getName();
Log log = getLog();
ObrUpdate update;