svn commit: rev 47598 - geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment

[djencks]

Author: djencks
Date: Thu Sep 30 10:30:02 2004
New Revision: 47598

Modified:
   
geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
Log:
Construct work manager name to account for expected ObjectName domain

Modified: 
geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
==============================================================================
--- 
geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
      (original)
+++ 
geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
      Thu Sep 30 10:30:02 2004
@@ -94,7 +94,7 @@
 public class ConnectorModuleBuilder implements ModuleBuilder {
     private static final String BASE_REALM_BRIDGE_NAME = 
"geronimo.security:service=RealmBridge,name=";
     private static final String BASE_PASSWORD_CREDENTIAL_LOGIN_MODULE_NAME = 
"geronimo.security:service=Realm,type=PasswordCredential,name=";
-    private static final String BASE_WORK_MANAGER_NAME = 
"geronimo.server:type=WorkManager,name=";
+    private static final String BASE_WORK_MANAGER_NAME = 
":type=WorkManager,name=";
 
     public Module createModule(File plan, JarFile moduleFile) throws 
DeploymentException {
         return createModule(plan, moduleFile, "war", null, true);
@@ -336,7 +336,7 @@
             // set the work manager name
             try {
                 resourceAdapterGBean.setReferencePattern("WorkManager",
-                        ObjectName.getInstance(BASE_WORK_MANAGER_NAME + 
geronimoResourceAdapter.getResourceadapterInstance().getWorkmanagerName().getStringValue()));
+                        ObjectName.getInstance(earContext.getJ2EEDomainName() 
+ BASE_WORK_MANAGER_NAME + 
geronimoResourceAdapter.getResourceadapterInstance().getWorkmanagerName().getStringValue()));
             } catch (MalformedObjectNameException e) {
                 throw new DeploymentException("Could not create object name 
for work manager", e);
             }