svn commit: r938534 - in /geronimo/server/trunk: framework/configs/rmi-naming/ framework/configs/rmi-naming/src/main/history/ framework/configs/rmi-naming/src/main/plan/ framework/modules/geronimo-blueprint/src/main/java/org/apache/geronimo/blueprint/ ...

[ga...@apache.org]

Author: gawor
Date: Tue Apr 27 16:05:19 2010
New Revision: 938534

URL: http://svn.apache.org/viewvc?rev=938534&view=rev
Log:
Wait for blueprint container to be created before processing rest of the gbeans. Should get ridd of sporadic 'We could not find an ObjectFactory to use' errors at server startup

Modified:
    geronimo/server/trunk/framework/configs/rmi-naming/pom.xml
    geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml
    geronimo/server/trunk/framework/modules/geronimo-blueprint/src/main/java/org/apache/geronimo/blueprint/WaitForBlueprintGBean.java
    geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml

Modified: geronimo/server/trunk/framework/configs/rmi-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/pom.xml?rev=938534&r1=938533&r2=938534&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/rmi-naming/pom.xml Tue Apr 27 16:05:19 2010
@@ -50,6 +50,12 @@
             <type>car</type>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-blueprint</artifactId>
+            <version>${version}</version>
+        </dependency>
+
         <!-- thread pool has management interface -->
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>

Modified: geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml?rev=938534&r1=938533&r2=938534&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml Tue Apr 27 16:05:19 2010
@@ -38,6 +38,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-blueprint</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-core</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml?rev=938534&r1=938533&r2=938534&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml Tue Apr 27 16:05:19 2010
@@ -20,6 +20,8 @@
 
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
 
+    <gbean name="WaitForBlueprint" class="org.apache.geronimo.blueprint.WaitForBlueprintGBean"/>
+
     <gbean name="RMIRegistry" class="org.apache.geronimo.kernel.rmi.RMIRegistryService">
         <attribute name="port">${PlanNamingPort}</attribute>
         <attribute name="host">${ServerHostname}</attribute>

Modified: geronimo/server/trunk/framework/modules/geronimo-blueprint/src/main/java/org/apache/geronimo/blueprint/WaitForBlueprintGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-blueprint/src/main/java/org/apache/geronimo/blueprint/WaitForBlueprintGBean.java?rev=938534&r1=938533&r2=938534&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-blueprint/src/main/java/org/apache/geronimo/blueprint/WaitForBlueprintGBean.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-blueprint/src/main/java/org/apache/geronimo/blueprint/WaitForBlueprintGBean.java Tue Apr 27 16:05:19 2010
@@ -25,6 +25,7 @@ import java.util.concurrent.CountDownLat
 
 import org.apache.geronimo.gbean.annotation.GBean;
 import org.apache.geronimo.gbean.annotation.ParamSpecial;
+import org.apache.geronimo.gbean.annotation.Priority;
 import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
@@ -40,6 +41,7 @@ import org.osgi.service.blueprint.contai
  */
 
 @GBean
+@Priority(priority = 2)
 public class WaitForBlueprintGBean {
     private volatile BlueprintEvent event;
     private CountDownLatch latch = new CountDownLatch(1);

Modified: geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml?rev=938534&r1=938533&r2=938534&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml Tue Apr 27 16:05:19 2010
@@ -47,11 +47,6 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-blueprint</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-activemq-blueprint</artifactId>
         <type>jar</type>