[jboss-osgi-commits] JBoss-OSGI SVN: r90890 - in projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org: jboss/osgi/service/webconsole/internal/plugins and 1 other directory.

[jboss-osgi-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-07-07 06:01:02 -0400 (Tue, 07 Jul 2009)
New Revision: 90890

Modified:
   projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/apache/felix/webconsole/internal/core/InstallAction.java
   projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/InstallActionExt.java
Log:
[JBOSGI-66] Support bundle deployment through web console

Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/apache/felix/webconsole/internal/core/InstallAction.java
===================================================================
--- projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/apache/felix/webconsole/internal/core/InstallAction.java	2009-07-07 09:48:13 UTC (rev 90889)
+++ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/apache/felix/webconsole/internal/core/InstallAction.java	2009-07-07 10:01:02 UTC (rev 90890)
@@ -113,7 +113,7 @@
         try
         {
             // copy the data to a file for better processing
-            tmpFile = File.createTempFile( "install", ".tmp" );
+            tmpFile = File.createTempFile( "install", ".jar" );
             bundleItem.write( tmpFile );
         }
         catch ( Exception e )

Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/InstallActionExt.java
===================================================================
--- projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/InstallActionExt.java	2009-07-07 09:48:13 UTC (rev 90889)
+++ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/InstallActionExt.java	2009-07-07 10:01:02 UTC (rev 90890)
@@ -64,10 +64,12 @@
          {
             DeployerService service = (DeployerService)context.getService(sref);
             URL bundleURL = getBundleURL(bundleFile);
-            
-            service.deploy(bundleURL);
             BundleInfo info = service.createBundleInfo(bundleURL);
+
+            service.deploy(new BundleInfo[] { info });
             Bundle bundle = service.getBundle(info);
+            if (bundle == null)
+               throw new IllegalStateException("Cannot obtain installed bundle: " + info);
 
             if (startlevel > 0)
             {