geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r832051 - in /geronimo/server/branches/2.2/plugins: axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/ corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/ jaxws/geronimo-jaxws-ejb-builder...
Date Mon, 02 Nov 2009 18:57:07 GMT
Author: djencks
Date: Mon Nov  2 18:57:07 2009
New Revision: 832051

URL: http://svn.apache.org/viewvc?rev=832051&view=rev
Log:
GERONIMO-4918 make various ejb link gbeans start after EjbModule, thus after ejbDeployment
gbeans are initialized

Modified:
    geronimo/server/branches/2.2/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisModuleBuilderExtension.java
    geronimo/server/branches/2.2/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/TSSLinkBuilder.java
    geronimo/server/branches/2.2/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSEJBModuleBuilderExtension.java

Modified: geronimo/server/branches/2.2/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisModuleBuilderExtension.java?rev=832051&r1=832050&r2=832051&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisModuleBuilderExtension.java
(original)
+++ geronimo/server/branches/2.2/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisModuleBuilderExtension.java
Mon Nov  2 18:57:07 2009
@@ -178,6 +178,7 @@
         
         Map<String, WebServiceBinding> wsBindingMap = createWebServiceBindingMap(ejbModule);
 
+        AbstractNameQuery ejbModuleName = new AbstractNameQuery(module.getEarContext().getConfigID(),
Collections.singletonMap(NameFactory.J2EE_TYPE, NameFactory.EJB_MODULE));
         for (EnterpriseBeanInfo bean : ejbModule.getEjbJarInfo().enterpriseBeans) {
             if (bean.type != EnterpriseBeanInfo.STATELESS) {
                 continue;
@@ -222,6 +223,7 @@
                 }
             }
             
+            ejbWebServiceGBean.addDependency(ejbModuleName);
             if (axisBuilder.configureEJB(ejbWebServiceGBean, ejbName, ejbModule,
                                          ejbModule.getSharedContext(), cl)) {
                 

Modified: geronimo/server/branches/2.2/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/TSSLinkBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/TSSLinkBuilder.java?rev=832051&r1=832050&r2=832051&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/TSSLinkBuilder.java
(original)
+++ geronimo/server/branches/2.2/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/TSSLinkBuilder.java
Mon Nov  2 18:57:07 2009
@@ -22,6 +22,7 @@
 
 import java.net.URI;
 import java.util.Map;
+import java.util.Collections;
 
 import javax.xml.namespace.QName;
 
@@ -81,6 +82,7 @@
         String[] tssLinks = toStringArray(plan.selectChildren(TSS_LINK_QNAME));
         XmlObject[] tsss = plan.selectChildren(TSS_QNAME);
         String[] jndiNames = toStringArray(plan.selectChildren(JNDI_NAME_QNAME));
+        AbstractNameQuery ejbModuleName = new AbstractNameQuery(module.getEarContext().getConfigID(),
Collections.singletonMap(NameFactory.J2EE_TYPE, NameFactory.EJB_MODULE));
         for (int i = 0; i < tssLinks.length; i++) {
             String tssLink = tssLinks[i];
             URI moduleURI = module.getModuleURI();
@@ -101,6 +103,7 @@
             tssLinkData.setAttribute("jndiNames", jndiNames);
             tssLinkData.setReferencePattern("EJB", ejbName);
             tssLinkData.setReferencePattern("TSSBean", tssBeanName);
+            tssLinkData.addDependency(ejbModuleName);
             try {
                 module.getEarContext().addGBean(tssLinkData);
             } catch (GBeanAlreadyExistsException e) {
@@ -115,6 +118,7 @@
             tssLinkData.setAttribute("jndiNames", jndiNames);
             tssLinkData.setReferencePattern("EJB", ejbName);
             tssLinkData.setReferencePattern("TSSBean", tssBeanName);
+            tssLinkData.addDependency(ejbModuleName);
             try {
                 module.getEarContext().addGBean(tssLinkData);
             } catch (GBeanAlreadyExistsException e) {

Modified: geronimo/server/branches/2.2/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSEJBModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSEJBModuleBuilderExtension.java?rev=832051&r1=832050&r2=832051&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSEJBModuleBuilderExtension.java
(original)
+++ geronimo/server/branches/2.2/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSEJBModuleBuilderExtension.java
Mon Nov  2 18:57:07 2009
@@ -182,6 +182,7 @@
 
         Map<String, WebServiceBinding> wsBindingMap = createWebServiceBindingMap(ejbModule);
         
+        AbstractNameQuery ejbModuleName = new AbstractNameQuery(module.getEarContext().getConfigID(),
Collections.singletonMap(NameFactory.J2EE_TYPE, NameFactory.EJB_MODULE));
         for (EnterpriseBeanInfo bean : ejbModule.getEjbJarInfo().enterpriseBeans) {
             if (bean.type != EnterpriseBeanInfo.STATELESS) {
                 continue;
@@ -229,7 +230,8 @@
                 }
             }
             
-            if (jaxwsBuilder.configureEJB(ejbWebServiceGBean, bean.ejbName, ejbModule, 
+            ejbWebServiceGBean.addDependency(ejbModuleName);
+            if (jaxwsBuilder.configureEJB(ejbWebServiceGBean, bean.ejbName, ejbModule,
                                           ejbModule.getSharedContext(), cl)) {
 
                 try {



Mime
View raw message