Clean up deploy logic
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@628607 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java
index 1efb805..ca45711 100644
--- a/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java
+++ b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java
@@ -155,7 +155,6 @@
URI bundleJar = ObrUtils.findBundleJar( localRepository, project.getArtifact() );
Config userConfig = new Config();
- userConfig.setPathRelative( true );
userConfig.setRemoteFile( true );
update = new ObrUpdate( repositoryXml, obrXmlFile, project, bundleJar, mavenRepository, userConfig, log );
diff --git a/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeployFile.java b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeployFile.java
index de81e34..eaf2375 100644
--- a/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeployFile.java
+++ b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeployFile.java
@@ -164,21 +164,20 @@
bundleJar = file.toURI();
}
- URI remoteBundleURI = null;
+ Config userConfig = new Config();
+ userConfig.setRemoteFile( true );
+
if ( null != bundleUrl )
{
- remoteBundleURI = URI.create( bundleUrl );
+ // public URL differs from the bundle file location
+ userConfig.setRemoteBundle( URI.create( bundleUrl ) );
}
else if ( null != file )
{
- remoteBundleURI = URI.create( localRepository.pathOf( project.getArtifact() ) );
+ // assume file will be deployed in remote repository, so find the remote relative location
+ userConfig.setRemoteBundle( URI.create( localRepository.pathOf( project.getArtifact() ) ) );
}
- Config userConfig = new Config();
- userConfig.setRemoteBundle( remoteBundleURI );
- userConfig.setPathRelative( true );
- userConfig.setRemoteFile( true );
-
update = new ObrUpdate( repositoryXml, obrXmlFile, project, bundleJar, mavenRepository, userConfig, log );
update.updateRepository();