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/02/05 17:23:48 UTC
svn commit: r618691 -
/felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ObrDeployFile.java
Author: mcculls
Date: Tue Feb 5 08:23:45 2008
New Revision: 618691
URL: http://svn.apache.org/viewvc?rev=618691&view=rev
Log:
FELIX-475: determine correct URL based on remote repository layout
Modified:
felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ObrDeployFile.java
Modified: felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ObrDeployFile.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ObrDeployFile.java?rev=618691&r1=618690&r2=618691&view=diff
==============================================================================
--- felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ObrDeployFile.java (original)
+++ felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ObrDeployFile.java Tue Feb 5 08:23:45 2008
@@ -114,12 +114,6 @@
return;
}
- URI remoteBundleURI = null;
- if ( null != bundleUrl )
- {
- remoteBundleURI = URI.create( bundleUrl );
- }
-
URI tempURI = ObrUtils.findRepositoryXml( "", obrRepository );
String repositoryName = new File( tempURI.getPath() ).getName();
@@ -153,6 +147,16 @@
else
{
bundleJar = file.toURI();
+ }
+
+ URI remoteBundleURI = null;
+ if ( null != bundleUrl )
+ {
+ remoteBundleURI = URI.create( bundleUrl );
+ }
+ else if ( null != file )
+ {
+ remoteBundleURI = URI.create( localRepository.pathOf( project.getArtifact() ) );
}
Config userConfig = new Config();