FELIX-475: determine correct URL based on remote repository layout
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@618691 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ObrDeployFile.java b/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ObrDeployFile.java
index a8ccdde..046d25b 100644
--- a/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ObrDeployFile.java
+++ b/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ObrDeployFile.java
@@ -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();
@@ -155,6 +149,16 @@
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();
userConfig.setRemoteBundle( remoteBundleURI );
userConfig.setPathRelative( true );