[jboss-osgi-commits] JBoss-OSGI SVN: r93539 - in projects/jboss-osgi/projects/runtime/microcontainer/trunk: src/main/java/org/jboss/osgi/plugins/deployers/bundle and 1 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2009-09-15 10:37:29 -0400 (Tue, 15 Sep 2009)
New Revision: 93539

Modified:
   projects/jboss-osgi/projects/runtime/microcontainer/trunk/pom.xml
   projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/deployers/bundle/OSGiDeployersWrapper.java
   projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiBundleManager.java
Log:
Only resolve bundles that are marked as autoStart

Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/trunk/pom.xml	2009-09-15 14:36:06 UTC (rev 93538)
+++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/pom.xml	2009-09-15 14:37:29 UTC (rev 93539)
@@ -10,13 +10,13 @@
   <!-- ====================================================================== -->
 
   <!-- $Id$ -->
-  
+
   <!-- 
      Set these VM properties in your IDE debugger 
     
     -Dlog4j.output.dir=${workspace_loc:jboss-osgi-runtime-microcontainer/target}
   -->
-  
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
@@ -151,7 +151,7 @@
       <artifactId>jboss-osgi-deployers</artifactId>
       <version>${version.jboss.osgi.runtime.deployers}</version>
     </dependency>
-      
+
     <!-- OSGi Dependencies -->
     <dependency>
       <groupId>org.osgi</groupId>
@@ -163,7 +163,7 @@
       <artifactId>org.osgi.compendium</artifactId>
       <version>${version.osgi}</version>
     </dependency>
-    
+
     <!-- Test dependencies -->
     <dependency>
       <groupId>org.jboss.test</groupId>
@@ -181,7 +181,7 @@
         </exclusion>
       </exclusions>
     </dependency>
-    
+
     <!-- Test bundles dependencies -->
     <dependency>
       <groupId>org.apache.felix</groupId>
@@ -351,6 +351,25 @@
           <downloadSources>true</downloadSources>
         </configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemProperties>
+            <property>
+              <name>log4j.output.dir</name>
+              <value>${project.build.directory}</value>
+            </property>
+            <property>
+              <name>org.jboss.osgi.husky.Invoker</name>
+              <value>org.jboss.osgi.husky.internal.OSGiInvoker</value>
+            </property>
+            <property>
+              <name>test.archive.directory</name>
+              <value>${project.build.directory}/test-libs</value>
+            </property>
+          </systemProperties>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 
@@ -376,5 +395,5 @@
       </snapshots>
     </repository>
   </repositories>
-  
+
 </project>

Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/deployers/bundle/OSGiDeployersWrapper.java
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/deployers/bundle/OSGiDeployersWrapper.java	2009-09-15 14:36:06 UTC (rev 93538)
+++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/deployers/bundle/OSGiDeployersWrapper.java	2009-09-15 14:37:29 UTC (rev 93539)
@@ -21,6 +21,8 @@
 */
 package org.jboss.osgi.plugins.deployers.bundle;
 
+import static org.jboss.osgi.spi.Constants.PROPERTY_AUTO_START;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -126,7 +128,14 @@
          {
             DeploymentUnit unit = context.getDeploymentUnit();
             OSGiBundleState bundle = unit.getAttachment(OSGiBundleState.class);
-            if (bundle != null && bundle.getState() == Bundle.INSTALLED)
+            if (bundle == null)
+               continue;
+            
+            Boolean autoStart = (Boolean)unit.getAttachment(PROPERTY_AUTO_START);
+            if (autoStart == null)
+               autoStart = Boolean.TRUE;
+            
+            if (autoStart == true && bundle.getState() == Bundle.INSTALLED)
             {
                unresolvedBundles.add(0, bundle);
             }

Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiBundleManager.java
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiBundleManager.java	2009-09-15 14:36:06 UTC (rev 93538)
+++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiBundleManager.java	2009-09-15 14:37:29 UTC (rev 93539)
@@ -21,6 +21,8 @@
 */
 package org.jboss.osgi.plugins.facade.bundle;
 
+import static org.jboss.osgi.spi.Constants.PROPERTY_AUTO_START;
+
 import java.io.IOException;
 import java.net.URL;
 import java.security.AccessController;
@@ -48,6 +50,7 @@
 import org.jboss.dependency.spi.ControllerState;
 import org.jboss.deployers.client.spi.DeployerClient;
 import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.attachments.MutableAttachments;
 import org.jboss.deployers.spi.deployer.DeploymentStage;
 import org.jboss.deployers.spi.deployer.DeploymentStages;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
@@ -399,6 +402,9 @@
       try
       {
          VFSDeployment deployment = VFSDeploymentFactory.getInstance().createVFSDeployment(file);
+         MutableAttachments att = (MutableAttachments)deployment.getPredeterminedManagedObjects();
+         att.addAttachment(PROPERTY_AUTO_START, Boolean.FALSE);
+         
          deployerClient.deploy(deployment);
          try
          {