geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r946366 - in /geronimo/server/trunk/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/ j2ee/geronimo-j2ee/src/main/java/org/ap...
Date Wed, 19 May 2010 20:16:05 GMT
Author: djencks
Date: Wed May 19 20:16:04 2010
New Revision: 946366

URL: http://svn.apache.org/viewvc?rev=946366&view=rev
Log:
GERONIMO-4918 port of dependency setup changes from 2.2

Modified:
    geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisModuleBuilderExtension.java
    geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/TSSLinkBuilder.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/ejb/builder/JAXWSEJBModuleBuilderExtension.java

Modified: geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisModuleBuilderExtension.java?rev=946366&r1=946365&r2=946366&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisModuleBuilderExtension.java
(original)
+++ geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisModuleBuilderExtension.java
Wed May 19 20:16:04 2010
@@ -186,6 +186,7 @@ public class AxisModuleBuilderExtension 
         
         Map<String, WebServiceBinding> wsBindingMap = createWebServiceBindingMap(ejbModule);
 
+        AbstractNameQuery ejbModuleName = NameFactory.newTypeNameQuery(module.getEarContext().getConfigID(),
NameFactory.EJB_MODULE, module.getName());
         for (EnterpriseBeanInfo bean : ejbModule.getEjbJarInfo().enterpriseBeans) {
             if (bean.type != EnterpriseBeanInfo.STATELESS) {
                 continue;
@@ -230,6 +231,7 @@ public class AxisModuleBuilderExtension 
                 }
             }
             
+            ejbWebServiceGBean.addDependency(ejbModuleName);
             if (axisBuilder.configureEJB(ejbWebServiceGBean, ejbName, ejbModule,
                                          ejbModule.getSharedContext(), bundle)) {
                 

Modified: geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/TSSLinkBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/TSSLinkBuilder.java?rev=946366&r1=946365&r2=946366&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/TSSLinkBuilder.java
(original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/TSSLinkBuilder.java
Wed May 19 20:16:04 2010
@@ -22,6 +22,7 @@ package org.apache.geronimo.corba.deploy
 
 import java.net.URI;
 import java.util.Map;
+import java.util.Collections;
 
 import javax.xml.namespace.QName;
 
@@ -81,6 +82,7 @@ public class TSSLinkBuilder extends Abst
         String[] tssLinks = toStringArray(plan.selectChildren(TSS_LINK_QNAME));
         XmlObject[] tsss = plan.selectChildren(TSS_QNAME);
         String[] jndiNames = toStringArray(plan.selectChildren(JNDI_NAME_QNAME));
+        AbstractNameQuery ejbModuleName = NameFactory.newTypeNameQuery(module.getEarContext().getConfigID(),
NameFactory.EJB_MODULE, module.getName());
         for (int i = 0; i < tssLinks.length; i++) {
             String tssLink = tssLinks[i];
             URI moduleURI = module.getModuleURI();
@@ -101,6 +103,7 @@ public class TSSLinkBuilder extends Abst
             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 @@ public class TSSLinkBuilder extends Abst
             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/trunk/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java?rev=946366&r1=946365&r2=946366&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
Wed May 19 20:16:04 2010
@@ -16,6 +16,12 @@
  */
 package org.apache.geronimo.j2ee.j2eeobjectnames;
 
+import java.util.Map;
+import java.util.HashMap;
+
+import org.apache.geronimo.gbean.AbstractNameQuery;
+import org.apache.geronimo.kernel.repository.Artifact;
+
 /**
  * @version $Rev:385692 $ $Date$
  */
@@ -113,4 +119,11 @@ public class NameFactory {
     public static final String WEB_SERVICE_LINK = "WSLink";
     public static final String CORBA_TSS_LINK = "TSSLink";
 
+
+    public static AbstractNameQuery newTypeNameQuery(Artifact artifactId, String jeeType,
String name) {
+        Map<String, String> names = new HashMap<String, String>(2);
+        names.put(J2EE_TYPE, jeeType);
+        names.put(J2EE_NAME, name);
+        return new AbstractNameQuery(artifactId, names);
+    }
 }

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/ejb/builder/JAXWSEJBModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/ejb/builder/JAXWSEJBModuleBuilderExtension.java?rev=946366&r1=946365&r2=946366&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/ejb/builder/JAXWSEJBModuleBuilderExtension.java
(original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/ejb/builder/JAXWSEJBModuleBuilderExtension.java
Wed May 19 20:16:04 2010
@@ -187,6 +187,7 @@ public class JAXWSEJBModuleBuilderExtens
 
         Map<String, WebServiceBinding> wsBindingMap = createWebServiceBindingMap(ejbModule);
 
+        AbstractNameQuery ejbModuleName = NameFactory.newTypeNameQuery(module.getEarContext().getConfigID(),
NameFactory.EJB_MODULE, module.getName());
         for (EnterpriseBeanInfo bean : ejbModule.getEjbJarInfo().enterpriseBeans) {
             if (bean.type != EnterpriseBeanInfo.STATELESS) {
                 continue;
@@ -234,6 +235,8 @@ public class JAXWSEJBModuleBuilderExtens
                 }
             }
 
+            ejbWebServiceGBean.addDependency(ejbModuleName);
+
             if (jaxwsBuilder.configureEJB(ejbWebServiceGBean, bean.ejbName, ejbModule,
                                           ejbModule.getSharedContext(), bundle)) {
 



Mime
View raw message