You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2006/04/20 00:39:49 UTC
svn commit: r395415 - in /geronimo/branches/1.1/modules:
client-builder/src/java/org/apache/geronimo/client/builder/
connector-builder/src/java/org/apache/geronimo/connector/deployment/
system/src/java/org/apache/geronimo/system/main/
Author: djencks
Date: Wed Apr 19 15:39:43 2006
New Revision: 395415
URL: http://svn.apache.org/viewcvs?rev=395415&view=rev
Log:
Some tweaks to make app clients that include resource adapters work again
Modified:
geronimo/branches/1.1/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/ClientCommandLine.java
Modified: geronimo/branches/1.1/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?rev=395415&r1=395414&r2=395415&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java (original)
+++ geronimo/branches/1.1/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java Wed Apr 19 15:39:43 2006
@@ -268,7 +268,7 @@
clientEnvironment.setConfigId(configId);
}
- AbstractName clientBaseName = earContext.getNaming().createRootName(clientEnvironment.getConfigId(), clientEnvironment.getConfigId().toString(), NameFactory.APP_CLIENT_MODULE);
+ AbstractName clientBaseName = earContext.getNaming().createRootName(clientEnvironment.getConfigId(), clientEnvironment.getConfigId().toString(), NameFactory.J2EE_APPLICATION);
File appClientDir;
try {
appClientDir = targetConfigurationStore.createNewConfigurationDir(clientEnvironment.getConfigId());
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=395415&r1=395414&r2=395415&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 Wed Apr 19 15:39:43 2006
@@ -94,6 +94,7 @@
import javax.naming.Reference;
import javax.xml.namespace.QName;
+
import java.beans.Introspector;
import java.beans.PropertyEditor;
import java.io.File;
@@ -234,7 +235,7 @@
EnvironmentBuilder.mergeEnvironments(earEnvironment, environment);
environment = earEnvironment;
}
-
+
AbstractName moduleName;
if (earName == null) {
earName = naming.createRootName(environment.getConfigId(), NameFactory.NULL, NameFactory.J2EE_APPLICATION);
@@ -300,9 +301,10 @@
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());
+ //app clients don't have an application name either
+ if (!earContext.getModuleName().equals(resourceAdapterModuleName)) {
+ resourceAdapterModuleData.setReferencePattern(NameFactory.J2EE_APPLICATION, earContext.getModuleName());
+ }
}
resourceAdapterModuleData.setReferencePattern("ResourceAdapter", resourceAdapterjsr77Name);
Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/ClientCommandLine.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/ClientCommandLine.java?rev=395415&r1=395414&r2=395415&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/ClientCommandLine.java (original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/ClientCommandLine.java Wed Apr 19 15:39:43 2006
@@ -73,9 +73,10 @@
public ClientCommandLine(Artifact configuration, String[] args) throws Exception {
Jsr77Naming naming = new Jsr77Naming();
- AbstractName baseName = naming.createRootName(configuration, configuration.toString(), "AppClientModule");
- AbstractName clientContainerName = naming.createChildName(baseName, "ClientContainer", "ClientContainer");
+ //this kinda sucks, but resource adapter modules deployed on the client insist on having a
+ //J2EEApplication name component
+ AbstractName baseName = naming.createRootName(configuration, configuration.toString(), "J2EEApplication");
- invokeMainGBean(Collections.singletonList(configuration), clientContainerName, "main", args);
+ invokeMainGBean(Collections.singletonList(configuration), baseName, "main", args);
}
}