geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r389268 - /geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
Date Mon, 27 Mar 2006 21:01:02 GMT
Author: djencks
Date: Mon Mar 27 13:01:00 2006
New Revision: 389268

URL: http://svn.apache.org/viewcvs?rev=389268&view=rev
Log:
app client doeesn't have a Server gbean, don't insist on it

Modified:
    geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java

Modified: geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=389268&r1=389267&r2=389268&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
(original)
+++ geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
Mon Mar 27 13:01:00 2006
@@ -290,7 +290,10 @@
         //set up the metadata for the ResourceAdapterModule
         GBeanData resourceAdapterModuleData = new GBeanData(resourceAdapterModuleName, ResourceAdapterModuleImplGBean.GBEAN_INFO);
         // initalize the GBean
-        resourceAdapterModuleData.setReferencePattern(NameFactory.J2EE_SERVER, earContext.getServerName());
+        if (earContext.getServerName() != null) {
+            //app clients don't have a Server gbean
+            resourceAdapterModuleData.setReferencePattern(NameFactory.J2EE_SERVER, earContext.getServerName());
+        }
         if (!earContext.getModuleName().equals(resourceAdapterModuleName)) {
             resourceAdapterModuleData.setReferencePattern(NameFactory.J2EE_APPLICATION, earContext.getModuleName());
         }
@@ -772,6 +775,7 @@
         Map moduleNameMap = new HashMap(instanceName.getName());
         moduleNameMap.remove(NameFactory.JCA_RESOURCE);
         moduleNameMap.remove(NameFactory.RESOURCE_ADAPTER);
+        moduleNameMap.remove(NameFactory.RESOURCE_ADAPTER_MODULE);
         moduleNameMap.put(NameFactory.J2EE_TYPE, NameFactory.RESOURCE_ADAPTER_MODULE);
         moduleNameMap.put(NameFactory.J2EE_NAME, moduleName);
         AbstractNameQuery nameQuery = new AbstractNameQuery(instanceName.getArtifact(), moduleNameMap,
ResourceAdapterModule.class.getName());



Mime
View raw message