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/12/25 00:26:45 UTC
svn commit: r893824 [1/2] - in /geronimo/server/trunk: ./
framework/configs/j2ee-security/
framework/configs/j2ee-security/src/main/resources/
framework/configs/j2ee-security/src/main/resources/var/
framework/configs/j2ee-security/src/main/resources/va...
Author: djencks
Date: Thu Dec 24 23:26:43 2009
New Revision: 893824
URL: http://svn.apache.org/viewvc?rev=893824&view=rev
Log:
GERONIMO-5004 axis 1 osgi integration including test jetty server
Added:
geronimo/server/trunk/framework/configs/j2ee-security/src/main/resources/
geronimo/server/trunk/framework/configs/j2ee-security/src/main/resources/var/
geronimo/server/trunk/framework/configs/j2ee-security/src/main/resources/var/security/
geronimo/server/trunk/framework/configs/j2ee-security/src/main/resources/var/security/keystores/
geronimo/server/trunk/framework/configs/j2ee-security/src/main/resources/var/security/keystores/EMPTY
geronimo/server/trunk/plugins/axis/axis-jetty-server/
geronimo/server/trunk/plugins/axis/axis-jetty-server/pom.xml (with props)
geronimo/server/trunk/plugins/axis/axis-jetty-server/src/
geronimo/server/trunk/plugins/axis/axis-jetty-server/src/main/
geronimo/server/trunk/plugins/axis/axis-jetty-server/src/main/resources/
geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/test/resources/commons-logging.properties (with props)
Modified:
geronimo/server/trunk/framework/configs/j2ee-security/pom.xml
geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java
geronimo/server/trunk/plugins/axis/axis-deployer/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/axis/axis/pom.xml
geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/axis/geronimo-axis-builder/pom.xml
geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisBuilder.java
geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisModuleBuilderExtension.java
geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceBuilder.java
geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java
geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/HeavyweightOperationDescBuilder.java
geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/HeavyweightTypeInfoBuilder.java
geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/LightweightTypeInfoBuilder.java
geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/test/java/org/apache/geronimo/axis/builder/ServiceReferenceTest.java
geronimo/server/trunk/plugins/axis/geronimo-axis/pom.xml
geronimo/server/trunk/plugins/axis/geronimo-axis/src/main/java/org/apache/geronimo/axis/AxisDiscoveryCLWorkaroundGBean.java
geronimo/server/trunk/plugins/axis/pom.xml
geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java
geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java
geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java
geronimo/server/trunk/plugins/pom.xml
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/src/main/java/org/apache/geronimo/webservices/builder/WSDescriptorParser.java
geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/framework/configs/j2ee-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-security/pom.xml?rev=893824&r1=893823&r2=893824&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-security/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-security/pom.xml Thu Dec 24 23:26:43 2009
@@ -100,6 +100,7 @@
</gbean>
</config-xml-content>
<config-substitution key="JMXPort">9999</config-substitution>
+ <copy-file relative-to="server" dest-dir="var">var/</copy-file>
</plugin-artifact>
</instance>
</configuration>
Added: geronimo/server/trunk/framework/configs/j2ee-security/src/main/resources/var/security/keystores/EMPTY
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-security/src/main/resources/var/security/keystores/EMPTY?rev=893824&view=auto
==============================================================================
(empty)
Modified: geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java?rev=893824&r1=893823&r2=893824&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java Thu Dec 24 23:26:43 2009
@@ -126,8 +126,6 @@
//This provides services such as loading more bundles, it is NOT for the configuration we are constructing here.
//It should be a disposable nested framework so as to not pollute the main framework with stuff we load as deployment parents.
private final BundleContext bundleContext;
- //this is the temporary bundle we set up for this deployment
- private Bundle bundle;
private Configuration configuration;
//TODO OSGI set this
private boolean boot;
@@ -764,19 +762,12 @@
public void close() throws IOException, DeploymentException {
if (configurationManager != null && configuration != null) {
try {
+ //TODO OSGI make sure this unloads the bundle from the framework
configurationManager.unloadConfiguration(configuration.getId());
} catch (NoSuchConfigException ignored) {
//ignore
}
}
- if (bundle != null) {
- try {
- bundle.uninstall();
- } catch (BundleException e) {
- throw new DeploymentException("Could not uninstall temporary bundle for " + environment.getConfigId(), e);
- }
- bundle = null;
- }
}
public void addChildConfiguration(String moduleName, ConfigurationData configurationData) {
Modified: geronimo/server/trunk/plugins/axis/axis-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/axis-deployer/src/main/history/dependencies.xml?rev=893824&r1=893823&r2=893824&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/axis-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/axis/axis-deployer/src/main/history/dependencies.xml Thu Dec 24 23:26:43 2009
@@ -6,7 +6,7 @@
<version>3.0-SNAPSHOT</version>
<type>car</type>
</module-id>
- <dependency start="true">
+ <dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>axis</artifactId>
<type>car</type>
Added: geronimo/server/trunk/plugins/axis/axis-jetty-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/axis-jetty-server/pom.xml?rev=893824&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/axis/axis-jetty-server/pom.xml (added)
+++ geronimo/server/trunk/plugins/axis/axis-jetty-server/pom.xml Thu Dec 24 23:26:43 2009
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>axis</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>axis-jetty-server</artifactId>
+ <packaging>server-assembly</packaging>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <version>${version}</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <configuration>
+ <servers>
+ <serverInstance>
+ <name>default</name>
+ <configFile>var/config/config.xml</configFile>
+ <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+ <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+ <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+ </serverInstance>
+ <serverInstance>
+ <name>client</name>
+ <attributeManagerFrom>default</attributeManagerFrom>
+ <artifactAliasesFile>var/config/client_artifact_aliases.properties</artifactAliasesFile>
+ </serverInstance>
+ <serverInstance>
+ <name>offline</name>
+ <configFile>var/config/offline-deployer-config.xml</configFile>
+ <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+ <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+ <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+ </serverInstance>
+ <serverInstance>
+ <name>jsr88</name>
+ <configFile>var/config/jsr88-configurer-config.xml</configFile>
+ <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+ <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+ <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+ </serverInstance>
+ </servers>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>karaf-framework</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jetty8</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jetty8-deployer</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>axis</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>axis-deployer</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ </dependencies>
+</project>
Propchange: geronimo/server/trunk/plugins/axis/axis-jetty-server/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/plugins/axis/axis-jetty-server/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/plugins/axis/axis-jetty-server/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/server/trunk/plugins/axis/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/axis/pom.xml?rev=893824&r1=893823&r2=893824&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/axis/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/axis/pom.xml Thu Dec 24 23:26:43 2009
@@ -72,15 +72,11 @@
<version>${version}</version>
</dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-axis</artifactId>
- </dependency>
+<!-- openejb-axis may be needed, but does not seem to be ready yet -->
+ <!--<dependency>-->
+ <!--<groupId>org.apache.openejb</groupId>-->
+ <!--<artifactId>openejb-axis</artifactId>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
@@ -92,6 +88,10 @@
<groupId>org.apache.ws.scout</groupId>
<artifactId>scout</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>uddi-ws</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml?rev=893824&r1=893823&r2=893824&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml Thu Dec 24 23:26:43 2009
@@ -7,17 +7,47 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>axis</groupId>
+ <groupId>com.sun.xml.stream.buffer</groupId>
+ <artifactId>streambuffer</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jsr173_api</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>axis</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>commons-discovery</groupId>
+ <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>commons-discovery</artifactId>
<type>jar</type>
</dependency>
@@ -33,11 +63,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
<artifactId>server-security-config</artifactId>
<type>car</type>
</dependency>
@@ -62,8 +87,8 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-axis</artifactId>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>uddi-ws</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -71,4 +96,9 @@
<artifactId>scout</artifactId>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.jvnet.staxex</groupId>
+ <artifactId>stax-ex</artifactId>
+ <type>jar</type>
+ </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/axis/geronimo-axis-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/geronimo-axis-builder/pom.xml?rev=893824&r1=893823&r2=893824&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/geronimo-axis-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/geronimo-axis-builder/pom.xml Thu Dec 24 23:26:43 2009
@@ -48,8 +48,11 @@
</dependency>
<dependency>
- <groupId>axis</groupId>
- <artifactId>axis</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ <version>${version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisBuilder.java?rev=893824&r1=893823&r2=893824&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisBuilder.java (original)
+++ geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisBuilder.java Thu Dec 24 23:26:43 2009
@@ -87,7 +87,9 @@
import org.apache.geronimo.webservices.builder.SchemaInfoBuilder;
import org.apache.geronimo.webservices.builder.WSDescriptorParser;
import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
+import org.apache.geronimo.kernel.osgi.BundleClassLoader;
import org.apache.geronimo.kernel.repository.Environment;
+import org.osgi.framework.Bundle;
/**
* @version $Rev$ $Date$
@@ -140,8 +142,8 @@
return false;
}
- ClassLoader cl = context.getClassLoader();
- Class serviceClass = loadClass(servletClassName, cl);
+ Bundle bundle = context.getDeploymentBundle();
+ Class serviceClass = loadClass(servletClassName, bundle);
if (isJAXWSWebService(serviceClass)) {
if (DescriptorVersion.J2EE.equals(portInfo.getDescriptorVersion())) {
// This is a JAX-WS web service in J2EE descriptor so throw an exception
@@ -157,8 +159,9 @@
LOG.debug("Publishing JAX-RPC '" + portInfo.getPortComponentName()
+ "' service at " + portInfo.getContextURI());
-
- ServiceInfo serviceInfo = AxisServiceBuilder.createServiceInfo(portInfo, cl);
+
+ BundleClassLoader loader = new BundleClassLoader(bundle);
+ ServiceInfo serviceInfo = AxisServiceBuilder.createServiceInfo(portInfo, bundle);
JavaServiceDesc serviceDesc = serviceInfo.getServiceDesc();
targetGBean.setAttribute("pojoClassName", servletClassName);
@@ -185,7 +188,7 @@
}
- AxisWebServiceContainer axisWebServiceContainer = new AxisWebServiceContainer(location, wsdlURI, service, serviceInfo.getWsdlMap(), cl);
+ AxisWebServiceContainer axisWebServiceContainer = new AxisWebServiceContainer(location, wsdlURI, service, serviceInfo.getWsdlMap(), new BundleClassLoader(bundle));
AbstractName webServiceContainerFactoryName = context.getNaming().createChildName(targetGBean.getAbstractName(), "webServiceContainer", GBeanInfoBuilder.DEFAULT_J2EE_TYPE);
GBeanData webServiceContainerFactoryGBean = new GBeanData(webServiceContainerFactoryName, SerializableWebServiceContainerFactoryGBean.GBEAN_INFO);
webServiceContainerFactoryGBean.setAttribute("webServiceContainer", axisWebServiceContainer);
@@ -198,7 +201,8 @@
return true;
}
- public boolean configureEJB(GBeanData targetGBean, String ejbName, Module module, Map sharedContext, ClassLoader classLoader) throws DeploymentException {
+ @Override
+ public boolean configureEJB(GBeanData targetGBean, String ejbName, Module module, Map sharedContext, Bundle bundle) throws DeploymentException {
Map portInfoMap = (Map) sharedContext.get(KEY);
PortInfo portInfo = (PortInfo) portInfoMap.get(ejbName);
if (portInfo == null) {
@@ -207,7 +211,7 @@
}
String beanClassName = (String)targetGBean.getAttribute("ejbClass");
- Class serviceClass = loadClass(beanClassName, classLoader);
+ Class serviceClass = loadClass(beanClassName, bundle);
if (isJAXWSWebService(serviceClass)) {
if (DescriptorVersion.J2EE.equals(portInfo.getDescriptorVersion())) {
// This is a JAX-WS web service in J2EE descriptor so throw an exception
@@ -224,7 +228,7 @@
LOG.debug("Publishing EJB JAX-RPC '" + portInfo.getPortComponentName()
+ "' service at " + portInfo.getContextURI());
- ServiceInfo serviceInfo = AxisServiceBuilder.createServiceInfo(portInfo, classLoader);
+ ServiceInfo serviceInfo = AxisServiceBuilder.createServiceInfo(portInfo, bundle);
targetGBean.setAttribute("serviceInfo", serviceInfo);
JavaServiceDesc serviceDesc = serviceInfo.getServiceDesc();
URI location = portInfo.getContextURI();
@@ -241,7 +245,7 @@
//ServicereferenceBuilder
- public Object createService(Class serviceInterface, URI wsdlURI, URI jaxrpcMappingURI, QName serviceQName, Map portComponentRefMap, List handlerInfos, Object serviceRefType, Module module, ClassLoader classLoader) throws DeploymentException {
+ public Object createService(Class serviceInterface, URI wsdlURI, URI jaxrpcMappingURI, QName serviceQName, Map portComponentRefMap, List handlerInfos, Object serviceRefType, Module module, Bundle bundle) throws DeploymentException {
GerServiceRefType gerServiceRefType = (GerServiceRefType) serviceRefType;
JarFile moduleFile = module.getModuleFile();
SchemaInfoBuilder schemaInfoBuilder = null;
@@ -252,19 +256,19 @@
mapping = WSDescriptorParser.readJaxrpcMapping(moduleFile, jaxrpcMappingURI);
}
- return createService(serviceInterface, schemaInfoBuilder, mapping, serviceQName, SOAP_VERSION, handlerInfos, gerServiceRefType, module, classLoader);
+ return createService(serviceInterface, schemaInfoBuilder, mapping, serviceQName, SOAP_VERSION, handlerInfos, gerServiceRefType, module, bundle);
}
- public Object createService(Class serviceInterface, SchemaInfoBuilder schemaInfoBuilder, JavaWsdlMappingType mapping, QName serviceQName, SOAPConstants soapVersion, List handlerInfos, GerServiceRefType serviceRefType, Module module, ClassLoader classloader) throws DeploymentException {
+ public Object createService(Class serviceInterface, SchemaInfoBuilder schemaInfoBuilder, JavaWsdlMappingType mapping, QName serviceQName, SOAPConstants soapVersion, List handlerInfos, GerServiceRefType serviceRefType, Module module, Bundle bundle) throws DeploymentException {
Map seiPortNameToFactoryMap = new HashMap();
Map seiClassNameToFactoryMap = new HashMap();
if (schemaInfoBuilder != null) {
- buildSEIFactoryMap(schemaInfoBuilder, serviceRefType, mapping, handlerInfos, serviceQName, soapVersion, seiPortNameToFactoryMap, seiClassNameToFactoryMap, classloader);
+ buildSEIFactoryMap(schemaInfoBuilder, serviceRefType, mapping, handlerInfos, serviceQName, soapVersion, seiPortNameToFactoryMap, seiClassNameToFactoryMap, bundle);
}
return new AxisServiceReference(serviceInterface.getName(), seiPortNameToFactoryMap, seiClassNameToFactoryMap);
}
- public void buildSEIFactoryMap(SchemaInfoBuilder schemaInfoBuilder, GerServiceRefType serviceRefType, JavaWsdlMappingType mapping, List handlerInfos, QName serviceQName, SOAPConstants soapVersion, Map seiPortNameToFactoryMap, Map seiClassNameToFactoryMap, ClassLoader classLoader) throws DeploymentException {
+ public void buildSEIFactoryMap(SchemaInfoBuilder schemaInfoBuilder, GerServiceRefType serviceRefType, JavaWsdlMappingType mapping, List handlerInfos, QName serviceQName, SOAPConstants soapVersion, Map seiPortNameToFactoryMap, Map seiClassNameToFactoryMap, Bundle bundle) throws DeploymentException {
Map exceptionMap = WSDescriptorParser.getExceptionMap(mapping);
Definition definition = schemaInfoBuilder.getDefinition();
@@ -293,7 +297,7 @@
throw new DeploymentException("No binding found with qname: " + bindingQName);
}
String credentialsName = port.isSetCredentialsName() ? port.getCredentialsName().trim() : null;
- mapBinding(binding, mapping, serviceQName, classLoader, soapVersion, schemaInfoBuilder, portName, location, handlerInfos, seiPortNameToFactoryMap, seiClassNameToFactoryMap, credentialsName, exceptionMap);
+ mapBinding(binding, mapping, serviceQName, bundle, soapVersion, schemaInfoBuilder, portName, location, handlerInfos, seiPortNameToFactoryMap, seiClassNameToFactoryMap, credentialsName, exceptionMap);
}
} else {
@@ -335,12 +339,12 @@
Binding binding = port.getBinding();
- mapBinding(binding, mapping, serviceQName, classLoader, soapVersion, schemaInfoBuilder, portName, location, handlerInfos, seiPortNameToFactoryMap, seiClassNameToFactoryMap, credentialsName, exceptionMap);
+ mapBinding(binding, mapping, serviceQName, bundle, soapVersion, schemaInfoBuilder, portName, location, handlerInfos, seiPortNameToFactoryMap, seiClassNameToFactoryMap, credentialsName, exceptionMap);
}
}
}
- private void mapBinding(Binding binding, JavaWsdlMappingType mapping, QName serviceQName, ClassLoader classLoader, SOAPConstants soapVersion, SchemaInfoBuilder schemaInfoBuilder, String portName, URL location, List handlerInfos, Map seiPortNameToFactoryMap, Map seiClassNameToFactoryMap, String credentialsName, Map exceptionMap) throws DeploymentException {
+ private void mapBinding(Binding binding, JavaWsdlMappingType mapping, QName serviceQName, Bundle bundle, SOAPConstants soapVersion, SchemaInfoBuilder schemaInfoBuilder, String portName, URL location, List handlerInfos, Map seiPortNameToFactoryMap, Map seiClassNameToFactoryMap, String credentialsName, Map exceptionMap) throws DeploymentException {
Style portStyle = getStyle(binding);
PortType portType = binding.getPortType();
@@ -351,9 +355,9 @@
List operations = portType.getOperations();
OperationInfo[] operationInfos = new OperationInfo[operations.size()];
if (endpointMappings.length == 0) {
- doLightweightMapping(serviceQName, portType, mapping, classLoader, operations, binding, portStyle, soapVersion, operationInfos, schemaInfoBuilder, portName, location, handlerInfos, seiPortNameToFactoryMap, seiClassNameToFactoryMap, credentialsName);
+ doLightweightMapping(serviceQName, portType, mapping, bundle, operations, binding, portStyle, soapVersion, operationInfos, schemaInfoBuilder, portName, location, handlerInfos, seiPortNameToFactoryMap, seiClassNameToFactoryMap, credentialsName);
} else {
- doHeavyweightMapping(serviceQName, portType, endpointMappings, classLoader, operations, binding, portStyle, soapVersion, exceptionMap, schemaInfoBuilder, mapping, operationInfos, portName, location, handlerInfos, seiPortNameToFactoryMap, seiClassNameToFactoryMap, credentialsName);
+ doHeavyweightMapping(serviceQName, portType, endpointMappings, bundle, operations, binding, portStyle, soapVersion, exceptionMap, schemaInfoBuilder, mapping, operationInfos, portName, location, handlerInfos, seiPortNameToFactoryMap, seiClassNameToFactoryMap, credentialsName);
}
}
@@ -418,7 +422,7 @@
return location;
}
- private void doHeavyweightMapping(QName serviceName, PortType portType, ServiceEndpointInterfaceMappingType[] endpointMappings, ClassLoader classLoader, List operations, Binding binding, Style portStyle, SOAPConstants soapVersion, Map exceptionMap, SchemaInfoBuilder schemaInfoBuilder, JavaWsdlMappingType mapping, OperationInfo[] operationInfos, String portName, URL location, List handlerInfos, Map seiPortNameToFactoryMap, Map seiClassNameToFactoryMap, String credentialsName) throws DeploymentException {
+ private void doHeavyweightMapping(QName serviceName, PortType portType, ServiceEndpointInterfaceMappingType[] endpointMappings, Bundle bundle, List operations, Binding binding, Style portStyle, SOAPConstants soapVersion, Map exceptionMap, SchemaInfoBuilder schemaInfoBuilder, JavaWsdlMappingType mapping, OperationInfo[] operationInfos, String portName, URL location, List handlerInfos, Map seiPortNameToFactoryMap, Map seiClassNameToFactoryMap, String credentialsName) throws DeploymentException {
Class serviceEndpointInterface;
SEIFactory seiFactory;
//complete jaxrpc mapping file supplied
@@ -426,7 +430,7 @@
ServiceEndpointInterfaceMappingType endpointMapping = WSDescriptorParser.getServiceEndpointInterfaceMapping(endpointMappings, portTypeQName);
String fqcn = endpointMapping.getServiceEndpointInterface().getStringValue();
try {
- serviceEndpointInterface = classLoader.loadClass(fqcn);
+ serviceEndpointInterface = bundle.loadClass(fqcn);
} catch (ClassNotFoundException e) {
throw new DeploymentException("Could not load service endpoint interface", e);
}
@@ -456,14 +460,14 @@
throw new DeploymentException("No BindingOperation for operation: " + operationName + ", input: " + operation.getInput().getName() + ", output: " + (operation.getOutput() == null ? "<none>" : operation.getOutput().getName()));
}
ServiceEndpointMethodMappingType methodMapping = WSDescriptorParser.getMethodMappingForOperation(operationName, methodMappings);
- HeavyweightOperationDescBuilder operationDescBuilder = new HeavyweightOperationDescBuilder(bindingOperation, mapping, methodMapping, portStyle, exceptionMap, schemaInfoBuilder, javaXmlTypeMappings, classLoader, serviceEndpointInterface);
+ HeavyweightOperationDescBuilder operationDescBuilder = new HeavyweightOperationDescBuilder(bindingOperation, mapping, methodMapping, portStyle, exceptionMap, schemaInfoBuilder, javaXmlTypeMappings, bundle, serviceEndpointInterface);
OperationInfo operationInfo = operationDescBuilder.buildOperationInfo(soapVersion);
operationInfos[i++] = operationInfo;
operationDescs.add(operationInfo.getOperationDesc());
wrapperElementQNames.addAll(operationDescBuilder.getWrapperElementQNames());
hasEncoded |= operationDescBuilder.isEncoded();
}
- HeavyweightTypeInfoBuilder builder = new HeavyweightTypeInfoBuilder(classLoader, schemaInfoBuilder.getSchemaTypeKeyToSchemaTypeMap(), wrapperElementQNames, operationDescs, hasEncoded);
+ HeavyweightTypeInfoBuilder builder = new HeavyweightTypeInfoBuilder(bundle, schemaInfoBuilder.getSchemaTypeKeyToSchemaTypeMap(), wrapperElementQNames, operationDescs, hasEncoded);
List typeInfo = builder.buildTypeInfo(mapping);
seiFactory = createSEIFactory(serviceName, portName, serviceEndpointInterface.getName(), typeInfo, location, operationInfos, handlerInfos, credentialsName);
@@ -471,11 +475,11 @@
seiClassNameToFactoryMap.put(serviceEndpointInterface.getName(), seiFactory);
}
- private void doLightweightMapping(QName serviceName, PortType portType, JavaWsdlMappingType mapping, ClassLoader classLoader, List operations, Binding binding, Style portStyle, SOAPConstants soapVersion, OperationInfo[] operationInfos, SchemaInfoBuilder schemaInfoBuilder, String portName, URL location, List handlerInfos, Map seiPortNameToFactoryMap, Map seiClassNameToFactoryMap, String credentialsName) throws DeploymentException {
+ private void doLightweightMapping(QName serviceName, PortType portType, JavaWsdlMappingType mapping, Bundle bundle, List operations, Binding binding, Style portStyle, SOAPConstants soapVersion, OperationInfo[] operationInfos, SchemaInfoBuilder schemaInfoBuilder, String portName, URL location, List handlerInfos, Map seiPortNameToFactoryMap, Map seiClassNameToFactoryMap, String credentialsName) throws DeploymentException {
Class serviceEndpointInterface;
SEIFactory seiFactory;
//lightweight jaxrpc mapping supplied
- serviceEndpointInterface = getServiceEndpointInterfaceLightweight(portType, mapping, classLoader);
+ serviceEndpointInterface = getServiceEndpointInterfaceLightweight(portType, mapping, bundle);
// Class enhancedServiceEndpointClass = enhanceServiceEndpointInterface(serviceEndpointInterface, context, module, classLoader);
int i = 0;
@@ -485,7 +489,7 @@
BindingOperation bindingOperation = binding.getBindingOperation(operation.getName(), operation.getInput().getName(), operation.getOutput() == null ? null : operation.getOutput().getName());
operationInfos[i++] = buildOperationInfoLightweight(method, bindingOperation, portStyle, soapVersion);
}
- LightweightTypeInfoBuilder builder = new LightweightTypeInfoBuilder(classLoader, schemaInfoBuilder.getSchemaTypeKeyToSchemaTypeMap(), Collections.EMPTY_SET);
+ LightweightTypeInfoBuilder builder = new LightweightTypeInfoBuilder(bundle, schemaInfoBuilder.getSchemaTypeKeyToSchemaTypeMap(), Collections.EMPTY_SET);
List typeInfo = builder.buildTypeInfo(mapping);
seiFactory = createSEIFactory(serviceName, portName, serviceEndpointInterface.getName(), typeInfo, location, operationInfos, handlerInfos, credentialsName);
@@ -493,7 +497,7 @@
seiClassNameToFactoryMap.put(serviceEndpointInterface.getName(), seiFactory);
}
- private Class getServiceEndpointInterfaceLightweight(PortType portType, JavaWsdlMappingType mappings, ClassLoader classLoader) throws DeploymentException {
+ private Class getServiceEndpointInterfaceLightweight(PortType portType, JavaWsdlMappingType mappings, Bundle bundle) throws DeploymentException {
QName portTypeQName = portType.getQName();
String portTypeNamespace = portTypeQName.getNamespaceURI();
String portTypePackage = WSDescriptorParser.getPackageFromNamespace(portTypeNamespace, mappings);
@@ -502,7 +506,7 @@
//TODO just use one buffer!
String fqcn = portTypePackage + "." + shortInterfaceName.toString();
try {
- return classLoader.loadClass(fqcn);
+ return bundle.loadClass(fqcn);
} catch (ClassNotFoundException e) {
throw new DeploymentException("Could not load service endpoint interface type", e);
}
@@ -535,9 +539,9 @@
}
- Class<?> loadClass(String className, ClassLoader loader) throws DeploymentException {
+ Class<?> loadClass(String className, Bundle bundle) throws DeploymentException {
try {
- return loader.loadClass(className);
+ return bundle.loadClass(className);
} catch (ClassNotFoundException ex) {
throw new DeploymentException("Unable to load Web Service class: " + className);
}
Modified: geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisModuleBuilderExtension.java?rev=893824&r1=893823&r2=893824&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisModuleBuilderExtension.java (original)
+++ geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisModuleBuilderExtension.java Thu Dec 24 23:26:43 2009
@@ -60,6 +60,7 @@
import org.apache.openejb.jee.oejb2.SessionBeanType;
import org.apache.openejb.jee.oejb2.WebServiceBindingType;
import org.apache.openejb.jee.oejb2.WebServiceSecurityType;
+import org.osgi.framework.Bundle;
/**
* @version $Rev$ $Date$
@@ -82,6 +83,7 @@
this.listener = listener;
}
+ @Override
public void createModule(Module module, Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
if (module.getType() != ConfigurationModuleType.EJB) {
return;
@@ -110,10 +112,12 @@
}
}
+ @Override
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 {
+ @Override
+ public void initContext(EARContext earContext, Module module, Bundle bundle) throws DeploymentException {
if (module.getType() != ConfigurationModuleType.EJB) {
return;
}
@@ -169,7 +173,8 @@
}
}
- public void addGBeans(EARContext earContext, Module module, ClassLoader cl, Collection repository) throws DeploymentException {
+ @Override
+ public void addGBeans(EARContext earContext, Module module, Bundle bundle, Collection collection) throws DeploymentException {
if (module.getType() != ConfigurationModuleType.EJB) {
return;
}
@@ -223,7 +228,7 @@
}
if (axisBuilder.configureEJB(ejbWebServiceGBean, ejbName, ejbModule,
- ejbModule.getSharedContext(), cl)) {
+ ejbModule.getSharedContext(), bundle)) {
try {
earContext.addGBean(ejbWebServiceGBean);
Modified: geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceBuilder.java?rev=893824&r1=893823&r2=893824&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceBuilder.java (original)
+++ geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceBuilder.java Thu Dec 24 23:26:43 2009
@@ -62,6 +62,7 @@
import org.apache.xmlbeans.impl.xb.xsdschema.ImportDocument;
import org.apache.xmlbeans.impl.xb.xsdschema.IncludeDocument;
import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
+import org.osgi.framework.Bundle;
/**
* @version $Rev$ $Date$
@@ -72,22 +73,22 @@
public static final QName SCHEMA_QNAME = new QName(XSD_NS, "schema");
- public static ServiceInfo createServiceInfo(PortInfo portInfo, ClassLoader classLoader) throws DeploymentException {
- JavaServiceDesc serviceDesc = createServiceDesc(portInfo, classLoader);
- List handlerInfos = WSDescriptorParser.createHandlerInfoList(portInfo.getHandlers(), classLoader);
+ public static ServiceInfo createServiceInfo(PortInfo portInfo, Bundle bundle) throws DeploymentException {
+ JavaServiceDesc serviceDesc = createServiceDesc(portInfo, bundle);
+ List handlerInfos = WSDescriptorParser.createHandlerInfoList(portInfo.getHandlers(), bundle);
SchemaInfoBuilder schemaInfoBuilder = portInfo.getSchemaInfoBuilder();
Map rawWsdlMap = schemaInfoBuilder.getWsdlMap();
Map wsdlMap = rewriteWsdlMap(portInfo, rawWsdlMap);
return new ServiceInfo(serviceDesc, handlerInfos, wsdlMap);
}
- public static JavaServiceDesc createServiceDesc(PortInfo portInfo, ClassLoader classLoader) throws DeploymentException {
+ public static JavaServiceDesc createServiceDesc(PortInfo portInfo, Bundle bundle) throws DeploymentException {
Port port = portInfo.getPort();
Class serviceEndpointInterface = null;
try {
- serviceEndpointInterface = classLoader.loadClass(portInfo.getServiceEndpointInterfaceName());
+ serviceEndpointInterface = bundle.loadClass(portInfo.getServiceEndpointInterfaceName());
} catch (ClassNotFoundException e) {
throw (DeploymentException) new DeploymentException("Unable to load the service-endpoint interface for port-component " + portInfo.getPortComponentName()).initCause(e);
}
@@ -125,7 +126,7 @@
// }
Collection operations = new ArrayList();
- Set wrapperElementQNames = buildOperations(binding, serviceEndpointInterface, isLightweight, portInfo, exceptionMap, classLoader, operations);
+ Set wrapperElementQNames = buildOperations(binding, serviceEndpointInterface, isLightweight, portInfo, exceptionMap, bundle, operations);
for (Iterator iter = operations.iterator(); iter.hasNext();) {
OperationDesc operation = (OperationDesc) iter.next();
serviceDesc.addOperationDesc(operation);
@@ -141,10 +142,10 @@
List typeInfo;
if (isLightweight) {
- LightweightTypeInfoBuilder builder = new LightweightTypeInfoBuilder(classLoader, schemaTypeKeyToSchemaTypeMap, wrapperElementQNames);
+ LightweightTypeInfoBuilder builder = new LightweightTypeInfoBuilder(bundle, schemaTypeKeyToSchemaTypeMap, wrapperElementQNames);
typeInfo = builder.buildTypeInfo(portInfo.getJavaWsdlMapping());
} else {
- HeavyweightTypeInfoBuilder builder = new HeavyweightTypeInfoBuilder(classLoader, schemaTypeKeyToSchemaTypeMap, wrapperElementQNames, operations, hasEncoded);
+ HeavyweightTypeInfoBuilder builder = new HeavyweightTypeInfoBuilder(bundle, schemaTypeKeyToSchemaTypeMap, wrapperElementQNames, operations, hasEncoded);
typeInfo = builder.buildTypeInfo(portInfo.getJavaWsdlMapping());
}
@@ -156,7 +157,7 @@
return new ReadOnlyServiceDesc(serviceDesc, typeInfo);
}
- private static Set buildOperations(Binding binding, Class serviceEndpointInterface, boolean lightweight, PortInfo portInfo, Map exceptionMap, ClassLoader classLoader, Collection operations) throws DeploymentException {
+ private static Set buildOperations(Binding binding, Class serviceEndpointInterface, boolean lightweight, PortInfo portInfo, Map exceptionMap, Bundle bundle, Collection operations) throws DeploymentException {
Set wrappedElementQNames = new HashSet();
SOAPBinding soapBinding = (SOAPBinding) SchemaInfoBuilder.getExtensibilityElement(SOAPBinding.class, binding.getExtensibilityElements());
@@ -176,7 +177,7 @@
ServiceEndpointMethodMappingType[] methodMappings = portInfo.getServiceEndpointInterfaceMapping().getServiceEndpointMethodMappingArray();
ServiceEndpointMethodMappingType methodMapping = WSDescriptorParser.getMethodMappingForOperation(operationName, methodMappings);
JavaXmlTypeMappingType[] javaXmlTypeMappingTypes = portInfo.getJavaWsdlMapping().getJavaXmlTypeMappingArray();
- operationDescBuilder = new HeavyweightOperationDescBuilder(bindingOperation, portInfo.getJavaWsdlMapping(), methodMapping, portStyle, exceptionMap, portInfo.getSchemaInfoBuilder(), javaXmlTypeMappingTypes, classLoader, serviceEndpointInterface);
+ operationDescBuilder = new HeavyweightOperationDescBuilder(bindingOperation, portInfo.getJavaWsdlMapping(), methodMapping, portStyle, exceptionMap, portInfo.getSchemaInfoBuilder(), javaXmlTypeMappingTypes, bundle, serviceEndpointInterface);
Set wrappedElementQNamesForOper = ((HeavyweightOperationDescBuilder) operationDescBuilder).getWrapperElementQNames();
wrappedElementQNames.addAll(wrappedElementQNamesForOper);
}
Modified: geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java?rev=893824&r1=893823&r2=893824&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java Thu Dec 24 23:26:43 2009
@@ -49,6 +49,7 @@
import org.apache.geronimo.xbeans.javaee.XsdQNameType;
import org.apache.xmlbeans.QNameSet;
import org.apache.xmlbeans.XmlObject;
+import org.osgi.framework.Bundle;
/**
* @version $Rev$ $Date$
@@ -97,14 +98,14 @@
private void buildNaming(ServiceRefType serviceRef, GerServiceRefType serviceRefType, Module module, Map componentContext) throws DeploymentException {
String name = getStringValue(serviceRef.getServiceRefName());
- ClassLoader cl = module.getEarContext().getClassLoader();
+ Bundle bundle = module.getEarContext().getDeploymentBundle();
// Map credentialsNameMap = (Map) serviceRefCredentialsNameMap.get(name);
String serviceInterfaceName = getStringValue(serviceRef.getServiceInterface());
- assureInterface(serviceInterfaceName, "javax.xml.rpc.Service", "[Web]Service", cl);
+ assureInterface(serviceInterfaceName, "javax.xml.rpc.Service", "[Web]Service", bundle);
Class serviceInterface;
try {
- serviceInterface = cl.loadClass(serviceInterfaceName);
+ serviceInterface = bundle.loadClass(serviceInterfaceName);
} catch (ClassNotFoundException e) {
throw new DeploymentException("Could not load service interface class: " + serviceInterfaceName, e);
}
@@ -135,10 +136,10 @@
PortComponentRefType portComponentRef = portComponentRefs[j];
String portComponentLink = getStringValue(portComponentRef.getPortComponentLink());
String serviceEndpointInterfaceType = getStringValue(portComponentRef.getServiceEndpointInterface());
- assureInterface(serviceEndpointInterfaceType, "java.rmi.Remote", "ServiceEndpoint", cl);
+ assureInterface(serviceEndpointInterfaceType, "java.rmi.Remote", "ServiceEndpoint", bundle);
Class serviceEndpointClass;
try {
- serviceEndpointClass = cl.loadClass(serviceEndpointInterfaceType);
+ serviceEndpointClass = bundle.loadClass(serviceEndpointInterfaceType);
} catch (ClassNotFoundException e) {
throw new DeploymentException("could not load service endpoint class " + serviceEndpointInterfaceType, e);
}
@@ -146,10 +147,10 @@
}
}
ServiceRefHandlerType[] handlers = serviceRef.getHandlerArray();
- List handlerInfos = buildHandlerInfoList(handlers, cl);
+ List handlerInfos = buildHandlerInfoList(handlers, bundle);
//we could get a Reference or the actual serializable Service back.
- Object ref = axisBuilder.createService(serviceInterface, wsdlURI, jaxrpcMappingURI, serviceQName, portComponentRefMap, handlerInfos, serviceRefType, module, cl);
+ Object ref = axisBuilder.createService(serviceInterface, wsdlURI, jaxrpcMappingURI, serviceQName, portComponentRefMap, handlerInfos, serviceRefType, module, bundle);
getJndiContextMap(componentContext).put(ENV + name, ref);
}
@@ -162,7 +163,7 @@
}
- private static List buildHandlerInfoList(ServiceRefHandlerType[] handlers, ClassLoader classLoader) throws DeploymentException {
+ private static List buildHandlerInfoList(ServiceRefHandlerType[] handlers, Bundle bundle) throws DeploymentException {
List handlerInfos = new ArrayList();
for (int i = 0; i < handlers.length; i++) {
ServiceRefHandlerType handler = handlers[i];
@@ -176,7 +177,7 @@
String handlerClassName = handler.getHandlerClass().getStringValue().trim();
Class handlerClass;
try {
- handlerClass = ClassLoading.loadClass(handlerClassName, classLoader);
+ handlerClass = ClassLoading.loadClass(handlerClassName, bundle);
} catch (ClassNotFoundException e) {
throw new DeploymentException("Could not load handler class", e);
}
Modified: geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/HeavyweightOperationDescBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/HeavyweightOperationDescBuilder.java?rev=893824&r1=893823&r2=893824&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/HeavyweightOperationDescBuilder.java (original)
+++ geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/HeavyweightOperationDescBuilder.java Thu Dec 24 23:26:43 2009
@@ -63,6 +63,7 @@
import org.apache.geronimo.xbeans.j2ee.JavaXmlTypeMappingType;
import org.apache.geronimo.webservices.builder.SchemaInfoBuilder;
import org.apache.geronimo.webservices.builder.WSDescriptorParser;
+import org.osgi.framework.Bundle;
/**
* @version $Rev$ $Date$
@@ -76,7 +77,7 @@
private final Map exceptionMap;
private final SchemaInfoBuilder schemaInfoBuilder;
- private final ClassLoader classLoader;
+ private final Bundle bundle;
private final boolean rpcStyle;
private final boolean documentStyle;
private final boolean wrappedStyle;
@@ -96,7 +97,7 @@
*/
private final Set wrapperElementQNames = new HashSet();
- public HeavyweightOperationDescBuilder(BindingOperation bindingOperation, JavaWsdlMappingType mapping, ServiceEndpointMethodMappingType methodMapping, Style defaultStyle, Map exceptionMap, SchemaInfoBuilder schemaInfoBuilder, JavaXmlTypeMappingType[] javaXmlTypeMappingTypes, ClassLoader classLoader, Class serviceEndpointInterface) throws DeploymentException {
+ public HeavyweightOperationDescBuilder(BindingOperation bindingOperation, JavaWsdlMappingType mapping, ServiceEndpointMethodMappingType methodMapping, Style defaultStyle, Map exceptionMap, SchemaInfoBuilder schemaInfoBuilder, JavaXmlTypeMappingType[] javaXmlTypeMappingTypes, Bundle bundle, Class serviceEndpointInterface) throws DeploymentException {
super(bindingOperation);
this.mapping = mapping;
this.methodMapping = methodMapping;
@@ -113,7 +114,7 @@
publicTypes.put(qname, javaClassName);
}
}
- this.classLoader = classLoader;
+ this.bundle = bundle;
this.serviceEndpointInterface = serviceEndpointInterface;
BindingInput bindingInput = bindingOperation.getBindingInput();
this.soapBody = (SOAPBody) SchemaInfoBuilder.getExtensibilityElement(SOAPBody.class, bindingInput.getExtensibilityElements());
@@ -472,7 +473,7 @@
private Class getJavaClass(String javaClassName) throws DeploymentException {
try {
- Class javaClass = ClassLoading.loadClass(javaClassName, classLoader);
+ Class javaClass = ClassLoading.loadClass(javaClassName, bundle);
return javaClass;
} catch (ClassNotFoundException e) {
throw new DeploymentException("Could not load class", e);
@@ -490,7 +491,7 @@
WsdlReturnValueMappingType wsdlReturnValueMapping = methodMapping.getWsdlReturnValueMapping();
String returnClassName = wsdlReturnValueMapping.getMethodReturnValue().getStringValue().trim();
try {
- returnClass = ClassLoading.loadClass(returnClassName, classLoader);
+ returnClass = ClassLoading.loadClass(returnClassName, bundle);
} catch (ClassNotFoundException e) {
throw new DeploymentException("Could not load return type for operation " + operationName, e);
}
@@ -670,7 +671,7 @@
boolean isComplexType = schemaInfoBuilder.getComplexTypesInWsdl().containsKey(paramTypeQName);
String paramJavaTypeName = paramMapping.getParamType().getStringValue().trim();
boolean isInOnly = mode == ParameterDesc.IN;
- Class actualParamJavaType = WSDescriptorParser.getHolderType(paramJavaTypeName, isInOnly, paramTypeQName, isComplexType, mapping, classLoader);
+ Class actualParamJavaType = WSDescriptorParser.getHolderType(paramJavaTypeName, isInOnly, paramTypeQName, isComplexType, mapping, bundle);
ParameterDesc parameterDesc = new ParameterDesc(paramQName, mode, paramTypeQName, actualParamJavaType, inHeader, outHeader);
return parameterDesc;
Modified: geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/HeavyweightTypeInfoBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/HeavyweightTypeInfoBuilder.java?rev=893824&r1=893823&r2=893824&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/HeavyweightTypeInfoBuilder.java (original)
+++ geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/HeavyweightTypeInfoBuilder.java Thu Dec 24 23:26:43 2009
@@ -65,6 +65,7 @@
import org.apache.xmlbeans.SchemaType;
import org.apache.xmlbeans.soap.SOAPArrayType;
import org.apache.xmlbeans.soap.SchemaWSDLArrayType;
+import org.osgi.framework.Bundle;
/**
* @version $Rev$ $Date$
@@ -75,14 +76,14 @@
private static final Logger log = LoggerFactory.getLogger(HeavyweightTypeInfoBuilder.class);
- private final ClassLoader cl;
+ private final Bundle bundle;
private final Map schemaTypeKeyToSchemaTypeMap;
private final Set wrapperElementQNames;
private final Collection operations;
private final boolean hasEncoded;
- public HeavyweightTypeInfoBuilder(ClassLoader cl, Map schemaTypeKeyToSchemaTypeMap, Set wrapperElementQNames, Collection operations, boolean hasEncoded) {
- this.cl = cl;
+ public HeavyweightTypeInfoBuilder(Bundle bundle, Map schemaTypeKeyToSchemaTypeMap, Set wrapperElementQNames, Collection operations, boolean hasEncoded) {
+ this.bundle = bundle;
this.schemaTypeKeyToSchemaTypeMap = schemaTypeKeyToSchemaTypeMap;
this.wrapperElementQNames = wrapperElementQNames;
this.operations = operations;
@@ -143,7 +144,7 @@
String className = javaXmlTypeMapping.getJavaType().getStringValue().trim();
Class clazz = null;
try {
- clazz = ClassLoading.loadClass(className, cl);
+ clazz = ClassLoading.loadClass(className, bundle);
} catch (ClassNotFoundException e2) {
throw new DeploymentException("Could not load java type", e2);
}
Modified: geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/LightweightTypeInfoBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/LightweightTypeInfoBuilder.java?rev=893824&r1=893823&r2=893824&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/LightweightTypeInfoBuilder.java (original)
+++ geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/LightweightTypeInfoBuilder.java Thu Dec 24 23:26:43 2009
@@ -42,17 +42,18 @@
import org.apache.geronimo.webservices.builder.WSDescriptorParser;
import org.apache.xmlbeans.SchemaParticle;
import org.apache.xmlbeans.SchemaType;
+import org.osgi.framework.Bundle;
/**
* @version $Rev$ $Date$
*/
public class LightweightTypeInfoBuilder implements TypeInfoBuilder {
- private final ClassLoader cl;
+ private final Bundle cl;
private final Map schemaTypeKeyToSchemaTypeMap;
private final Set wrapperElementQNames;
- public LightweightTypeInfoBuilder(ClassLoader cl, Map schemaTypeKeyToSchemaTypeMap, Set wrapperElementQNames) {
- this.cl = cl;
+ public LightweightTypeInfoBuilder(Bundle bundle, Map schemaTypeKeyToSchemaTypeMap, Set wrapperElementQNames) {
+ this.cl = bundle;
this.schemaTypeKeyToSchemaTypeMap = schemaTypeKeyToSchemaTypeMap;
this.wrapperElementQNames = wrapperElementQNames;
}
Modified: geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/test/java/org/apache/geronimo/axis/builder/ServiceReferenceTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/test/java/org/apache/geronimo/axis/builder/ServiceReferenceTest.java?rev=893824&r1=893823&r2=893824&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/test/java/org/apache/geronimo/axis/builder/ServiceReferenceTest.java (original)
+++ geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/test/java/org/apache/geronimo/axis/builder/ServiceReferenceTest.java Thu Dec 24 23:26:43 2009
@@ -67,6 +67,7 @@
import org.apache.geronimo.j2ee.deployment.Module;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.kernel.Jsr77Naming;
+import org.apache.geronimo.kernel.osgi.MockBundleContext;
import org.apache.geronimo.kernel.config.ConfigurationModuleType;
import org.apache.geronimo.kernel.config.ConfigurationManager;
import org.apache.geronimo.kernel.config.SimpleConfigurationManager;
@@ -106,16 +107,18 @@
protected void setUp() throws Exception {
super.setUp();
+ Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
+ bundleContext = new MockBundleContext(getClass().getClassLoader(), "", null, null);
tmpbasedir = File.createTempFile("car", "tmp");
tmpbasedir.delete();
tmpbasedir.mkdirs();
environment.setConfigId(configID);
Jsr77Naming naming = new Jsr77Naming();
ArtifactManager artifactManager = new DefaultArtifactManager();
- ArtifactResolver artifactResolver = new DefaultArtifactResolver(artifactManager, Collections.EMPTY_SET, null);
- ConfigurationManager configurationManager = new SimpleConfigurationManager(Collections.EMPTY_SET, artifactResolver, Collections.EMPTY_SET);
+ ArtifactResolver artifactResolver = new DefaultArtifactResolver(artifactManager, null);
+ ConfigurationManager configurationManager = new SimpleConfigurationManager(Collections.EMPTY_SET, artifactResolver, Collections.EMPTY_SET, bundleContext);
AbstractName moduleName = naming.createRootName(configID, "testejb", NameFactory.EJB_MODULE);
- context = new DeploymentContext(tmpbasedir, null, environment, moduleName, ConfigurationModuleType.CAR, naming, configurationManager, Collections.EMPTY_SET);
+ context = new DeploymentContext(tmpbasedir, null, environment, moduleName, ConfigurationModuleType.CAR, naming, configurationManager, bundleContext);
File moduleLocation = new File(tmpbasedir, "ejb");
moduleLocation.mkdirs();
@@ -177,7 +180,7 @@
JavaWsdlMappingType mapping = buildLightweightMappingType();
QName serviceQName = new QName(NAMESPACE, "MockService");
AxisBuilder builder = new AxisBuilder(null);
- Object reference = builder.createService(MockService.class, schemaInfoBuilder, mapping, serviceQName, SOAPConstants.SOAP11_CONSTANTS, handlerInfos, gerServiceRefType, module, isolatedCl);
+ Object reference = builder.createService(MockService.class, schemaInfoBuilder, mapping, serviceQName, SOAPConstants.SOAP11_CONSTANTS, handlerInfos, gerServiceRefType, module, bundleContext.getBundle());
assertNotNull(reference);
assertTrue(reference instanceof AxisServiceReference);
AxisServiceReference claReference = (AxisServiceReference) reference;
@@ -199,7 +202,7 @@
JavaWsdlMappingType mapping = mappingDocument.getJavaWsdlMapping();
QName serviceQName = new QName("http://www.Monson-Haefel.com/jwsbook/BookQuote", "BookQuoteService");
AxisBuilder builder = new AxisBuilder(null);
- Object reference = builder.createService(BookQuoteService.class, schemaInfoBuilder, mapping, serviceQName, SOAPConstants.SOAP11_CONSTANTS, handlerInfos, gerServiceRefType, module, isolatedCl);
+ Object reference = builder.createService(BookQuoteService.class, schemaInfoBuilder, mapping, serviceQName, SOAPConstants.SOAP11_CONSTANTS, handlerInfos, gerServiceRefType, module, bundleContext.getBundle());
assertNotNull(reference);
assertTrue(reference instanceof AxisServiceReference);
AxisServiceReference claReference = (AxisServiceReference) reference;
@@ -221,7 +224,7 @@
JavaWsdlMappingType mapping = mappingDocument.getJavaWsdlMapping();
QName serviceQName = new QName("http://tempuri.org/4s4c/1/3/wsdl/def/interopLab", "interopLab");
AxisBuilder builder = new AxisBuilder(null);
- Object proxy = builder.createService(InteropLab.class, schemaInfoBuilder, mapping, serviceQName, SOAPConstants.SOAP11_CONSTANTS, handlerInfos, gerServiceRefType, module, isolatedCl);
+ Object proxy = builder.createService(InteropLab.class, schemaInfoBuilder, mapping, serviceQName, SOAPConstants.SOAP11_CONSTANTS, handlerInfos, gerServiceRefType, module, bundleContext.getBundle());
assertNotNull(proxy);
assertTrue(proxy instanceof InteropLab);
InteropTestPortType interopTestPort = ((InteropLab) proxy).getinteropTestPort();
Added: geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/test/resources/commons-logging.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/test/resources/commons-logging.properties?rev=893824&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/test/resources/commons-logging.properties (added)
+++ geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/test/resources/commons-logging.properties Thu Dec 24 23:26:43 2009
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# axis has constants from commons-logging 1.0.4 compiled into it. Since we want to use pax-logging
+# we need to specify the commons-logging implementation.
+org.apache.commons.logging.LogFactory=org.apache.commons.logging.LogFactory
\ No newline at end of file
Propchange: geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/test/resources/commons-logging.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/test/resources/commons-logging.properties
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/test/resources/commons-logging.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/server/trunk/plugins/axis/geronimo-axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/geronimo-axis/pom.xml?rev=893824&r1=893823&r2=893824&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/geronimo-axis/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/geronimo-axis/pom.xml Thu Dec 24 23:26:43 2009
@@ -66,9 +66,11 @@
<type>car</type>
</dependency>
+ <!-- not sure about the scope -->
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-axis</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -95,12 +97,12 @@
</dependency>
<dependency>
- <groupId>asm</groupId>
+ <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>asm</artifactId>
</dependency>
<dependency>
- <groupId>axis</groupId>
+ <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>axis</artifactId>
</dependency>
@@ -114,6 +116,23 @@
<artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+
+ <Import-Package>
+ org.apache.openejb*;resolution:=optional,
+ *</Import-Package>
+ <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: geronimo/server/trunk/plugins/axis/geronimo-axis/src/main/java/org/apache/geronimo/axis/AxisDiscoveryCLWorkaroundGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/geronimo-axis/src/main/java/org/apache/geronimo/axis/AxisDiscoveryCLWorkaroundGBean.java?rev=893824&r1=893823&r2=893824&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/geronimo-axis/src/main/java/org/apache/geronimo/axis/AxisDiscoveryCLWorkaroundGBean.java (original)
+++ geronimo/server/trunk/plugins/axis/geronimo-axis/src/main/java/org/apache/geronimo/axis/AxisDiscoveryCLWorkaroundGBean.java Thu Dec 24 23:26:43 2009
@@ -19,6 +19,7 @@
import org.apache.axis.AxisProperties;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.commons.discovery.tools.DiscoverSingleton;
/**
* @version $Rev$ $Date$
@@ -30,6 +31,11 @@
ClassLoader oldClassLoader = currentThread.getContextClassLoader();
currentThread.setContextClassLoader(classLoader);
try {
+ //set up log
+ DiscoverSingleton.find(org.apache.commons.logging.LogFactory.class,
+ "commons-logging.properties",//org.apache.commons.logging.LogFactory.FACTORY_PROPERTIES,
+ "org.apache.commons.logging.LogFactory");//org.apache.commons.logging.LogFactory.FACTORY_DEFAULT);
+
//this sets the classloaders used in discovery. One is the current TCCL.
AxisProperties.getNameDiscoverer();
} finally {
Modified: geronimo/server/trunk/plugins/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/pom.xml?rev=893824&r1=893823&r2=893824&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/pom.xml Thu Dec 24 23:26:43 2009
@@ -15,10 +15,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<!-- $Rev$ $Date$ -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -41,6 +40,47 @@
<module>axis-deployer</module>
<module>geronimo-axis</module>
<module>geronimo-axis-builder</module>
+ <module>axis-jetty-server</module>
</modules>
-</project>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>framework</artifactId>
+ <version>${version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>axis</artifactId>
+ <version>1.4_1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.scout</groupId>
+ <artifactId>scout</artifactId>
+ <version>1.2.1-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>uddi-ws</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>uddi-ws</artifactId>
+ <version>3.0.1-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+</project>
\ No newline at end of file
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java?rev=893824&r1=893823&r2=893824&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java Thu Dec 24 23:26:43 2009
@@ -53,6 +53,7 @@
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
+import org.osgi.framework.Bundle;
/**
* @version $Rev$ $Date$
@@ -245,13 +246,13 @@
return ENCConfigBuilder.buildAbstractNameQuery(configId, module, name, type, moduleType);
}
- public static Class assureInterface(String interfaceName, String superInterfaceName, String interfaceType, ClassLoader cl) throws DeploymentException {
+ public static Class assureInterface(String interfaceName, String superInterfaceName, String interfaceType, Bundle bundle) throws DeploymentException {
if (interfaceName == null || interfaceName.equals("")) {
throw new DeploymentException("interface name cannot be blank");
}
Class clazz;
try {
- clazz = cl.loadClass(interfaceName);
+ clazz = bundle.loadClass(interfaceName);
} catch (ClassNotFoundException e) {
throw new DeploymentException(interfaceType + " interface class not found: " + interfaceName, e);
}
@@ -260,7 +261,7 @@
}
Class superInterface;
try {
- superInterface = cl.loadClass(superInterfaceName);
+ superInterface = bundle.loadClass(superInterfaceName);
} catch (ClassNotFoundException e) {
throw new DeploymentException("Class " + superInterfaceName + " could not be loaded", e);
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java?rev=893824&r1=893823&r2=893824&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java Thu Dec 24 23:26:43 2009
@@ -19,17 +19,14 @@
import java.lang.reflect.Field;
import java.lang.reflect.Method;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.HashMap;
-import java.util.ArrayList;
import javax.annotation.Resource;
import javax.xml.namespace.QName;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.GBeanLifecycle;
@@ -46,9 +43,10 @@
import org.apache.geronimo.xbeans.javaee.InjectionTargetType;
import org.apache.geronimo.xbeans.javaee.JndiNameType;
import org.apache.geronimo.xbeans.javaee.XsdStringType;
-import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
import org.apache.xmlbeans.QNameSet;
import org.apache.xmlbeans.XmlObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Rev$ $Date$
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=893824&r1=893823&r2=893824&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 Thu Dec 24 23:26:43 2009
@@ -25,16 +25,12 @@
import javax.annotation.Resource;
import javax.xml.namespace.QName;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.service.EnvironmentBuilder;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.j2ee.deployment.Module;
import org.apache.geronimo.j2ee.deployment.annotation.AnnotatedApp;
-import org.apache.geronimo.j2ee.deployment.annotation.HandlerChainAnnotationHelper;
import org.apache.geronimo.j2ee.deployment.annotation.ResourceAnnotationHelper;
import org.apache.geronimo.j2ee.deployment.annotation.WebServiceRefAnnotationHelper;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
@@ -50,6 +46,8 @@
import org.apache.xmlbeans.QNameSet;
import org.apache.xmlbeans.XmlObject;
import org.osgi.framework.Bundle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SwitchingServiceRefBuilder extends AbstractNamingBuilder {
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java?rev=893824&r1=893823&r2=893824&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java Thu Dec 24 23:26:43 2009
@@ -133,22 +133,22 @@
// Remote
if (remoteBean.getRemote() != null) {
String remoteInterfaceName = remoteBean.getRemote();
- assureEJBObjectInterface(remoteInterfaceName, ejbModule.getClassLoader());
+ assureEJBObjectInterface(remoteInterfaceName, earContext.getDeploymentBundle());
gbean.setAttribute(EjbInterface.REMOTE.getAttributeName(), remoteInterfaceName);
String homeInterfaceName = remoteBean.getHome();
- assureEJBHomeInterface(homeInterfaceName, ejbModule.getClassLoader());
+ assureEJBHomeInterface(homeInterfaceName, earContext.getDeploymentBundle());
gbean.setAttribute(EjbInterface.HOME.getAttributeName(), homeInterfaceName);
}
// Local
if (remoteBean.getLocal() != null) {
String localInterfaceName = remoteBean.getLocal();
- assureEJBLocalObjectInterface(localInterfaceName, ejbModule.getClassLoader());
+ assureEJBLocalObjectInterface(localInterfaceName, earContext.getDeploymentBundle());
gbean.setAttribute(EjbInterface.LOCAL.getAttributeName(), localInterfaceName);
String localHomeInterfaceName = remoteBean.getLocalHome();
- assureEJBLocalHomeInterface(localHomeInterfaceName, ejbModule.getClassLoader());
+ assureEJBLocalHomeInterface(localHomeInterfaceName, earContext.getDeploymentBundle());
gbean.setAttribute(EjbInterface.LOCAL_HOME.getAttributeName(), localHomeInterfaceName);
}
@@ -447,19 +447,19 @@
return gbean;
}
- private static Class assureEJBObjectInterface(String remote, ClassLoader cl) throws DeploymentException {
- return AbstractNamingBuilder.assureInterface(remote, "javax.ejb.EJBObject", "Remote", cl);
+ private static Class assureEJBObjectInterface(String remote, Bundle bundle) throws DeploymentException {
+ return AbstractNamingBuilder.assureInterface(remote, "javax.ejb.EJBObject", "Remote", bundle);
}
- private static Class assureEJBHomeInterface(String home, ClassLoader cl) throws DeploymentException {
- return AbstractNamingBuilder.assureInterface(home, "javax.ejb.EJBHome", "Home", cl);
+ private static Class assureEJBHomeInterface(String home, Bundle bundle) throws DeploymentException {
+ return AbstractNamingBuilder.assureInterface(home, "javax.ejb.EJBHome", "Home", bundle);
}
- public static Class assureEJBLocalObjectInterface(String local, ClassLoader cl) throws DeploymentException {
- return AbstractNamingBuilder.assureInterface(local, "javax.ejb.EJBLocalObject", "Local", cl);
+ public static Class assureEJBLocalObjectInterface(String local, Bundle bundle) throws DeploymentException {
+ return AbstractNamingBuilder.assureInterface(local, "javax.ejb.EJBLocalObject", "Local", bundle);
}
- public static Class assureEJBLocalHomeInterface(String localHome, ClassLoader cl) throws DeploymentException {
- return AbstractNamingBuilder.assureInterface(localHome, "javax.ejb.EJBLocalHome", "LocalHome", cl);
+ public static Class assureEJBLocalHomeInterface(String localHome, Bundle bundle) throws DeploymentException {
+ return AbstractNamingBuilder.assureInterface(localHome, "javax.ejb.EJBLocalHome", "LocalHome", bundle);
}
}
Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=893824&r1=893823&r2=893824&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Thu Dec 24 23:26:43 2009
@@ -101,7 +101,7 @@
<module>system-database</module>
<module>activemq</module>
<module>aspectj</module>
- <!--<module>axis</module>-->
+ <module>axis</module>
<module>axis2</module>
<module>client</module>
<module>clustering</module>
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java?rev=893824&r1=893823&r2=893824&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java Thu Dec 24 23:26:43 2009
@@ -226,63 +226,63 @@
private final Object instanceListenersLock = new Object();
private final Object wrapperLifecyclesLock = new Object();
private final Object wrapperListenersLock = new Object();
- public Wrapper createWrapper() {
-
- Wrapper wrapper = null;
- if (getWrapperClass() != null) {
- try {
- wrapper = (Wrapper) getInstanceManager().newInstance(getWrapperClass());
- } catch (Throwable t) {
- getLogger().error("createWrapper", t);
- return (null);
- }
- } else {
- wrapper = new StandardWrapper();
- }
-
- synchronized (instanceListenersLock) {
- for (String instanceListener: findInstanceListeners()) {
- try {
- InstanceListener listener =
- (InstanceListener) getInstanceManager().newInstance(instanceListener);
- wrapper.addInstanceListener(listener);
- } catch (Throwable t) {
- getLogger().error("createWrapper", t);
- return (null);
- }
- }
- }
-
- synchronized (wrapperLifecyclesLock) {
- for (String wrapperLifecycle: findWrapperLifecycles()) {
- try {
- LifecycleListener listener =
- (LifecycleListener) getInstanceManager().newInstance(wrapperLifecycle);
- if (wrapper instanceof Lifecycle)
- ((Lifecycle) wrapper).addLifecycleListener(listener);
- } catch (Throwable t) {
- getLogger().error("createWrapper", t);
- return (null);
- }
- }
- }
-
- synchronized (wrapperListenersLock) {
- for (String wrapperListener: findWrapperListeners()) {
- try {
- ContainerListener listener =
- (ContainerListener) getInstanceManager().newInstance(wrapperListener);
- wrapper.addContainerListener(listener);
- } catch (Throwable t) {
- getLogger().error("createWrapper", t);
- return (null);
- }
- }
- }
-
- return (wrapper);
-
- }
+// public Wrapper createWrapper() {
+//
+// Wrapper wrapper = null;
+// if (getWrapperClass() != null) {
+// try {
+// wrapper = (Wrapper) getInstanceManager().newInstance(getWrapperClass());
+// } catch (Throwable t) {
+// getLogger().error("createWrapper", t);
+// return (null);
+// }
+// } else {
+// wrapper = new StandardWrapper();
+// }
+//
+// synchronized (instanceListenersLock) {
+// for (String instanceListener: findInstanceListeners()) {
+// try {
+// InstanceListener listener =
+// (InstanceListener) getInstanceManager().newInstance(instanceListener);
+// wrapper.addInstanceListener(listener);
+// } catch (Throwable t) {
+// getLogger().error("createWrapper", t);
+// return (null);
+// }
+// }
+// }
+//
+// synchronized (wrapperLifecyclesLock) {
+// for (String wrapperLifecycle: findWrapperLifecycles()) {
+// try {
+// LifecycleListener listener =
+// (LifecycleListener) getInstanceManager().newInstance(wrapperLifecycle);
+// if (wrapper instanceof Lifecycle)
+// ((Lifecycle) wrapper).addLifecycleListener(listener);
+// } catch (Throwable t) {
+// getLogger().error("createWrapper", t);
+// return (null);
+// }
+// }
+// }
+//
+// synchronized (wrapperListenersLock) {
+// for (String wrapperListener: findWrapperListeners()) {
+// try {
+// ContainerListener listener =
+// (ContainerListener) getInstanceManager().newInstance(wrapperListener);
+// wrapper.addContainerListener(listener);
+// } catch (Throwable t) {
+// getLogger().error("createWrapper", t);
+// return (null);
+// }
+// }
+// }
+//
+// return (wrapper);
+//
+// }
/* This method is called by a background thread to destroy sessions (among other things)
* so we need to apply appropriate context to the thread to expose JNDI, etc.
*/