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 2007/05/05 00:51:52 UTC
svn commit: r535402 - in /geronimo/server/trunk/modules:
geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.java
Author: djencks
Date: Fri May 4 15:51:51 2007
New Revision: 535402
URL: http://svn.apache.org/viewvc?view=rev&rev=535402
Log:
GERONIMO-3134 share message destinations with appclient
Modified:
geronimo/server/trunk/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.java
Modified: geronimo/server/trunk/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?view=diff&rev=535402&r1=535401&r2=535402
==============================================================================
--- geronimo/server/trunk/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java Fri May 4 15:51:51 2007
@@ -503,8 +503,8 @@
connectionTrackerObjectName,
null,
null,
- corbaGBeanObjectName
- );
+ corbaGBeanObjectName,
+ earContext.getMessageDestinations());
appClientModule.setEarContext(appClientDeploymentContext);
appClientModule.setRootEarContext(appClientDeploymentContext);
Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.java?view=diff&rev=535402&r1=535401&r2=535402
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.java (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.java Fri May 4 15:51:51 2007
@@ -46,7 +46,7 @@
private AbstractName jaccManagerName;
private Object securityConfiguration;
- private final Map messageDestinations = new HashMap();
+ private final Map messageDestinations;
private final Map<Object,Object> generalData = new HashMap<Object,Object>();
@@ -72,6 +72,7 @@
this.transactedTimerName = transactedTimerName;
this.nonTransactedTimerName = nonTransactedTimerName;
this.corbaGBeanObjectName = corbaGBeanObjectName;
+ this.messageDestinations = new HashMap();
}
public EARContext(File baseDir,
@@ -86,8 +87,8 @@
AbstractNameQuery connectionTrackerObjectName,
AbstractNameQuery transactedTimerName,
AbstractNameQuery nonTransactedTimerName,
- AbstractNameQuery corbaGBeanObjectName
- ) throws DeploymentException {
+ AbstractNameQuery corbaGBeanObjectName,
+ Map messageDestinations) throws DeploymentException {
super(baseDir, inPlaceConfigurationDir, environment, baseName, moduleType, naming, configurationManager);
this.serverName = serverName;
@@ -97,6 +98,7 @@
this.transactedTimerName = transactedTimerName;
this.nonTransactedTimerName = nonTransactedTimerName;
this.corbaGBeanObjectName = corbaGBeanObjectName;
+ this.messageDestinations = messageDestinations;
}
public EARContext(File baseDir, File inPlaceConfigurationDir, Environment environment, ConfigurationModuleType moduleType, AbstractName baseName, EARContext parent) throws DeploymentException {
@@ -108,6 +110,7 @@
this.transactedTimerName = parent.getTransactedTimerName();
this.nonTransactedTimerName = parent.getNonTransactedTimerName();
this.corbaGBeanObjectName = parent.getCORBAGBeanName();
+ this.messageDestinations = new HashMap();
}
public AbstractNameQuery getServerName() {