You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2008/08/26 19:00:55 UTC
svn commit: r689135 - in /geronimo/server/trunk: ./ plugins/axis2/axis2/
plugins/axis2/axis2/src/main/history/
plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/
plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/cl...
Author: gawor
Date: Tue Aug 26 10:00:52 2008
New Revision: 689135
URL: http://svn.apache.org/viewvc?rev=689135&view=rev
Log:
Upgrade to CXF 2.1.x and refactor HandlerResolver code (GERONIMO-4263)
Added:
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/AnnotationHandlerChainBuilder.java (contents, props changed)
- copied, changed from r688776, geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AnnotationHandlerChainBuilder.java
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/GeronimoHandlerChainBuilder.java (contents, props changed)
- copied, changed from r688776, geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/GeronimoHandlerChainBuilder.java
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/GeronimoHandlerResolver.java
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/java/
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/java/org/
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/java/org/apache/
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/java/org/apache/geronimo/
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/java/org/apache/geronimo/jaxws/
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/java/org/apache/geronimo/jaxws/handler/
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/java/org/apache/geronimo/jaxws/handler/GeronimoHandlerResolverTest.java
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/java/org/apache/geronimo/jaxws/handler/TestHandler.java (contents, props changed)
- copied, changed from r688776, geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/TestHandler.java
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers.xml (contents, props changed)
- copied, changed from r688776, geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/resources/handlers.xml
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers_bindings.xml (contents, props changed)
- copied, changed from r688776, geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/resources/handlers_bindings.xml
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers_mixed.xml (contents, props changed)
- copied, changed from r688776, geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/resources/handlers_mixed.xml
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers_port.xml (contents, props changed)
- copied, changed from r688776, geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/resources/handlers_port.xml
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers_service.xml (contents, props changed)
- copied, changed from r688776, geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/resources/handlers_service.xml
Removed:
geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AnnotationHandlerChainBuilder.java
geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2HandlerResolver.java
geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/GeronimoHandlerChainBuilder.java
geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/Axis2HandlerResolverTest.java
geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/TestHandler.java
geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/resources/handlers.xml
geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/resources/handlers_bindings.xml
geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/resources/handlers_mixed.xml
geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/resources/handlers_port.xml
geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/resources/handlers_service.xml
geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFHandlerResolver.java
geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoHandlerChainBuilder.java
geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/test/java/org/apache/geronimo/cxf/CXFHandlerResolverTest.java
geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/test/java/org/apache/geronimo/cxf/TestHandler.java
geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/test/resources/handlers.xml
geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/test/resources/handlers_bindings.xml
geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/test/resources/handlers_mixed.xml
geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/test/resources/handlers_port.xml
geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/test/resources/handlers_service.xml
Modified:
geronimo/server/trunk/plugins/axis2/axis2/pom.xml
geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/WSDLQueryHandler.java
geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ServiceReference.java
geronimo/server/trunk/plugins/cxf/cxf/pom.xml
geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java
geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoQueryHandler.java
geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/client/CXFServiceReference.java
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/HandlerChainsUtils.java
geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml
geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/plugins/axis2/axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/pom.xml?rev=689135&r1=689134&r2=689135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2/pom.xml Tue Aug 26 10:00:52 2008
@@ -81,11 +81,6 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.schema</groupId>
- <artifactId>geronimo-schema-jee_5</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-java2wsdl</artifactId>
</dependency>
Modified: geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml?rev=689135&r1=689134&r2=689135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml Tue Aug 26 10:00:52 2008
@@ -32,11 +32,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.schema</groupId>
- <artifactId>geronimo-schema-jee_5</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>annogen</groupId>
<artifactId>annogen</artifactId>
<type>jar</type>
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/WSDLQueryHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/WSDLQueryHandler.java?rev=689135&r1=689134&r2=689135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/WSDLQueryHandler.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/WSDLQueryHandler.java Tue Aug 26 10:00:52 2008
@@ -58,7 +58,6 @@
import org.apache.axis2.description.AxisService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.geronimo.webservices.WebServiceContainer.Request;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ServiceReference.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ServiceReference.java?rev=689135&r1=689134&r2=689135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ServiceReference.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ServiceReference.java Tue Aug 26 10:00:52 2008
@@ -26,22 +26,21 @@
import org.apache.axis2.jaxws.context.WebServiceContextImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.geronimo.axis2.Axis2HandlerResolver;
import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.jaxws.HandlerChainsUtils;
import org.apache.geronimo.jaxws.JAXWSAnnotationProcessor;
import org.apache.geronimo.jaxws.JNDIResolver;
import org.apache.geronimo.jaxws.client.EndpointInfo;
import org.apache.geronimo.jaxws.client.JAXWSServiceReference;
import org.apache.geronimo.jaxws.client.PortMethodInterceptor;
-import org.apache.geronimo.xbeans.javaee.HandlerChainsDocument;
+import org.apache.geronimo.jaxws.handler.GeronimoHandlerResolver;
import org.apache.geronimo.xbeans.javaee.HandlerChainsType;
-import org.apache.xmlbeans.XmlException;
/**
* @version $Rev$ $Date$
*/
-public class Axis2ServiceReference extends JAXWSServiceReference
-{
+public class Axis2ServiceReference extends JAXWSServiceReference {
+
private static final Logger LOG = LoggerFactory.getLogger(Axis2ServiceReference.class);
public Axis2ServiceReference(String serviceClassName,
@@ -54,23 +53,21 @@
super(handlerChainsXML, seiInfoMap, name, serviceQName, wsdlURI, referenceClassName, serviceClassName);
}
- protected HandlerResolver getHandlerResolver(Class serviceClass) {
+ protected HandlerChainsType getHandlerChains() {
HandlerChainsType types = null;
try {
- if (this.handlerChainsXML != null){
- try {
- types = HandlerChainsDocument.Factory.parse(this.handlerChainsXML).getHandlerChains();
- } catch (XmlException e){
- types = HandlerChainsType.Factory.parse(this.handlerChainsXML);
- }
- }
+ types = HandlerChainsUtils.getHandlerChains(this.handlerChainsXML);
} catch (Exception e) {
LOG.warn("Failed to deserialize handler chains", e);
}
+ return types;
+ }
+
+ protected HandlerResolver getHandlerResolver(Class serviceClass) {
JAXWSAnnotationProcessor annotationProcessor =
new JAXWSAnnotationProcessor(new JNDIResolver(), new WebServiceContextImpl());
- Axis2HandlerResolver handlerResolver =
- new Axis2HandlerResolver(classLoader, serviceClass, types, annotationProcessor);
+ GeronimoHandlerResolver handlerResolver =
+ new GeronimoHandlerResolver(classLoader, serviceClass, getHandlerChains(), annotationProcessor);
return handlerResolver;
}
Modified: geronimo/server/trunk/plugins/cxf/cxf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf/pom.xml?rev=689135&r1=689134&r2=689135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf/pom.xml Tue Aug 26 10:00:52 2008
@@ -128,6 +128,10 @@
<artifactId>cxf-tools-common</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-addr</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.ws.commons.schema</groupId>
<artifactId>XmlSchema</artifactId>
<version>1.4.2</version>
Modified: geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml?rev=689135&r1=689134&r2=689135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml Tue Aug 26 10:00:52 2008
@@ -8,6 +8,11 @@
</module-id>
<dependency>
<groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-addr</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java?rev=689135&r1=689134&r2=689135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java Tue Aug 26 10:00:52 2008
@@ -37,14 +37,16 @@
import org.apache.cxf.endpoint.ServerImpl;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.jaxws.handler.PortInfoImpl;
-import org.apache.cxf.jaxws.javaee.HandlerChainsType;
import org.apache.cxf.jaxws.support.JaxWsEndpointImpl;
import org.apache.cxf.jaxws.support.JaxWsImplementorInfo;
import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean;
import org.apache.cxf.service.Service;
+import org.apache.geronimo.jaxws.HandlerChainsUtils;
import org.apache.geronimo.jaxws.PortInfo;
import org.apache.geronimo.jaxws.annotations.AnnotationException;
import org.apache.geronimo.jaxws.annotations.AnnotationProcessor;
+import org.apache.geronimo.jaxws.handler.GeronimoHandlerResolver;
+import org.apache.geronimo.xbeans.javaee.HandlerChainsType;
public abstract class CXFEndpoint extends Endpoint {
@@ -214,12 +216,13 @@
* Set appropriate handlers for the port/service/bindings.
*/
protected void initHandlers() throws Exception {
- HandlerChainsType handlerChains = this.portInfo.getHandlers(HandlerChainsType.class);
- CXFHandlerResolver handlerResolver =
- new CXFHandlerResolver(getImplementorClass().getClassLoader(),
- getImplementorClass(),
- handlerChains,
- null);
+ HandlerChainsType handlerChains =
+ HandlerChainsUtils.getHandlerChains(this.portInfo.getHandlersAsXML());
+ GeronimoHandlerResolver handlerResolver =
+ new GeronimoHandlerResolver(getImplementorClass().getClassLoader(),
+ getImplementorClass(),
+ handlerChains,
+ null);
PortInfoImpl portInfo = new PortInfoImpl(implInfo.getBindingType(),
serviceFactory.getEndpointName(),
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoQueryHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoQueryHandler.java?rev=689135&r1=689134&r2=689135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoQueryHandler.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoQueryHandler.java Tue Aug 26 10:00:52 2008
@@ -24,18 +24,16 @@
import javax.wsdl.Definition;
import javax.wsdl.Port;
import javax.wsdl.Service;
-import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.extensions.schema.SchemaReference;
+import javax.wsdl.extensions.soap.SOAPAddress;
+import javax.wsdl.extensions.soap12.SOAP12Address;
import javax.xml.namespace.QName;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.cxf.Bus;
import org.apache.cxf.service.model.EndpointInfo;
-import org.apache.cxf.tools.common.extensions.soap.SoapAddress;
-import org.apache.cxf.tools.util.SOAPBindingUtil;
import org.apache.cxf.transport.http.WSDLQueryHandler;
-import org.xmlsoap.schemas.wsdl.http.AddressType;
public class GeronimoQueryHandler extends WSDLQueryHandler {
@@ -122,15 +120,13 @@
private void updatePortLocation(Port port,
String baseUri) {
List<?> exts = port.getExtensibilityElements();
- if (exts != null && exts.size() > 0) {
- ExtensibilityElement el = (ExtensibilityElement) exts.get(0);
- if (SOAPBindingUtil.isSOAPAddress(el)) {
- SoapAddress add = SOAPBindingUtil.getSoapAddress(el);
- add.setLocationURI(baseUri);
- }
- if (el instanceof AddressType) {
- AddressType add = (AddressType) el;
- add.setLocation(baseUri);
+ if (exts != null) {
+ for (Object extension : exts) {
+ if (extension instanceof SOAP12Address) {
+ ((SOAP12Address)extension).setLocationURI(baseUri);
+ } else if (extension instanceof SOAPAddress) {
+ ((SOAPAddress)extension).setLocationURI(baseUri);
+ }
}
}
}
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/client/CXFServiceReference.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/client/CXFServiceReference.java?rev=689135&r1=689134&r2=689135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/client/CXFServiceReference.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/client/CXFServiceReference.java Tue Aug 26 10:00:52 2008
@@ -21,15 +21,12 @@
import java.util.Map;
import javax.naming.NamingException;
-import javax.xml.bind.JAXBException;
import javax.xml.namespace.QName;
import javax.xml.ws.handler.HandlerResolver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.cxf.jaxws.context.WebServiceContextImpl;
-import org.apache.cxf.jaxws.javaee.HandlerChainsType;
-import org.apache.geronimo.cxf.CXFHandlerResolver;
import org.apache.geronimo.cxf.CXFWebServiceContainer;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.jaxws.HandlerChainsUtils;
@@ -37,6 +34,8 @@
import org.apache.geronimo.jaxws.JNDIResolver;
import org.apache.geronimo.jaxws.client.EndpointInfo;
import org.apache.geronimo.jaxws.client.JAXWSServiceReference;
+import org.apache.geronimo.jaxws.handler.GeronimoHandlerResolver;
+import org.apache.geronimo.xbeans.javaee.HandlerChainsType;
public class CXFServiceReference extends JAXWSServiceReference {
@@ -60,20 +59,20 @@
}
protected HandlerChainsType getHandlerChains() {
+ HandlerChainsType types = null;
try {
- return HandlerChainsUtils.toHandlerChains(this.handlerChainsXML, HandlerChainsType.class);
- } catch (JAXBException e) {
- // this should not happen
+ types = HandlerChainsUtils.getHandlerChains(this.handlerChainsXML);
+ } catch (Exception e) {
LOG.warn("Failed to deserialize handler chains", e);
- return null;
}
+ return types;
}
protected HandlerResolver getHandlerResolver(Class serviceClass) {
JAXWSAnnotationProcessor annotationProcessor =
new JAXWSAnnotationProcessor(new JNDIResolver(), new WebServiceContextImpl());
- CXFHandlerResolver handlerResolver =
- new CXFHandlerResolver(classLoader, serviceClass, getHandlerChains(), annotationProcessor);
+ GeronimoHandlerResolver handlerResolver =
+ new GeronimoHandlerResolver(classLoader, serviceClass, getHandlerChains(), annotationProcessor);
return handlerResolver;
}
}
Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml?rev=689135&r1=689134&r2=689135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml Tue Aug 26 10:00:52 2008
@@ -80,6 +80,11 @@
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.schema</groupId>
+ <artifactId>geronimo-schema-jee_5</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/HandlerChainsUtils.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/HandlerChainsUtils.java?rev=689135&r1=689134&r2=689135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/HandlerChainsUtils.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/HandlerChainsUtils.java Tue Aug 26 10:00:52 2008
@@ -24,6 +24,10 @@
import javax.xml.bind.Unmarshaller;
import javax.xml.transform.stream.StreamSource;
+import org.apache.geronimo.xbeans.javaee.HandlerChainsDocument;
+import org.apache.geronimo.xbeans.javaee.HandlerChainsType;
+import org.apache.xmlbeans.XmlException;
+
public class HandlerChainsUtils {
private HandlerChainsUtils() {
@@ -42,5 +46,17 @@
}
return handlerChains;
}
+
+ public static HandlerChainsType getHandlerChains(String xml) throws XmlException {
+ HandlerChainsType types = null;
+ if (xml != null) {
+ try {
+ types = HandlerChainsDocument.Factory.parse(xml).getHandlerChains();
+ } catch (XmlException e){
+ types = HandlerChainsType.Factory.parse(xml);
+ }
+ }
+ return types;
+ }
}
Copied: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/AnnotationHandlerChainBuilder.java (from r688776, geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AnnotationHandlerChainBuilder.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/AnnotationHandlerChainBuilder.java?p2=geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/AnnotationHandlerChainBuilder.java&p1=geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AnnotationHandlerChainBuilder.java&r1=688776&r2=689135&rev=689135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AnnotationHandlerChainBuilder.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/AnnotationHandlerChainBuilder.java Tue Aug 26 10:00:52 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.geronimo.axis2;
+package org.apache.geronimo.jaxws.handler;
import java.net.URL;
import java.util.ArrayList;
Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/AnnotationHandlerChainBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/AnnotationHandlerChainBuilder.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/GeronimoHandlerChainBuilder.java (from r688776, geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/GeronimoHandlerChainBuilder.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/GeronimoHandlerChainBuilder.java?p2=geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/GeronimoHandlerChainBuilder.java&p1=geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/GeronimoHandlerChainBuilder.java&r1=688776&r2=689135&rev=689135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/GeronimoHandlerChainBuilder.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/GeronimoHandlerChainBuilder.java Tue Aug 26 10:00:52 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.geronimo.axis2;
+package org.apache.geronimo.jaxws.handler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/GeronimoHandlerChainBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/GeronimoHandlerChainBuilder.java
------------------------------------------------------------------------------
svn:mergeinfo =
Added: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/GeronimoHandlerResolver.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/GeronimoHandlerResolver.java?rev=689135&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/GeronimoHandlerResolver.java (added)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/GeronimoHandlerResolver.java Tue Aug 26 10:00:52 2008
@@ -0,0 +1,86 @@
+/**
+ * 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.
+ */
+
+package org.apache.geronimo.jaxws.handler;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.Handler;
+import javax.xml.ws.handler.HandlerResolver;
+
+import org.apache.geronimo.jaxws.annotations.AnnotationException;
+import org.apache.geronimo.jaxws.annotations.AnnotationProcessor;
+import org.apache.geronimo.jaxws.handler.GeronimoHandlerChainBuilder;
+import org.apache.geronimo.xbeans.javaee.HandlerChainType;
+import org.apache.geronimo.xbeans.javaee.HandlerChainsType;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class GeronimoHandlerResolver implements HandlerResolver {
+
+ private HandlerChainsType handlerChains;
+
+ private ClassLoader classLoader;
+
+ private Class serviceClass;
+
+ private AnnotationProcessor annotationProcessor;
+
+ public GeronimoHandlerResolver(ClassLoader classLoader,
+ Class serviceClass,
+ HandlerChainsType handlerChains,
+ AnnotationProcessor annotationProcessor) {
+ this.classLoader = classLoader;
+ this.serviceClass = serviceClass;
+ this.handlerChains = handlerChains;
+ this.annotationProcessor = annotationProcessor;
+ }
+
+ public List<Handler> getHandlerChain(javax.xml.ws.handler.PortInfo portInfo) {
+
+ GeronimoHandlerChainBuilder builder =
+ new GeronimoHandlerChainBuilder(this.classLoader, portInfo);
+
+ List<Handler> handlers = null;
+ if (this.handlerChains == null) {
+ handlers = builder.buildHandlerChainFromClass(this.serviceClass);
+ } else {
+ handlers = new ArrayList<Handler>();
+ for (HandlerChainType handlerChain : this.handlerChains.getHandlerChainArray()) {
+ handlers.addAll(builder.buildHandlerChainFromConfiguration(handlerChain));
+ }
+ handlers = builder.sortHandlers(handlers);
+ }
+
+ if (this.annotationProcessor != null) {
+ try {
+ for (Handler handler : handlers) {
+ this.annotationProcessor.processAnnotations(handler);
+ this.annotationProcessor.invokePostConstruct(handler);
+ }
+ } catch (AnnotationException e) {
+ throw new WebServiceException("Handler annotation failed", e);
+ }
+ }
+
+ return handlers;
+ }
+
+}
Added: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/java/org/apache/geronimo/jaxws/handler/GeronimoHandlerResolverTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/java/org/apache/geronimo/jaxws/handler/GeronimoHandlerResolverTest.java?rev=689135&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/java/org/apache/geronimo/jaxws/handler/GeronimoHandlerResolverTest.java (added)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/java/org/apache/geronimo/jaxws/handler/GeronimoHandlerResolverTest.java Tue Aug 26 10:00:52 2008
@@ -0,0 +1,201 @@
+/**
+ * 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.
+ */
+package org.apache.geronimo.jaxws.handler;
+
+import org.apache.geronimo.testsupport.TestSupport;
+import org.apache.geronimo.xbeans.javaee.HandlerChainsDocument;
+import org.apache.geronimo.xbeans.javaee.HandlerChainsType;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.handler.Handler;
+import javax.xml.ws.handler.PortInfo;
+import java.io.InputStream;
+import java.util.List;
+
+public class GeronimoHandlerResolverTest extends TestSupport {
+
+ public void testBasic() throws Exception {
+ InputStream in = getClass().getResourceAsStream("/handlers.xml");
+ assertTrue(in != null);
+ HandlerChainsType handlerChains = toHandlerChains(in);
+ assertEquals(3, handlerChains.getHandlerChainArray().length);
+
+ GeronimoHandlerResolver resolver =
+ new GeronimoHandlerResolver(getClass().getClassLoader(), getClass(), handlerChains, null);
+
+ List<Handler> handlers = null;
+
+ handlers = resolver.getHandlerChain(new TestPortInfo(null, null, null));
+ assertEquals(3, handlers.size());
+ }
+
+ public void testServiceMatching() throws Exception {
+ InputStream in = getClass().getResourceAsStream("/handlers_service.xml");
+ assertTrue(in != null);
+ HandlerChainsType handlerChains = toHandlerChains(in);
+ assertEquals(3, handlerChains.getHandlerChainArray().length);
+
+ GeronimoHandlerResolver resolver =
+ new GeronimoHandlerResolver(getClass().getClassLoader(), getClass(), handlerChains, null);
+
+ List<Handler> handlers = null;
+
+ handlers = resolver.getHandlerChain(new TestPortInfo(null, null, null));
+ assertEquals(0, handlers.size());
+
+ QName serviceName1 = new QName("http://foo", "Bar");
+ handlers = resolver.getHandlerChain(new TestPortInfo(null, null, serviceName1));
+ assertEquals(1, handlers.size());
+
+ QName serviceName2 = new QName("http://foo", "Foo");
+ handlers = resolver.getHandlerChain(new TestPortInfo(null, null, serviceName2));
+ assertEquals(2, handlers.size());
+
+ QName serviceName3 = new QName("http://foo", "FooBar");
+ handlers = resolver.getHandlerChain(new TestPortInfo(null, null, serviceName3));
+ assertEquals(1, handlers.size());
+
+ QName serviceName4 = new QName("http://foo", "BarFoo");
+ handlers = resolver.getHandlerChain(new TestPortInfo(null, null, serviceName4));
+ assertEquals(0, handlers.size());
+ }
+
+ public void testBindingMatching() throws Exception {
+ InputStream in = getClass().getResourceAsStream("/handlers_bindings.xml");
+ assertTrue(in != null);
+ HandlerChainsType handlerChains = toHandlerChains(in);
+ assertEquals(4, handlerChains.getHandlerChainArray().length);
+
+ GeronimoHandlerResolver resolver =
+ new GeronimoHandlerResolver(getClass().getClassLoader(), getClass(), handlerChains, null);
+
+ List<Handler> handlers = null;
+
+ handlers = resolver.getHandlerChain(new TestPortInfo(null, null, null));
+ assertEquals(0, handlers.size());
+
+ handlers = resolver.getHandlerChain(new TestPortInfo("http://foobar", null, null));
+ assertEquals(0, handlers.size());
+
+ handlers = resolver.getHandlerChain(new TestPortInfo("##SOAP12_HTTP", null, null));
+ assertEquals(0, handlers.size());
+
+ handlers = resolver.getHandlerChain(new TestPortInfo("##SOAP11_HTTP", null, null));
+ assertEquals(2, handlers.size());
+
+ handlers = resolver.getHandlerChain(new TestPortInfo("http://schemas.xmlsoap.org/wsdl/soap/http", null, null));
+ assertEquals(2, handlers.size());
+
+ handlers = resolver.getHandlerChain(new TestPortInfo("##SOAP11_HTTP_MTOM", null, null));
+ assertEquals(1, handlers.size());
+
+ handlers = resolver.getHandlerChain(new TestPortInfo("##XML_HTTP", null, null));
+ assertEquals(2, handlers.size());
+ }
+
+ public void testPortMatching() throws Exception {
+ InputStream in = getClass().getResourceAsStream("/handlers_port.xml");
+ assertTrue(in != null);
+ HandlerChainsType handlerChains = toHandlerChains(in);
+ assertEquals(3, handlerChains.getHandlerChainArray().length);
+
+ GeronimoHandlerResolver resolver =
+ new GeronimoHandlerResolver(getClass().getClassLoader(), getClass(), handlerChains, null);
+
+ List<Handler> handlers = null;
+
+ handlers = resolver.getHandlerChain(new TestPortInfo(null, null, null));
+ assertEquals(0, handlers.size());
+
+ QName portName1 = new QName("http://foo", "Bar");
+ handlers = resolver.getHandlerChain(new TestPortInfo(null, portName1, null));
+ assertEquals(1, handlers.size());
+
+ QName portName2 = new QName("http://foo", "Foo");
+ handlers = resolver.getHandlerChain(new TestPortInfo(null, portName2, null));
+ assertEquals(2, handlers.size());
+
+ QName portName3 = new QName("http://foo", "FooBar");
+ handlers = resolver.getHandlerChain(new TestPortInfo(null, portName3, null));
+ assertEquals(1, handlers.size());
+
+ QName portName4 = new QName("http://foo", "BarFoo");
+ handlers = resolver.getHandlerChain(new TestPortInfo(null, portName4, null));
+ assertEquals(0, handlers.size());
+ }
+
+ public void testMixedMatching() throws Exception {
+ InputStream in = getClass().getResourceAsStream("/handlers_mixed.xml");
+ assertTrue(in != null);
+ HandlerChainsType handlerChains = toHandlerChains(in);
+ assertEquals(3, handlerChains.getHandlerChainArray().length);
+
+ GeronimoHandlerResolver resolver =
+ new GeronimoHandlerResolver(getClass().getClassLoader(), getClass(), handlerChains, null);
+
+ List<Handler> handlers = null;
+
+ handlers = resolver.getHandlerChain(new TestPortInfo(null, null, null));
+ assertEquals(0, handlers.size());
+
+ QName serviceName1 = new QName("http:/foo", "Bar");
+ QName portName1 = new QName("http://foo", "FooBar");
+ String binding1 = "##XML_HTTP";
+ handlers = resolver.getHandlerChain(new TestPortInfo(binding1, portName1, serviceName1));
+ assertEquals(3, handlers.size());
+
+ String binding2 = "##SOAP11_HTTP";
+ handlers = resolver.getHandlerChain(new TestPortInfo(binding2, portName1, serviceName1));
+ assertEquals(2, handlers.size());
+
+ QName serviceName2 = new QName("http://foo", "Baaz");
+ QName portName2 = new QName("http://foo", "Baaz");
+ handlers = resolver.getHandlerChain(new TestPortInfo(binding1, portName2, serviceName2));
+ assertEquals(1, handlers.size());
+ }
+
+ private static HandlerChainsType toHandlerChains(InputStream input) throws Exception {
+ return HandlerChainsDocument.Factory.parse(input).getHandlerChains();
+ }
+
+ private static class TestPortInfo implements PortInfo {
+
+ private String bindingID;
+ private QName portName;
+ private QName serviceName;
+
+ public TestPortInfo(String bindingID, QName portName, QName serviceName) {
+ this.bindingID = bindingID;
+ this.portName = portName;
+ this.serviceName = serviceName;
+ }
+
+ public String getBindingID() {
+ return this.bindingID;
+ }
+
+ public QName getPortName() {
+ return this.portName;
+ }
+
+ public QName getServiceName() {
+ return this.serviceName;
+ }
+
+ }
+
+}
Copied: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/java/org/apache/geronimo/jaxws/handler/TestHandler.java (from r688776, geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/TestHandler.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/java/org/apache/geronimo/jaxws/handler/TestHandler.java?p2=geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/java/org/apache/geronimo/jaxws/handler/TestHandler.java&p1=geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/TestHandler.java&r1=688776&r2=689135&rev=689135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/TestHandler.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/java/org/apache/geronimo/jaxws/handler/TestHandler.java Tue Aug 26 10:00:52 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.axis2;
+package org.apache.geronimo.jaxws.handler;
import javax.xml.ws.handler.Handler;
import javax.xml.ws.handler.MessageContext;
Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/java/org/apache/geronimo/jaxws/handler/TestHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/java/org/apache/geronimo/jaxws/handler/TestHandler.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers.xml (from r688776, geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/resources/handlers.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers.xml?p2=geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers.xml&p1=geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/resources/handlers.xml&r1=688776&r2=689135&rev=689135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/resources/handlers.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers.xml Tue Aug 26 10:00:52 2008
@@ -22,21 +22,21 @@
<jws:handler-chain>
<jws:handler>
<jws:handler-name>GreeterHandler</jws:handler-name>
- <jws:handler-class>org.apache.geronimo.axis2.TestHandler</jws:handler-class>
+ <jws:handler-class>org.apache.geronimo.jaxws.handler.TestHandler</jws:handler-class>
</jws:handler>
</jws:handler-chain>
<jws:handler-chain>
<jws:service-name-pattern>*</jws:service-name-pattern>
<jws:handler>
<jws:handler-name>GreeterHandler</jws:handler-name>
- <jws:handler-class>org.apache.geronimo.axis2.TestHandler</jws:handler-class>
+ <jws:handler-class>org.apache.geronimo.jaxws.handler.TestHandler</jws:handler-class>
</jws:handler>
</jws:handler-chain>
<jws:handler-chain>
<jws:port-name-pattern>*</jws:port-name-pattern>
<jws:handler>
<jws:handler-name>GreeterHandler</jws:handler-name>
- <jws:handler-class>org.apache.geronimo.axis2.TestHandler</jws:handler-class>
+ <jws:handler-class>org.apache.geronimo.jaxws.handler.TestHandler</jws:handler-class>
</jws:handler>
</jws:handler-chain>
</jws:handler-chains>
Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers.xml
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers_bindings.xml (from r688776, geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/resources/handlers_bindings.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers_bindings.xml?p2=geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers_bindings.xml&p1=geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/resources/handlers_bindings.xml&r1=688776&r2=689135&rev=689135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/resources/handlers_bindings.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers_bindings.xml Tue Aug 26 10:00:52 2008
@@ -23,21 +23,28 @@
<jws:protocol-bindings>##XML_HTTP</jws:protocol-bindings>
<jws:handler>
<jws:handler-name>GreeterHandler</jws:handler-name>
- <jws:handler-class>org.apache.geronimo.axis2.TestHandler</jws:handler-class>
+ <jws:handler-class>org.apache.geronimo.jaxws.handler.TestHandler</jws:handler-class>
+ </jws:handler>
+ </jws:handler-chain>
+ <jws:handler-chain>
+ <jws:protocol-bindings>http://www.w3.org/2004/08/wsdl/http</jws:protocol-bindings>
+ <jws:handler>
+ <jws:handler-name>GreeterHandler</jws:handler-name>
+ <jws:handler-class>org.apache.geronimo.jaxws.handler.TestHandler</jws:handler-class>
</jws:handler>
</jws:handler-chain>
<jws:handler-chain>
<jws:protocol-bindings>##SOAP11_HTTP</jws:protocol-bindings>
<jws:handler>
<jws:handler-name>GreeterHandler</jws:handler-name>
- <jws:handler-class>org.apache.geronimo.axis2.TestHandler</jws:handler-class>
+ <jws:handler-class>org.apache.geronimo.jaxws.handler.TestHandler</jws:handler-class>
</jws:handler>
</jws:handler-chain>
<jws:handler-chain>
<jws:protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM</jws:protocol-bindings>
<jws:handler>
<jws:handler-name>GreeterHandler</jws:handler-name>
- <jws:handler-class>org.apache.geronimo.axis2.TestHandler</jws:handler-class>
+ <jws:handler-class>org.apache.geronimo.jaxws.handler.TestHandler</jws:handler-class>
</jws:handler>
</jws:handler-chain>
</jws:handler-chains>
Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers_bindings.xml
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers_mixed.xml (from r688776, geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/resources/handlers_mixed.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers_mixed.xml?p2=geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers_mixed.xml&p1=geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/resources/handlers_mixed.xml&r1=688776&r2=689135&rev=689135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/resources/handlers_mixed.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers_mixed.xml Tue Aug 26 10:00:52 2008
@@ -23,21 +23,21 @@
<jws:protocol-bindings>##XML_HTTP</jws:protocol-bindings>
<jws:handler>
<jws:handler-name>GreeterHandler</jws:handler-name>
- <jws:handler-class>org.apache.geronimo.axis2.TestHandler</jws:handler-class>
+ <jws:handler-class>org.apache.geronimo.jaxws.handler.TestHandler</jws:handler-class>
</jws:handler>
</jws:handler-chain>
<jws:handler-chain>
<jws:port-name-pattern>jws:Foo*</jws:port-name-pattern>
<jws:handler>
<jws:handler-name>GreeterHandler</jws:handler-name>
- <jws:handler-class>org.apache.geronimo.axis2.TestHandler</jws:handler-class>
+ <jws:handler-class>org.apache.geronimo.jaxws.handler.TestHandler</jws:handler-class>
</jws:handler>
</jws:handler-chain>
<jws:handler-chain>
<jws:service-name-pattern>jws:Bar</jws:service-name-pattern>
<jws:handler>
<jws:handler-name>GreeterHandler</jws:handler-name>
- <jws:handler-class>org.apache.geronimo.axis2.TestHandler</jws:handler-class>
+ <jws:handler-class>org.apache.geronimo.jaxws.handler.TestHandler</jws:handler-class>
</jws:handler>
</jws:handler-chain>
</jws:handler-chains>
Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers_mixed.xml
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers_port.xml (from r688776, geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/resources/handlers_port.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers_port.xml?p2=geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers_port.xml&p1=geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/resources/handlers_port.xml&r1=688776&r2=689135&rev=689135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/resources/handlers_port.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers_port.xml Tue Aug 26 10:00:52 2008
@@ -23,21 +23,21 @@
<jws:port-name-pattern>jws:Foo</jws:port-name-pattern>
<jws:handler>
<jws:handler-name>GreeterHandler</jws:handler-name>
- <jws:handler-class>org.apache.geronimo.axis2.TestHandler</jws:handler-class>
+ <jws:handler-class>org.apache.geronimo.jaxws.handler.TestHandler</jws:handler-class>
</jws:handler>
</jws:handler-chain>
<jws:handler-chain>
<jws:port-name-pattern>jws:Foo*</jws:port-name-pattern>
<jws:handler>
<jws:handler-name>GreeterHandler</jws:handler-name>
- <jws:handler-class>org.apache.geronimo.axis2.TestHandler</jws:handler-class>
+ <jws:handler-class>org.apache.geronimo.jaxws.handler.TestHandler</jws:handler-class>
</jws:handler>
</jws:handler-chain>
<jws:handler-chain>
<jws:port-name-pattern>jws:Bar</jws:port-name-pattern>
<jws:handler>
<jws:handler-name>GreeterHandler</jws:handler-name>
- <jws:handler-class>org.apache.geronimo.axis2.TestHandler</jws:handler-class>
+ <jws:handler-class>org.apache.geronimo.jaxws.handler.TestHandler</jws:handler-class>
</jws:handler>
</jws:handler-chain>
</jws:handler-chains>
Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers_port.xml
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers_service.xml (from r688776, geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/resources/handlers_service.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers_service.xml?p2=geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers_service.xml&p1=geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/resources/handlers_service.xml&r1=688776&r2=689135&rev=689135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/resources/handlers_service.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers_service.xml Tue Aug 26 10:00:52 2008
@@ -23,21 +23,21 @@
<jws:service-name-pattern>jws:Foo</jws:service-name-pattern>
<jws:handler>
<jws:handler-name>GreeterHandler</jws:handler-name>
- <jws:handler-class>org.apache.geronimo.axis2.TestHandler</jws:handler-class>
+ <jws:handler-class>org.apache.geronimo.jaxws.handler.TestHandler</jws:handler-class>
</jws:handler>
</jws:handler-chain>
<jws:handler-chain>
<jws:service-name-pattern>jws:Foo*</jws:service-name-pattern>
<jws:handler>
<jws:handler-name>GreeterHandler</jws:handler-name>
- <jws:handler-class>org.apache.geronimo.axis2.TestHandler</jws:handler-class>
+ <jws:handler-class>org.apache.geronimo.jaxws.handler.TestHandler</jws:handler-class>
</jws:handler>
</jws:handler-chain>
<jws:handler-chain>
<jws:service-name-pattern>jws:Bar</jws:service-name-pattern>
<jws:handler>
<jws:handler-name>GreeterHandler</jws:handler-name>
- <jws:handler-class>org.apache.geronimo.axis2.TestHandler</jws:handler-class>
+ <jws:handler-class>org.apache.geronimo.jaxws.handler.TestHandler</jws:handler-class>
</jws:handler>
</jws:handler-chain>
</jws:handler-chains>
Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/resources/handlers_service.xml
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml?rev=689135&r1=689134&r2=689135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml (original)
+++ geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml Tue Aug 26 10:00:52 2008
@@ -78,6 +78,11 @@
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.schema</groupId>
+ <artifactId>geronimo-schema-jee_5</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
</dependency>
Modified: geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml?rev=689135&r1=689134&r2=689135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml Tue Aug 26 10:00:52 2008
@@ -7,6 +7,11 @@
<type>car</type>
</module-id>
<dependency>
+ <groupId>org.apache.geronimo.schema</groupId>
+ <artifactId>geronimo-schema-jee_5</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<type>jar</type>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=689135&r1=689134&r2=689135&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Aug 26 10:00:52 2008
@@ -75,7 +75,7 @@
<derbyVersion>10.4.1.3</derbyVersion>
<tomcatVersion>6.0.18</tomcatVersion>
<tranqlVendorsVersion>1.4</tranqlVendorsVersion>
- <cxfVersion>2.0.8</cxfVersion>
+ <cxfVersion>2.1.3-SNAPSHOT</cxfVersion>
<axis2Version>1.3</axis2Version>
<axiomVersion>1.2.5</axiomVersion>
<springVersion>2.0.5</springVersion>
@@ -1948,6 +1948,12 @@
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-addr</artifactId>
+ <version>${cxfVersion}</version>
+ </dependency>
</dependencies>
</dependencyManagement>