geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r945758 - in /geronimo/server/trunk/plugins/openejb: geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeploymentGBean.java openejb/src/main/history/dependencies.xml
Date Tue, 18 May 2010 17:02:05 GMT
Author: djencks
Date: Tue May 18 17:02:04 2010
New Revision: 945758

URL: http://svn.apache.org/viewvc?rev=945758&view=rev
Log:
GERONIMO-5322 make ejb gbeans start before web gbeans.  Hopefully a better way can be found

Modified:
    geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeploymentGBean.java
    geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeploymentGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeploymentGBean.java?rev=945758&r1=945757&r2=945758&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeploymentGBean.java
(original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeploymentGBean.java
Tue May 18 17:02:04 2010
@@ -103,38 +103,40 @@ public class EjbDeploymentGBean extends 
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(EjbDeploymentGBean.class,
EjbDeploymentGBean.class, NameFactory.STATELESS_SESSION_BEAN);
+        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(EjbDeploymentGBean.class,
EjbDeploymentGBean.class, NameFactory.STATELESS_SESSION_BEAN);
+        //TODO GERONIMO-5322 simple way to get all the ejbs to start before any servlet gbeans
+        infoBuilder.setPriority(3);
+
+        infoBuilder.addAttribute("objectName", String.class, false);
+        infoBuilder.addAttribute("deploymentId", String.class, true);
+        infoBuilder.addAttribute("ejbName", String.class, true);
+
+        infoBuilder.addAttribute("homeInterfaceName", String.class, true);
+        infoBuilder.addAttribute("remoteInterfaceName", String.class, true);
+        infoBuilder.addAttribute("localHomeInterfaceName", String.class, true);
+        infoBuilder.addAttribute("localInterfaceName", String.class, true);
+        infoBuilder.addAttribute("serviceEndpointInterfaceName", String.class, true);
+        infoBuilder.addAttribute("beanClassName", String.class, true);
+        infoBuilder.addAttribute("classLoader", ClassLoader.class, false);
+
+        infoBuilder.addAttribute("securityEnabled", boolean.class, true);
+        infoBuilder.addAttribute("defaultRole", String.class, true);
+        infoBuilder.addAttribute("runAsRole", String.class, true);
+        infoBuilder.addReference("RunAsSource", RunAsSource.class, SecurityNames.JACC_MANAGER);
+
+        infoBuilder.addAttribute("componentContextMap", Map.class, true);
+
+        infoBuilder.addAttribute("unshareableResources", Set.class, true);
+        infoBuilder.addAttribute("applicationManagedSecurityResources", Set.class, true);
+        infoBuilder.addReference("TrackedConnectionAssociator", TrackedConnectionAssociator.class);
+        infoBuilder.addReference("TransactionManager", GeronimoTransactionManager.class);
 
-        infoFactory.addAttribute("objectName", String.class, false);
-        infoFactory.addAttribute("deploymentId", String.class, true);
-        infoFactory.addAttribute("ejbName", String.class, true);
-
-        infoFactory.addAttribute("homeInterfaceName", String.class, true);
-        infoFactory.addAttribute("remoteInterfaceName", String.class, true);
-        infoFactory.addAttribute("localHomeInterfaceName", String.class, true);
-        infoFactory.addAttribute("localInterfaceName", String.class, true);
-        infoFactory.addAttribute("serviceEndpointInterfaceName", String.class, true);
-        infoFactory.addAttribute("beanClassName", String.class, true);
-        infoFactory.addAttribute("classLoader", ClassLoader.class, false);
-
-        infoFactory.addAttribute("securityEnabled", boolean.class, true);
-        infoFactory.addAttribute("defaultRole", String.class, true);
-        infoFactory.addAttribute("runAsRole", String.class, true);
-        infoFactory.addReference("RunAsSource", RunAsSource.class, SecurityNames.JACC_MANAGER);
-
-        infoFactory.addAttribute("componentContextMap", Map.class, true);
-
-        infoFactory.addAttribute("unshareableResources", Set.class, true);
-        infoFactory.addAttribute("applicationManagedSecurityResources", Set.class, true);
-        infoFactory.addReference("TrackedConnectionAssociator", TrackedConnectionAssociator.class);
-        infoFactory.addReference("TransactionManager", GeronimoTransactionManager.class);
+        infoBuilder.addReference("OpenEjbSystem", OpenEjbSystem.class);
+        infoBuilder.addReference("EjbModule", EjbModuleImpl.class);
 
-        infoFactory.addReference("OpenEjbSystem", OpenEjbSystem.class);
-        infoFactory.addReference("EjbModule", EjbModuleImpl.class);
+        infoBuilder.addAttribute("kernel", Kernel.class, false);
 
-        infoFactory.addAttribute("kernel", Kernel.class, false);
-
-        infoFactory.setConstructor(new String[]{
+        infoBuilder.setConstructor(new String[]{
                 "objectName",
                 "deploymentId",
                 "ejbName",
@@ -165,6 +167,6 @@ public class EjbDeploymentGBean extends 
                 "kernel",
         });
 
-        GBEAN_INFO = infoFactory.getBeanInfo();
+        GBEAN_INFO = infoBuilder.getBeanInfo();
     }
 }

Modified: geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=945758&r1=945757&r2=945758&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml Tue May
18 17:02:04 2010
@@ -122,6 +122,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-bundleutils</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.yoko</groupId>
         <artifactId>yoko-spec-corba</artifactId>
         <type>jar</type>



Mime
View raw message