[jboss-cvs] JBossAS SVN: r96270 - projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/deployers.

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

Author: adrian at jboss.org
Date: 2009-11-11 12:57:51 -0500 (Wed, 11 Nov 2009)
New Revision: 96270

Modified:
   projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/deployers/OSGiDeployersWrapper.java
   projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/deployers/OSGiManifestParsingDeployer.java
Log:
PROPERTY_AUTO_START is unnecessary since DeploymentUnit.getRequiredStage() already controls this behaviour

Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/deployers/OSGiDeployersWrapper.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/deployers/OSGiDeployersWrapper.java	2009-11-11 17:50:35 UTC (rev 96269)
+++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/deployers/OSGiDeployersWrapper.java	2009-11-11 17:57:51 UTC (rev 96270)
@@ -21,8 +21,6 @@
 */
 package org.jboss.osgi.framework.deployers;
 
-import static org.jboss.osgi.spi.OSGiConstants.PROPERTY_AUTO_START;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -130,11 +128,8 @@
             OSGiBundleState bundle = unit.getAttachment(OSGiBundleState.class);
             if (bundle == null)
                continue;
-            
-            Boolean autoStart = (Boolean)unit.getAttachment(PROPERTY_AUTO_START);
-            if (autoStart == null)
-               autoStart = Boolean.TRUE;
-            
+
+            boolean autoStart = DeploymentStages.INSTALLED.equals(unit.getRequiredStage());
             if (autoStart == true && bundle.getState() == Bundle.INSTALLED)
             {
                unresolvedBundles.add(0, bundle);

Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/deployers/OSGiManifestParsingDeployer.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/deployers/OSGiManifestParsingDeployer.java	2009-11-11 17:50:35 UTC (rev 96269)
+++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/deployers/OSGiManifestParsingDeployer.java	2009-11-11 17:57:51 UTC (rev 96270)
@@ -21,8 +21,6 @@
 */
 package org.jboss.osgi.framework.deployers;
 
-import static org.jboss.osgi.spi.OSGiConstants.PROPERTY_AUTO_START;
-
 import java.util.jar.Manifest;
 import java.util.jar.Attributes.Name;
 
@@ -73,9 +71,5 @@
 
       // Add a marker that this is an OSGi deployment
       unit.addAttachment(OSGiConstants.KEY_BUNDLE_SYMBOLIC_NAME, symbolicName);
-      
-      // Don't automatically start OSGi deployments.
-      // [todo] this use the required stage processing
-      unit.addAttachment(PROPERTY_AUTO_START, Boolean.FALSE);
    }
 }