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 2009/10/17 10:06:03 UTC
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...
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 @@
</module-id>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-management</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-system</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>rmi-naming</artifactId>
<type>car</type>
</dependency>