geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r149066 - /geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
Date Sat, 29 Jan 2005 19:33:25 GMT
Author: djencks
Date: Sat Jan 29 11:33:24 2005
New Revision: 149066

URL: http://svn.apache.org/viewcvs?view=rev&rev=149066
Log:
use the app clients classloader for building the app clients enc
Modified:
   geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.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&rev=149066&p1=geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java&r1=149065&p2=geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java&r2=149066
==============================================================================
--- 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
Sat Jan 29 11:33:24 2005
@@ -418,15 +418,16 @@
                             resourceModules.add(connectorModule);
                             connectorModuleBuilder.installModule(connectorFile, appClientDeploymentContext,
connectorModule);
                         }
-                        ClassLoader cl = appClientDeploymentContext.getClassLoader(repository);
+                        //the install step could have added more dependencies... we need
a new cl.
+                        appClientClassLoader = appClientDeploymentContext.getClassLoader(repository);
                         for (Iterator iterator = resourceModules.iterator(); iterator.hasNext();)
{
                             Module connectorModule = (Module) iterator.next();
-                            connectorModuleBuilder.initContext(appClientDeploymentContext,
connectorModule, cl);
+                            connectorModuleBuilder.initContext(appClientDeploymentContext,
connectorModule, appClientClassLoader);
                         }
 
                         for (Iterator iterator = resourceModules.iterator(); iterator.hasNext();)
{
                             Module connectorModule = (Module) iterator.next();
-                            connectorModuleBuilder.addGBeans(appClientDeploymentContext,
connectorModule, cl);
+                            connectorModuleBuilder.addGBeans(appClientDeploymentContext,
connectorModule, appClientClassLoader);
                         }
                     } finally {
                         for (Iterator iterator = resourceModules.iterator(); iterator.hasNext();)
{
@@ -440,7 +441,7 @@
                 ObjectName jndiContextName = ObjectName.getInstance("geronimo.client:type=StaticJndiContext");
                 GBeanData jndiContextGBeanData = new GBeanData(jndiContextName, StaticJndiContextPlugin.GBEAN_INFO);
                 try {
-                    componentContext = buildComponentContext(appClientDeploymentContext,
appClientModule, appClient, geronimoAppClient, earClassLoader);
+                    componentContext = buildComponentContext(appClientDeploymentContext,
appClientModule, appClient, geronimoAppClient, appClientClassLoader);
                     jndiContextGBeanData.setAttribute("context", componentContext);
                 } catch (Exception e) {
                     throw new DeploymentException("Unable to construct jndi context for AppClientModule
GBean", e);

Mime
View raw message