Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 24219 invoked from network); 17 Oct 2009 08:06:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 17 Oct 2009 08:06:27 -0000 Received: (qmail 34053 invoked by uid 500); 17 Oct 2009 08:06:27 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 33986 invoked by uid 500); 17 Oct 2009 08:06:27 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 33977 invoked by uid 99); 17 Oct 2009 08:06:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 17 Oct 2009 08:06:27 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 17 Oct 2009 08:06:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 91BAD2388897; Sat, 17 Oct 2009 08:06:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r826191 [2/2] - in /geronimo/server/trunk/plugins/j2ee: geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/ geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ geronimo-j2ee-builder/src/main/java/org/apache/ge... Date: Sat, 17 Oct 2009 08:06:03 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091017080604.91BAD2388897@eris.apache.org> Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/RemoteRefDConfigBean.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/RemoteRefDConfigBean.java?rev=826191&r1=826190&r2=826191&view=diff ============================================================================== --- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/RemoteRefDConfigBean.java (original) +++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/RemoteRefDConfigBean.java Sat Oct 17 08:06:02 2009 @@ -19,7 +19,7 @@ import javax.enterprise.deploy.model.DDBean; -import org.apache.geronimo.deployment.plugin.DConfigBeanSupport; +import org.apache.geronimo.deployment.dconfigbean.DConfigBeanSupport; import org.apache.xmlbeans.SchemaTypeLoader; import org.apache.xmlbeans.XmlObject; Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java?rev=826191&r1=826190&r2=826191&view=diff ============================================================================== --- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java (original) +++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java Sat Oct 17 08:06:02 2009 @@ -49,6 +49,7 @@ import org.apache.geronimo.xbeans.javaee.XsdStringType; import org.apache.xmlbeans.QNameSet; import org.apache.xmlbeans.XmlObject; +import org.osgi.framework.Bundle; public class SwitchingServiceRefBuilder extends AbstractNamingBuilder { @@ -97,9 +98,9 @@ processAnnotations(module); } - ClassLoader cl = module.getEarContext().getClassLoader(); - Class jaxrpcClass = loadClass("javax.xml.rpc.Service", cl); - Class jaxwsClass = loadClass("javax.xml.ws.Service", cl); + Bundle bundle = module.getEarContext().getBundle(); + Class jaxrpcClass = loadClass("javax.xml.rpc.Service", bundle); + Class jaxwsClass = loadClass("javax.xml.ws.Service", bundle); XmlObject[] serviceRefs = specDD.selectChildren(serviceRefQNameSet); @@ -117,7 +118,7 @@ String serviceInterfaceName = getStringValue(serviceRefType .getServiceInterface()); - Class serviceInterfaceClass = loadClass(serviceInterfaceName, cl); + Class serviceInterfaceClass = loadClass(serviceInterfaceName, bundle); InjectionTargetType[] injections = serviceRefType.getInjectionTargetArray(); addInjections(name, injections, componentContext); @@ -176,10 +177,10 @@ } } - private Class loadClass(String name, ClassLoader cl) + private Class loadClass(String name, Bundle bundle) throws DeploymentException { try { - return cl.loadClass(name); + return bundle.loadClass(name); } catch (ClassNotFoundException e) { throw new DeploymentException("Could not load service class " + name, e); Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/jsr88/HasPattern.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/jsr88/HasPattern.java?rev=826191&r1=826190&r2=826191&view=diff ============================================================================== --- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/jsr88/HasPattern.java (original) +++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/jsr88/HasPattern.java Sat Oct 17 08:06:02 2009 @@ -17,7 +17,7 @@ package org.apache.geronimo.naming.deployment.jsr88; import javax.xml.namespace.QName; -import org.apache.geronimo.deployment.plugin.XmlBeanSupport; +import org.apache.geronimo.deployment.dconfigbean.XmlBeanSupport; import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType; import org.apache.xmlbeans.XmlObject; import org.apache.xmlbeans.impl.values.XmlObjectBase; Modified: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/GeronimoSecurityBuilderImpl.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/GeronimoSecurityBuilderImpl.java?rev=826191&r1=826190&r2=826191&view=diff ============================================================================== --- geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/GeronimoSecurityBuilderImpl.java (original) +++ geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/GeronimoSecurityBuilderImpl.java Sat Oct 17 08:06:02 2009 @@ -143,7 +143,7 @@ public void installModule(JarFile earFile, EARContext earContext, Module module, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) throws DeploymentException { } - public void initContext(EARContext earContext, Module module, ClassLoader cl) throws DeploymentException { + public void initContext(EARContext earContext, Module module, Bundle bundle) throws DeploymentException { } public void addGBeans(EARContext earContext, Module module, ClassLoader cl, Collection repository) throws DeploymentException { Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web25/deployment/SchemaConversionTest.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web25/deployment/SchemaConversionTest.java?rev=826191&r1=826190&r2=826191&view=diff ============================================================================== --- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web25/deployment/SchemaConversionTest.java (original) +++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web25/deployment/SchemaConversionTest.java Sat Oct 17 08:06:02 2009 @@ -35,6 +35,7 @@ import org.apache.xmlbeans.XmlObject; import org.apache.xmlbeans.XmlException; import org.apache.xmlbeans.XmlOptions; +import org.osgi.framework.Bundle; /** * @version $Rev$ $Date$ @@ -135,10 +136,10 @@ return null; } - public void initContext(EARContext earContext, Module module, ClassLoader classLoader) throws DeploymentException { + public void initContext(EARContext earContext, Module module, Bundle classLoader) throws DeploymentException { } - public void addGBeans(EARContext earContext, Module module, ClassLoader classLoader, Collection repositories) throws DeploymentException { + public void addGBeans(EARContext earContext, Module module, Bundle classLoader, Collection repositories) throws DeploymentException { } public String getSchemaNamespace() { Modified: geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml?rev=826191&r1=826190&r2=826191&view=diff ============================================================================== --- geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml Sat Oct 17 08:06:02 2009 @@ -8,6 +8,16 @@ org.apache.geronimo.framework + geronimo-management + jar + + + org.apache.geronimo.framework + geronimo-system + jar + + + org.apache.geronimo.framework rmi-naming car