svn commit: r628607 - in /felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin: ObrDeploy.java ObrDeployFile.java

[mcculls]

Author: mcculls
Date: Sun Feb 17 20:09:52 2008
New Revision: 628607

URL: http://svn.apache.org/viewvc?rev=628607&view=rev
Log:
Clean up deploy logic

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=628607&r1=628606&r2=628607&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
 Sun Feb 17 20:09:52 2008
@@ -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 );

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=628607&r1=628606&r2=628607&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
 Sun Feb 17 20:09:52 2008
@@ -164,20 +164,19 @@
                 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 );