geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r882783 - 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/ j2ee/geronimo-j2ee/src/main/java...
Date Fri, 20 Nov 2009 23:30:27 GMT
Author: djencks
Date: Fri Nov 20 23:30:26 2009
New Revision: 882783

URL: http://svn.apache.org/viewvc?rev=882783&view=rev
Log:
GERONIMO-4918 Make dependency to ejb module work when there is more than one ejb module in
an ear

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/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.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=882783&r1=882782&r2=882783&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
Fri Nov 20 23:30:26 2009
@@ -178,7 +178,7 @@
         
         Map<String, WebServiceBinding> wsBindingMap = createWebServiceBindingMap(ejbModule);
 
-        AbstractNameQuery ejbModuleName = new AbstractNameQuery(module.getEarContext().getConfigID(),
Collections.singletonMap(NameFactory.J2EE_TYPE, NameFactory.EJB_MODULE));
+        AbstractNameQuery ejbModuleName = NameFactory.newTypeNameQuery(module.getEarContext().getConfigID(),
NameFactory.EJB_MODULE, module.getName());
         for (EnterpriseBeanInfo bean : ejbModule.getEjbJarInfo().enterpriseBeans) {
             if (bean.type != EnterpriseBeanInfo.STATELESS) {
                 continue;

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=882783&r1=882782&r2=882783&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
Fri Nov 20 23:30:26 2009
@@ -82,7 +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));
+        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();

Modified: geronimo/server/branches/2.2/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java?rev=882783&r1=882782&r2=882783&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
(original)
+++ geronimo/server/branches/2.2/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
Fri Nov 20 23:30:26 2009
@@ -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 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/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=882783&r1=882782&r2=882783&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
Fri Nov 20 23:30:26 2009
@@ -182,7 +182,7 @@
 
         Map<String, WebServiceBinding> wsBindingMap = createWebServiceBindingMap(ejbModule);
         
-        AbstractNameQuery ejbModuleName = new AbstractNameQuery(module.getEarContext().getConfigID(),
Collections.singletonMap(NameFactory.J2EE_TYPE, NameFactory.EJB_MODULE));
+        AbstractNameQuery ejbModuleName = NameFactory.newTypeNameQuery(module.getEarContext().getConfigID(),
NameFactory.EJB_MODULE, module.getName());
         for (EnterpriseBeanInfo bean : ejbModule.getEjbJarInfo().enterpriseBeans) {
             if (bean.type != EnterpriseBeanInfo.STATELESS) {
                 continue;



Mime
View raw message