Author: dain
Date: Mon Mar 14 18:23:26 2005
New Revision: 157495
URL: http://svn.apache.org/viewcvs?view=rev&rev=157495
Log:
Bind ORB to java:comp/ORB in app clients
Modified:
geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
geronimo/trunk/modules/client-builder/src/test/org/apache/geronimo/client/builder/PlanParsingTest.java
Modified:
geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?view=diff&r1=157494&r2=157495
==============================================================================
---
geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
(original)
+++
geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
Mon Mar 14 18:23:26 2005
@@ -81,6 +81,7 @@
private final URI defaultClientParentId;
private final URI defaultServerParentId;
+ private final ObjectName corbaGBeanObjectName;
private final Kernel kernel;
private final Repository repository;
private final ConfigurationStore store;
@@ -94,18 +95,20 @@
private final ServiceReferenceBuilder serviceReferenceBuilder;
public AppClientModuleBuilder(URI defaultClientParentId,
- URI defaultServerParentId,
- ObjectName
transactionContextManagerObjectName,
- ObjectName connectionTrackerObjectName,
- EJBReferenceBuilder ejbReferenceBuilder,
- ModuleBuilder connectorModuleBuilder,
- ResourceReferenceBuilder
resourceReferenceBuilder,
- ServiceReferenceBuilder
serviceReferenceBuilder,
- ConfigurationStore store,
- Repository repository,
- Kernel kernel) {
+ URI defaultServerParentId,
+ ObjectName transactionContextManagerObjectName,
+ ObjectName connectionTrackerObjectName,
+ ObjectName corbaGBeanObjectName,
+ EJBReferenceBuilder ejbReferenceBuilder,
+ ModuleBuilder connectorModuleBuilder,
+ ResourceReferenceBuilder resourceReferenceBuilder,
+ ServiceReferenceBuilder serviceReferenceBuilder,
+ ConfigurationStore store,
+ Repository repository,
+ Kernel kernel) {
this.defaultClientParentId = defaultClientParentId;
this.defaultServerParentId = defaultServerParentId;
+ this.corbaGBeanObjectName = corbaGBeanObjectName;
this.kernel = kernel;
this.repository = repository;
this.store = store;
@@ -346,7 +349,8 @@
connectionTrackerObjectName,
null,
null,
- null,
RefContext.derivedClientRefContext(earContext.getRefContext(),
ejbReferenceBuilder, resourceReferenceBuilder, serviceReferenceBuilder));
+ corbaGBeanObjectName,
+
RefContext.derivedClientRefContext(earContext.getRefContext(),
ejbReferenceBuilder, resourceReferenceBuilder, serviceReferenceBuilder));
} catch (Exception e) {
throw new DeploymentException("Could not create a
deployment context for the app client", e);
}
@@ -582,6 +586,7 @@
infoBuilder.addAttribute("defaultServerParentId", URI.class, true);
infoBuilder.addAttribute("transactionContextManagerObjectName",
ObjectName.class, true);
infoBuilder.addAttribute("connectionTrackerObjectName",
ObjectName.class, true);
+ infoBuilder.addAttribute("corbaGBeanObjectName", ObjectName.class,
true);
infoBuilder.addReference("EJBReferenceBuilder",
EJBReferenceBuilder.class, NameFactory.MODULE_BUILDER);
infoBuilder.addReference("ConnectorModuleBuilder",
ModuleBuilder.class, NameFactory.MODULE_BUILDER);
infoBuilder.addReference("ResourceReferenceBuilder",
ResourceReferenceBuilder.class, NameFactory.MODULE_BUILDER);
@@ -597,6 +602,7 @@
"defaultServerParentId",
"transactionContextManagerObjectName",
"connectionTrackerObjectName",
+ "corbaGBeanObjectName",
"EJBReferenceBuilder",
"ConnectorModuleBuilder",
"ResourceReferenceBuilder",
Modified:
geronimo/trunk/modules/client-builder/src/test/org/apache/geronimo/client/builder/PlanParsingTest.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/client-builder/src/test/org/apache/geronimo/client/builder/PlanParsingTest.java?view=diff&r1=157494&r2=157495
==============================================================================
---
geronimo/trunk/modules/client-builder/src/test/org/apache/geronimo/client/builder/PlanParsingTest.java
(original)
+++
geronimo/trunk/modules/client-builder/src/test/org/apache/geronimo/client/builder/PlanParsingTest.java
Mon Mar 14 18:23:26 2005
@@ -12,7 +12,7 @@
*/
public class PlanParsingTest extends TestCase {
- private AppClientModuleBuilder builder = new AppClientModuleBuilder(null,
null, null, null,null, null, null, null, null, null, null);
+ private AppClientModuleBuilder builder = new AppClientModuleBuilder(null,
null, null, null, null, null, null, null, null, null, null, null);
File basedir = new File(System.getProperty("basedir", "."));
public void testResourceRef() throws Exception {
