svn commit: r613853 - /servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/CommandProxy.java

[gn...@apache.org]

Author: gnodet
Date: Mon Jan 21 03:42:29 2008
New Revision: 613853

URL: http://svn.apache.org/viewvc?rev=613853&view=rev
Log:
Fix features installation

Modified:
    servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/CommandProxy.java

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/CommandProxy.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/CommandProxy.java?rev=613853&r1=613852&r2=613853&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/CommandProxy.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/CommandProxy.java Mon Jan 21 03:42:29 2008
@@ -19,12 +19,14 @@
 import java.io.IOException;
 import java.io.Reader;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Properties;
 
 import org.apache.geronimo.gshell.command.Command;
 import org.apache.geronimo.gshell.obr.ObrCommandSupport;
 import org.apache.geronimo.gshell.support.OsgiCommandSupport;
 import org.apache.servicemix.gshell.features.Feature;
+import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.obr.RepositoryAdmin;
@@ -67,7 +69,32 @@
         if (c == 'y' || c == 'Y') {
             io.out.println("Installing feature.  Please wait...");
             registration.unregister();
-            doDeploy(admin, Arrays.asList(feature.getBundles()), true);
+            deploy(admin);
+        }
+    }
+
+    protected void deploy(RepositoryAdmin admin) throws Exception {
+        List<String> bundles = Arrays.asList(feature.getBundles());
+        int idx0 = -1;
+        int idx1 = -1;
+        while (++idx0 < bundles.size()) {
+            if (bundles.get(idx0).startsWith("obr:")) {
+                if (idx1 < 0) {
+                    idx1 = idx0;
+                }
+                bundles.set(idx0, bundles.get(idx0).substring("obr:".length()));
+            } else {
+                if (idx1 >= 0) {
+                    doDeploy(admin, bundles.subList(idx1, idx0), true);
+                    idx1 = -1;
+                } else {
+                    Bundle bundle = getBundleContext().installBundle(bundles.get(idx0), null);
+                    bundle.start();
+                }
+            }
+        }
+        if (idx1 >= 0) {
+            doDeploy(admin, bundles.subList(idx1, idx0), true);
         }
     }