Author: dkulp
Date: Fri Sep 1 12:52:20 2006
New Revision: 439443
URL: http://svn.apache.org/viewvc?rev=439443&view=rev
Log:
* Add set/isOneWay methods to exchange to make determining that easier/faster
* Update HTTPConduit to handle one ways
* Fix a BUNCH of NPE's relating to one way operations
* Get JAX-WS logical message handlers to actually be called on the client side
* Fix double registration of WrapperClass*Interceptors on client side
Added:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/
- copied from r439045,
incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java
- copied, changed from r439417,
incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/HandlerInvocationTest.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerTestImpl.java
- copied, changed from r439417,
incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/HandlerTestImpl.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/PingReq.xml
- copied, changed from r439417,
incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/PingReq.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/Server.java
- copied, changed from r439417,
incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/Server.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TestHandler.java
- copied, changed from r439417,
incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/TestHandler.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java
- copied, changed from r439417,
incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/TestHandlerBase.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TestSOAPHandler.java
- copied, changed from r439417,
incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/TestSOAPHandler.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TestStreamHandler.java
- copied, changed from r439417,
incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/TestStreamHandler.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/handlers.xml
- copied, changed from r439417,
incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/handlers.xml
Removed:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/RegistrationTest.java
Modified:
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/Exchange.java
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/ExchangeImpl.java
incubator/cxf/trunk/pom.xml
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/BareInInterceptor.java
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainSetupInterceptor.java
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/WrappedInInterceptor.java
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/SimpleMethodInvoker.java
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointInvocationHandler.java
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/BindingImpl.java
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/LogicalMessageImpl.java
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Modified:
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/Exchange.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/Exchange.java?rev=439443&r1=439442&r2=439443&view=diff
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/Exchange.java
(original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/Exchange.java
Fri Sep 1 12:52:20 2006
@@ -51,6 +51,16 @@
*/
void setConduit(Conduit conduit);
+
+ /**
+ * @return true if the exchange is known to be a one-way exchange
+ */
+ boolean isOneWay();
+ /**
+ *
+ * @param b true if the exchange is known to be a one-way exchange
+ */
+ void setOneWay(boolean b);
/**
* Convienience method for storing/retrieving typed objects from the map.
Modified:
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/ExchangeImpl.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/ExchangeImpl.java?rev=439443&r1=439442&r2=439443&view=diff
==============================================================================
---
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/ExchangeImpl.java
(original)
+++
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/ExchangeImpl.java
Fri Sep 1 12:52:20 2006
@@ -28,6 +28,7 @@
private Destination destination;
private Conduit conduit;
+ private boolean oneWay;
private Message inMessage;
private Message outMessage;
@@ -73,6 +74,14 @@
public <T> void put(Class<T> key, T value) {
put(key.getName(), value);
+ }
+
+ public boolean isOneWay() {
+ return oneWay;
+ }
+
+ public void setOneWay(boolean b) {
+ oneWay = b;
}
}
Modified: incubator/cxf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?rev=439443&r1=439442&r2=439443&view=diff
==============================================================================
--- incubator/cxf/trunk/pom.xml (original)
+++ incubator/cxf/trunk/pom.xml Fri Sep 1 12:52:20 2006
@@ -139,7 +139,7 @@
<compiler.version>2.0.1</compiler.version>
<dependency.plugin.version>1.0</dependency.plugin.version>
<eclipse.plugin.version>2.2</eclipse.plugin.version>
- <jar.version>2.0</jar.version>
+ <jar.version>2.1</jar.version>
<javadoc.version>2.0</javadoc.version>
<jxr.version>2.0</jxr.version>
<mprojectinfo.version>2.0</mprojectinfo.version>
@@ -161,6 +161,7 @@
<eclipse.workspace.dir>${basedir}/${topDirectoryLocation}/../workspace</eclipse.workspace.dir>
+ <downloadSources>true</downloadSources>
</properties>
<modules>
@@ -335,7 +336,6 @@
<artifactId>maven-eclipse-plugin</artifactId>
<version>${eclipse.plugin.version}</version>
<configuration>
- <!--downloadSources>true</downloadSources-->
<buildcommands>
<java.lang.String>org.eclipse.jdt.core.javabuilder</java.lang.String>
<java.lang.String>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</java.lang.String>
Modified:
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=439443&r1=439442&r2=439443&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
(original)
+++
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
Fri Sep 1 12:52:20 2006
@@ -90,6 +90,7 @@
if (null != ctx) {
exchange.putAll(ctx);
}
+ exchange.setOneWay(oi.getOutput() == null);
exchange.setOutMessage(message);
message.setExchange(exchange);
@@ -174,6 +175,7 @@
public void onMessage(Message message) {
+
message = endpoint.getBinding().createMessage(message);
message.put(Message.REQUESTOR_ROLE, Boolean.TRUE);
Modified:
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/BareInInterceptor.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/BareInInterceptor.java?rev=439443&r1=439442&r2=439443&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/BareInInterceptor.java
(original)
+++
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/BareInInterceptor.java
Fri Sep 1 12:52:20 2006
@@ -72,6 +72,7 @@
for (BindingOperationInfo bop :
ep.getEndpointInfo().getBinding().getOperations()) {
if (bop.getOperationInfo().equals(op)) {
exchange.put(BindingOperationInfo.class, bop);
+ exchange.setOneWay(bop.getOutput() == null);
break;
}
}
Modified:
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java?rev=439443&r1=439442&r2=439443&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java
(original)
+++
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java
Fri Sep 1 12:52:20 2006
@@ -38,9 +38,11 @@
Exchange ex = message.getExchange();
Message out = ex.getOutMessage();
- BindingOperationInfo bin = ex.get(BindingOperationInfo.class);
- out.put(MessageInfo.class, bin.getOperationInfo().getOutput());
- out.put(BindingMessageInfo.class, bin.getOutput());
- out.getInterceptorChain().doIntercept(out);
+ if (out != null) {
+ BindingOperationInfo bin = ex.get(BindingOperationInfo.class);
+ out.put(MessageInfo.class, bin.getOperationInfo().getOutput());
+ out.put(BindingMessageInfo.class, bin.getOutput());
+ out.getInterceptorChain().doIntercept(out);
+ }
}
}
Modified:
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainSetupInterceptor.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainSetupInterceptor.java?rev=439443&r1=439442&r2=439443&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainSetupInterceptor.java
(original)
+++
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainSetupInterceptor.java
Fri Sep 1 12:52:20 2006
@@ -31,7 +31,6 @@
import org.apache.cxf.phase.Phase;
import org.apache.cxf.phase.PhaseInterceptorChain;
import org.apache.cxf.phase.PhaseManager;
-import org.apache.cxf.service.model.BindingOperationInfo;
/**
* Sets up the outgoing chain if the operation has an output message.
@@ -46,12 +45,10 @@
public void handleMessage(Message message) {
Exchange ex = message.getExchange();
- BindingOperationInfo bop = ex.get(BindingOperationInfo.class);
-
- if (bop.getOperationInfo().isOneWay()) {
+ if (ex.isOneWay()) {
return;
}
-
+
Bus bus = ex.get(Bus.class);
PhaseManager pm = bus.getExtension(PhaseManager.class);
PhaseInterceptorChain chain = new
PhaseInterceptorChain(pm.getOutPhases());
Modified:
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/WrappedInInterceptor.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/WrappedInInterceptor.java?rev=439443&r1=439442&r2=439443&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/WrappedInInterceptor.java
(original)
+++
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/WrappedInInterceptor.java
Fri Sep 1 12:52:20 2006
@@ -70,6 +70,7 @@
}
message.getExchange().put(BindingOperationInfo.class, operation);
message.getExchange().put(OperationInfo.class,
operation.getOperationInfo());
+ message.getExchange().setOneWay(operation.getOutput() == null);
}
if (requestor) {
message.put(MessageInfo.class,
operation.getOperationInfo().getOutput());
Modified:
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/SimpleMethodInvoker.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/SimpleMethodInvoker.java?rev=439443&r1=439442&r2=439443&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/SimpleMethodInvoker.java
(original)
+++
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/SimpleMethodInvoker.java
Fri Sep 1 12:52:20 2006
@@ -46,7 +46,10 @@
Object res;
try {
- res = m.invoke(bean, params.toArray());
+ res = m.invoke(bean, params.toArray());
+ if (exchange.isOneWay()) {
+ return null;
+ }
return Arrays.asList(res);
} catch (Exception e) {
throw new Fault(e);
Modified:
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java?rev=439443&r1=439442&r2=439443&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
(original)
+++
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
Fri Sep 1 12:52:20 2006
@@ -318,7 +318,7 @@
// only a single part
// input message must exist
if (inputMessage == null || inputMessage.size() != 1
- || (outputMessage != null && outputMessage.size() != 1)) {
+ || (outputMessage != null && outputMessage.size() > 1)) {
return;
}
@@ -406,9 +406,7 @@
return false;
}
XmlSchemaElement el = (XmlSchemaElement)o;
- if (el.getMaxOccurs() > 1) {
- return false;
- }
+
// If this is an anonymous complex type, mark it as unwrapped.
// We're doing this because things like JAXB don't have support
// for finding classes from anonymous type names.
Modified:
incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java?rev=439443&r1=439442&r2=439443&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java
(original)
+++
incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java
Fri Sep 1 12:52:20 2006
@@ -76,7 +76,7 @@
opInfo = control.createMock(OperationInfo.class);
mInfo = control.createMock(MessageInfo.class);
bmInfo = control.createMock(BindingMessageInfo.class);
- EasyMock.expect(bopInfo.getOperationInfo()).andReturn(opInfo).times(2);
+ EasyMock.expect(bopInfo.getOperationInfo()).andReturn(opInfo);
EasyMock.expect(opInfo.getOutput()).andReturn(mInfo);
EasyMock.expect(bopInfo.getOutput()).andReturn(bmInfo);
Modified:
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointInvocationHandler.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointInvocationHandler.java?rev=439443&r1=439442&r2=439443&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointInvocationHandler.java
(original)
+++
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointInvocationHandler.java
Fri Sep 1 12:52:20 2006
@@ -40,7 +40,6 @@
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.interceptor.WrappedInInterceptor;
-import org.apache.cxf.jaxws.interceptors.WrapperClassInInterceptor;
import org.apache.cxf.jaxws.interceptors.WrapperClassOutInterceptor;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.InterfaceInfo;
@@ -62,8 +61,6 @@
super(b);
endpoint = c.getEndpoint();
client = c;
- client.getOutInterceptors().add(new WrapperClassOutInterceptor());
- client.getInInterceptors().add(new WrapperClassInInterceptor());
}
public Object invoke(Object proxy, Method method, Object[] args) throws
Throwable {
Modified:
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/BindingImpl.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/BindingImpl.java?rev=439443&r1=439442&r2=439443&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/BindingImpl.java
(original)
+++
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/BindingImpl.java
Fri Sep 1 12:52:20 2006
@@ -26,13 +26,10 @@
import javax.xml.ws.handler.Handler;
public class BindingImpl implements Binding {
- private List<Handler> handlerChain;
+ private List<Handler> handlerChain = new ArrayList<Handler>();
public List<Handler> getHandlerChain() {
- if (handlerChain == null) {
- return new ArrayList<Handler>();
- }
- return new ArrayList<Handler>(handlerChain);
+ return handlerChain;
}
public void setHandlerChain(List<Handler> hc) {
Modified:
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/LogicalMessageImpl.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/LogicalMessageImpl.java?rev=439443&r1=439442&r2=439443&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/LogicalMessageImpl.java
(original)
+++
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/LogicalMessageImpl.java
Fri Sep 1 12:52:20 2006
@@ -20,6 +20,9 @@
package org.apache.cxf.jaxws.handler;
+import java.util.Arrays;
+import java.util.List;
+
import javax.xml.bind.JAXBContext;
import javax.xml.transform.Source;
import javax.xml.ws.LogicalMessage;
@@ -35,22 +38,20 @@
public Source getPayload() {
return msgContext.getWrappedMessage().getContent(Source.class);
- // throw new UnsupportedOperationException("getPayload");
}
public void setPayload(Source s) {
msgContext.getWrappedMessage().setContent(Source.class, s);
- // throw new UnsupportedOperationException("setPayload");
}
public Object getPayload(JAXBContext arg0) {
- // TODO Auto-generated method stub
- return null;
+ // TODO - what to do with JAXB context?
+ return msgContext.getWrappedMessage().getContent(List.class).get(0);
}
public void setPayload(Object arg0, JAXBContext arg1) {
- // TODO Auto-generated method stub
-
+ // TODO - what to do with JAXB context?
+ msgContext.getWrappedMessage().setContent(List.class,
Arrays.asList(arg0));
}
Modified:
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java?rev=439443&r1=439442&r2=439443&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
(original)
+++
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
Fri Sep 1 12:52:20 2006
@@ -39,7 +39,7 @@
public WrapperClassInInterceptor() {
super();
- setPhase(Phase.PRE_LOGICAL);
+ setPhase(Phase.POST_LOGICAL);
}
public void handleMessage(Message message) throws Fault {
Modified:
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java?rev=439443&r1=439442&r2=439443&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
(original)
+++
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
Fri Sep 1 12:52:20 2006
@@ -38,7 +38,7 @@
public WrapperClassOutInterceptor() {
super();
- setPhase(Phase.POST_LOGICAL);
+ setPhase(Phase.PRE_LOGICAL);
}
@SuppressWarnings("unchecked")
Modified:
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=439443&r1=439442&r2=439443&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
(original)
+++
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Fri Sep 1 12:52:20 2006
@@ -43,6 +43,7 @@
import org.apache.cxf.Bus;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.CastUtils;
+import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.service.model.EndpointInfo;
@@ -410,8 +411,14 @@
private void handleResponse() throws IOException {
// REVISIT distinguish decoupled case
+ Exchange exchange = outMessage.getExchange();
+ if (exchange != null && exchange.isOneWay()) {
+ //onway operation
+ connection.getInputStream().close();
+ return;
+ }
Message inMessage = new MessageImpl();
- inMessage.setExchange(outMessage.getExchange());
+ inMessage.setExchange(exchange);
InputStream in = null;
inMessage.put(HTTP_RESPONSE_HEADERS, connection.getHeaderFields());
inMessage.put(HTTP_RESPONSE_CODE, getResponseCode(connection));
Copied:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java
(from r439417,
incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/HandlerInvocationTest.java)
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java?p2=incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java&p1=incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/HandlerInvocationTest.java&r1=439417&r2=439443&rev=439443&view=diff
==============================================================================
---
incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/HandlerInvocationTest.java
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java
Fri Sep 1 12:52:20 2006
@@ -1,23 +1,31 @@
-package org.objectweb.celtix.systest.handlers;
+/**
+ * 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.cxf.systest.handlers;
-import java.io.InputStream;
import java.net.URL;
-import java.util.Iterator;
import java.util.List;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Unmarshaller;
import javax.xml.namespace.QName;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPMessage;
import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Dispatch;
-import javax.xml.ws.LogicalMessage;
-import javax.xml.ws.ProtocolException;
-import javax.xml.ws.Service;
import javax.xml.ws.handler.Handler;
import javax.xml.ws.handler.LogicalMessageContext;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.handler.soap.SOAPMessageContext;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -25,23 +33,19 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.objectweb.celtix.BusException;
-import org.objectweb.celtix.common.util.PackageUtils;
-import org.objectweb.celtix.context.StreamMessageContext;
-import org.objectweb.celtix.systest.common.ClientServerSetupBase;
-import org.objectweb.celtix.systest.common.ClientServerTestBase;
-import org.objectweb.handler_test.HandlerTest;
-import org.objectweb.handler_test.HandlerTestService;
-import org.objectweb.handler_test.PingException;
-import org.objectweb.handler_test.types.PingResponse;
-import org.objectweb.hello_world_soap_http.types.GreetMe;
+import org.apache.cxf.BusException;
+import org.apache.cxf.systest.common.ClientServerSetupBase;
+import org.apache.cxf.systest.common.ClientServerTestBase;
+import org.apache.handler_test.HandlerTest;
+import org.apache.handler_test.HandlerTestService;
+import org.apache.handler_test.types.PingResponse;
public class HandlerInvocationTest extends ClientServerTestBase {
- private final QName serviceName = new
QName("http://objectweb.org/hello_world_soap_http";,
+ private final QName serviceName = new
QName("http://apache.org/handler_test";,
"HandlerTestService");
- private final QName portName = new
QName("http://objectweb.org/hello_world_soap_http";, "SoapPort");
+ private final QName portName = new QName("http://apache.org/handler_test";,
"SoapPort");
private URL wsdl;
private HandlerTestService service;
@@ -52,7 +56,7 @@
TestSuite suite = new TestSuite(HandlerInvocationTest.class);
return new ClientServerSetupBase(suite) {
public void startServers() throws Exception {
- assertTrue("server did not launch correctly",
launchServer(Server.class, false));
+ assertTrue("server did not launch correctly",
launchServer(Server.class));
}
};
}
@@ -66,7 +70,7 @@
service = new HandlerTestService(wsdl, serviceName);
handlerTest = service.getPort(portName, HandlerTest.class);
if (!"testHandlersInvoked".equals(getName())) {
- addHandlersToChain((BindingProvider)handlerTest, new
TestStreamHandler(false));
+ //addHandlersToChain((BindingProvider)handlerTest, new
TestStreamHandler(false));
}
} catch (Exception ex) {
ex.printStackTrace();
@@ -74,7 +78,71 @@
}
}
+ public void testLogicalHandlerOneWay() {
+ TestHandler<LogicalMessageContext> handler1 = new
TestHandler<LogicalMessageContext>(false);
+ TestHandler<LogicalMessageContext> handler2 = new
TestHandler<LogicalMessageContext>(false);
+ addHandlersToChain((BindingProvider)handlerTest, handler1, handler2);
+
+ handlerTest.pingOneWay();
+
+ assertEquals(1, handler1.getHandleMessageInvoked());
+ assertEquals(1, handler2.getHandleMessageInvoked());
+ }
+ public void testLogicalHandlerTwoWay() throws Exception {
+ TestHandler<LogicalMessageContext> handler1 = new
TestHandler<LogicalMessageContext>(false);
+ TestHandler<LogicalMessageContext> handler2 = new
TestHandler<LogicalMessageContext>(false);
+ addHandlersToChain((BindingProvider)handlerTest, handler1, handler2);
+
+ handlerTest.pingWithArgs("hello");
+
+ assertEquals(2, handler1.getHandleMessageInvoked());
+ assertEquals(2, handler2.getHandleMessageInvoked());
+ }
+
+ /*
+ public void testLogicalHandlerStopProcessing() throws PingException {
+
+ final String clientHandlerMessage = "handler2 client side";
+
+ TestHandler<LogicalMessageContext> handler1 = new
TestHandler<LogicalMessageContext>(false);
+ TestHandler<LogicalMessageContext> handler2 = new
TestHandler<LogicalMessageContext>(false) {
+ public boolean handleMessage(LogicalMessageContext ctx) {
+ super.handleMessage(ctx);
+ try {
+ Boolean outbound =
(Boolean)ctx.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
+ if (outbound) {
+ LogicalMessage msg = ctx.getMessage();
+ assertNotNull("logical message is null", msg);
+ JAXBContext jaxbCtx =
+
JAXBContext.newInstance(PackageUtils.getPackageName(GreetMe.class));
+ PingResponse resp = new PingResponse();
+ resp.getHandlersInfo().add(clientHandlerMessage);
+
+ msg.setPayload(resp, jaxbCtx);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail(e.toString());
+ }
+ return false;
+ }
+ };
+
+ addHandlersToChain((BindingProvider)handlerTest, handler1, handler2);
+
+ List<String> resp = handlerTest.ping();
+ assertEquals(clientHandlerMessage, resp.get(0));
+
+ assertEquals("handler must be invoked for inbound & outbound message",
+ 2, handler1.getHandleMessageInvoked());
+ assertEquals("second handler must be invoked exactly once", 1,
handler2.getHandleMessageInvoked());
+ assertTrue("close must be called", handler1.isCloseInvoked());
+ assertTrue("close must be called", handler2.isCloseInvoked());
+ }
+ */
+
+ /*
public void testHandlersInvoked() throws PingException {
TestHandler<LogicalMessageContext> handler1 = new
TestHandler<LogicalMessageContext>(false);
@@ -217,47 +285,6 @@
}
}
- public void testLogicalHandlerStopProcessing() throws PingException {
-
- final String clientHandlerMessage = "handler2 client side";
-
- TestHandler<LogicalMessageContext> handler1 = new
TestHandler<LogicalMessageContext>(false);
- TestHandler<LogicalMessageContext> handler2 = new
TestHandler<LogicalMessageContext>(false) {
- public boolean handleMessage(LogicalMessageContext ctx) {
- super.handleMessage(ctx);
- try {
- Boolean outbound =
(Boolean)ctx.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
- if (outbound) {
- LogicalMessage msg = ctx.getMessage();
- assertNotNull("logical message is null", msg);
- JAXBContext jaxbCtx =
-
JAXBContext.newInstance(PackageUtils.getPackageName(GreetMe.class));
- PingResponse resp = new PingResponse();
- resp.getHandlersInfo().add(clientHandlerMessage);
-
- msg.setPayload(resp, jaxbCtx);
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- fail(e.toString());
- }
- return false;
- }
- };
-
- addHandlersToChain((BindingProvider)handlerTest, handler1, handler2);
-
- List<String> resp = handlerTest.ping();
- assertEquals(clientHandlerMessage, resp.get(0));
-
- assertEquals("handler must be invoked for inbound & outbound message",
- 2, handler1.getHandleMessageInvoked());
- assertEquals("second handler must be invoked exactly once", 1,
handler2.getHandleMessageInvoked());
- assertTrue("close must be called", handler1.isCloseInvoked());
- assertTrue("close must be called", handler2.isCloseInvoked());
- }
-
public void testLogicalHandlerStopProcessingServerSide() throws
PingException {
@@ -342,22 +369,9 @@
assertEquals(1, handler2.getHandleFaultInvoked());
assertEquals(1, streamHandler.getHandleFaultInvoked());
}
+*/
- public void testLogicalHandlerOneWay() {
- TestHandler<LogicalMessageContext> handler1 = new
TestHandler<LogicalMessageContext>(false);
- TestHandler<LogicalMessageContext> handler2 = new
TestHandler<LogicalMessageContext>(false);
- TestSOAPHandler soapHandler1 = new TestSOAPHandler(false);
-
- addHandlersToChain((BindingProvider)handlerTest, handler1, handler2,
soapHandler1);
-
- handlerTest.pingOneWay();
-
- assertEquals(1, handler1.getHandleMessageInvoked());
- assertEquals(1, handler2.getHandleMessageInvoked());
- assertEquals(1, soapHandler1.getHandleMessageInvoked());
- }
-
void addHandlersToChain(BindingProvider bp, Handler...handlers) {
List<Handler> handlerChain = bp.getBinding().getHandlerChain();
assertNotNull(handlerChain);
@@ -388,9 +402,11 @@
return stringList;
}
+ /*
private boolean isValidWsdlDescription(Object wsdlDescription) {
return (wsdlDescription != null)
&& ((wsdlDescription instanceof java.net.URI)
|| (wsdlDescription instanceof java.net.URL));
}
+ */
}
Copied:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerTestImpl.java
(from r439417,
incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/HandlerTestImpl.java)
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerTestImpl.java?p2=incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerTestImpl.java&p1=incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/HandlerTestImpl.java&r1=439417&r2=439443&rev=439443&view=diff
==============================================================================
---
incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/HandlerTestImpl.java
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerTestImpl.java
Fri Sep 1 12:52:20 2006
@@ -1,4 +1,22 @@
-package org.objectweb.celtix.systest.handlers;
+/**
+ * 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.cxf.systest.handlers;
import java.util.ArrayList;
@@ -8,14 +26,14 @@
import javax.jws.WebService;
import javax.xml.ws.WebServiceContext;
import javax.xml.ws.handler.MessageContext;
-import org.objectweb.handler_test.HandlerTest;
-import org.objectweb.handler_test.PingException;
-import org.objectweb.handler_test.types.PingFaultDetails;
+import org.apache.handler_test.HandlerTest;
+import org.apache.handler_test.PingException;
+import org.apache.handler_test.types.PingFaultDetails;
@WebService(serviceName = "HandlerTestService",
portName = "SoapPort",
- endpointInterface = "org.objectweb.handler_test.HandlerTest",
- targetNamespace = "http://objectweb.org/handler_test";)
+ endpointInterface = "org.apache.handler_test.HandlerTest",
+ targetNamespace = "http://apache.org/handler_test";)
@HandlerChain(file = "./handlers.xml", name = "TestHandlerChain")
public class HandlerTestImpl implements HandlerTest {
@@ -44,7 +62,7 @@
List<String> ret = new ArrayList<String>();
ret.add(handlerCommand);
- ret.addAll(getHandlersInfo(context.getMessageContext()));
+ //ret.addAll(getHandlersInfo(context.getMessageContext()));
if (handlerCommand.contains("throw exception")) {
PingFaultDetails details = new PingFaultDetails();
Copied:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/PingReq.xml
(from r439417,
incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/PingReq.xml)
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/PingReq.xml?p2=incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/PingReq.xml&p1=incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/PingReq.xml&r1=439417&r2=439443&rev=439443&view=diff
==============================================================================
---
incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/PingReq.xml
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/PingReq.xml
Fri Sep 1 12:52:20 2006
@@ -1,8 +1,26 @@
<?xml version="1.0" encoding="utf-8" ?>
+ <!--
+ 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.
+-->
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<SOAP-ENV:Body>
- <ns4:ping xmlns:ns4="http://objectweb.org/handler_test/types"/>
+ <ns4:ping xmlns:ns4="http://apache.org/handler_test/types"/>
</SOAP-ENV:Body>
</SOAP-ENV:Envelope>
Copied:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/Server.java
(from r439417,
incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/Server.java)
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/Server.java?p2=incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/Server.java&p1=incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/Server.java&r1=439417&r2=439443&rev=439443&view=diff
==============================================================================
---
incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/Server.java
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/Server.java
Fri Sep 1 12:52:20 2006
@@ -1,4 +1,22 @@
-package org.objectweb.celtix.systest.handlers;
+/**
+ * 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.cxf.systest.handlers;
// import java.util.ArrayList;
@@ -6,7 +24,7 @@
import javax.xml.ws.Endpoint;
// import javax.xml.ws.handler.Handler;
-import org.objectweb.celtix.systest.common.TestServerBase;
+import org.apache.cxf.systest.common.TestServerBase;
public class Server extends TestServerBase {
Copied:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TestHandler.java
(from r439417,
incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/TestHandler.java)
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TestHandler.java?p2=incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TestHandler.java&p1=incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/TestHandler.java&r1=439417&r2=439443&rev=439443&view=diff
==============================================================================
---
incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/TestHandler.java
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TestHandler.java
Fri Sep 1 12:52:20 2006
@@ -1,4 +1,22 @@
-package org.objectweb.celtix.systest.handlers;
+/**
+ * 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.cxf.systest.handlers;
import java.util.Map;
@@ -13,10 +31,10 @@
import javax.xml.ws.handler.LogicalMessageContext;
import javax.xml.ws.handler.MessageContext;
-import org.objectweb.celtix.common.util.PackageUtils;
-import org.objectweb.handler_test.types.PingResponse;
-import org.objectweb.handler_test.types.PingWithArgs;
-import org.objectweb.hello_world_soap_http.types.GreetMe;
+import org.apache.cxf.common.util.PackageUtils;
+import org.apache.handler_test.types.PingResponse;
+import org.apache.handler_test.types.PingWithArgs;
+import org.apache.hello_world_soap_http.types.GreetMe;
public class TestHandler<T extends LogicalMessageContext>
Copied:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java
(from r439417,
incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/TestHandlerBase.java)
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java?p2=incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java&p1=incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/TestHandlerBase.java&r1=439417&r2=439443&rev=439443&view=diff
==============================================================================
---
incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/TestHandlerBase.java
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java
Fri Sep 1 12:52:20 2006
@@ -1,4 +1,22 @@
-package org.objectweb.celtix.systest.handlers;
+/**
+ * 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.cxf.systest.handlers;
import java.util.ArrayList;
Copied:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TestSOAPHandler.java
(from r439417,
incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/TestSOAPHandler.java)
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TestSOAPHandler.java?p2=incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TestSOAPHandler.java&p1=incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/TestSOAPHandler.java&r1=439417&r2=439443&rev=439443&view=diff
==============================================================================
---
incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/TestSOAPHandler.java
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TestSOAPHandler.java
Fri Sep 1 12:52:20 2006
@@ -1,4 +1,22 @@
-package org.objectweb.celtix.systest.handlers;
+/**
+ * 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.cxf.systest.handlers;
import java.util.Map;
@@ -15,7 +33,7 @@
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
-import org.objectweb.handler_test.PingException;
+import org.apache.handler_test.PingException;
/**
* Describe class TestSOAPHandler here.
Copied:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TestStreamHandler.java
(from r439417,
incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/TestStreamHandler.java)
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TestStreamHandler.java?p2=incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TestStreamHandler.java&p1=incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/TestStreamHandler.java&r1=439417&r2=439443&rev=439443&view=diff
==============================================================================
---
incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/TestStreamHandler.java
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TestStreamHandler.java
Fri Sep 1 12:52:20 2006
@@ -1,4 +1,22 @@
-package org.objectweb.celtix.systest.handlers;
+/**
+ * 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.cxf.systest.handlers;
import java.io.IOException;
@@ -10,9 +28,9 @@
import javax.xml.ws.ProtocolException;
import javax.xml.ws.handler.MessageContext;
-import org.objectweb.celtix.context.StreamMessageContext;
-import org.objectweb.celtix.handlers.StreamHandler;
-import org.objectweb.handler_test.PingException;
+import org.apache.cxf.jaxws.handlers.StreamHandler;
+import org.apache.cxf.jaxws.handlers.StreamMessageContext;
+import org.apache.handler_test.PingException;
public class TestStreamHandler extends TestHandlerBase
implements StreamHandler {
Copied:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/handlers.xml
(from r439417,
incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/handlers.xml)
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/handlers.xml?p2=incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/handlers.xml&p1=incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/handlers.xml&r1=439417&r2=439443&rev=439443&view=diff
==============================================================================
---
incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/handlers/handlers.xml
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/handlers.xml
Fri Sep 1 12:52:20 2006
@@ -1,32 +1,50 @@
+ <!--
+ 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.
+-->
<handler-config>
<handler-chain>
<handler-chain-name>TestHandlerChain</handler-chain-name>
<handler>
<handler-name>Handler1</handler-name>
-
<handler-class>org.objectweb.celtix.systest.handlers.TestHandler</handler-class>
+
<handler-class>org.apache.cxf.systest.handlers.TestHandler</handler-class>
</handler>
<handler>
<handler-name>Handler2</handler-name>
-
<handler-class>org.objectweb.celtix.systest.handlers.TestHandler</handler-class>
+
<handler-class>org.apache.cxf.systest.handlers.TestHandler</handler-class>
</handler>
<handler>
<handler-name>ProtocolHandler1</handler-name>
-
<handler-class>org.objectweb.celtix.systest.handlers.TestSOAPHandler</handler-class>
+
<handler-class>org.apache.cxf.systest.handlers.TestSOAPHandler</handler-class>
</handler>
<handler>
<handler-name>ProtocolHandler2</handler-name>
-
<handler-class>org.objectweb.celtix.systest.handlers.TestSOAPHandler</handler-class>
+
<handler-class>org.apache.cxf.systest.handlers.TestSOAPHandler</handler-class>
</handler>
<handler>
<handler-name>StreamHandler1</handler-name>
-
<handler-class>org.objectweb.celtix.systest.handlers.TestStreamHandler</handler-class>
+
<handler-class>org.apache.cxf.systest.handlers.TestStreamHandler</handler-class>
</handler>
</handler-chain>
<handler-chain>
<handler-chain-name>SingleHandlerChain</handler-chain-name>
<handler>
<handler-name>SingleHandler</handler-name>
-
<handler-class>org.objectweb.celtix.systest.handlers.TestHandler</handler-class>
+
<handler-class>org.apache.cxf.systest.handlers.TestHandler</handler-class>
</handler>
</handler-chain>
</handler-config>
