You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by sc...@apache.org on 2006/12/05 21:11:02 UTC
svn commit: r482754 - in /webservices/axis2/trunk/java/modules/jaxws:
src/org/apache/axis2/jaxws/marshaller/
src/org/apache/axis2/jaxws/marshaller/impl/
src/org/apache/axis2/jaxws/marshaller/impl/alt/
src/org/apache/axis2/jaxws/server/dispatcher/ test/...
Author: scheu
Date: Tue Dec 5 12:11:00 2006
New Revision: 482754
URL: http://svn.apache.org/viewvc?view=rev&rev=482754
Log:
AXIS2-1825
Contributor:Rich Scheuerle
Fixed 6 failing tests. Outbound client protocol is set based on ClientBindingID. Outbound server protocol is the same as the request message's protocol (i.e. its dynamic)
Modified:
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/MethodMarshaller.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/DocLitBareMethodMarshallerImpl.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/DocLitWrappedMethodMarshallerImpl.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/MethodMarshallerImpl.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/RPCLitMethodMarshallerImpl.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitBareMethodMarshaller.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitWrappedMethodMarshaller.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/RPCLitMethodMarshaller.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/SOAP12ProxyTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddressBookTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/MtomSampleTests.java
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/MethodMarshaller.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/MethodMarshaller.java?view=diff&rev=482754&r1=482753&r2=482754
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/MethodMarshaller.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/MethodMarshaller.java Tue Dec 5 12:11:00 2006
@@ -22,6 +22,7 @@
import org.apache.axis2.jaxws.description.OperationDescription;
import org.apache.axis2.jaxws.message.Message;
+import org.apache.axis2.jaxws.message.Protocol;
/**
@@ -65,9 +66,11 @@
*
* @param returnObject
* @param signatureArgs
+ * @param OperationDesc
+ * @param Protocol for response
* @return Message
*/
- public Message marshalResponse(Object returnObject, Object[] signatureArgs, OperationDescription opDesc)throws WebServiceException;
+ public Message marshalResponse(Object returnObject, Object[] signatureArgs, OperationDescription opDesc, Protocol protocol)throws WebServiceException;
/**
@@ -86,7 +89,8 @@
*
* @param message
* @param signatureAgs (same array of args that were used for marshalRequest. The out/inout holders are populated with new values)
- * @return returnObject
+ * @param OperationDesc
+ * @return returnObject
*/
public Object demarshalResponse(Message message, Object[] signatureArgs, OperationDescription opDesc) throws WebServiceException;
@@ -100,12 +104,14 @@
public Throwable demarshalFaultResponse(Message message, OperationDescription opDesc) throws WebServiceException;
/**
- * This method creates a Message from a Throwbale input parameter.
+ * This method creates a Message from a Throwable input parameter.
* Used on the server.
- * @param jaxbObject
+ * @param Throwable
+ * @param OperationDesc
+ * @param Protocol for response
* @return
*/
- public Message marshalFaultResponse(Throwable throwable, OperationDescription opDesc) throws WebServiceException;
+ public Message marshalFaultResponse(Throwable throwable, OperationDescription opDesc, Protocol protocol) throws WebServiceException;
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/DocLitBareMethodMarshallerImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/DocLitBareMethodMarshallerImpl.java?view=diff&rev=482754&r1=482753&r2=482754
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/DocLitBareMethodMarshallerImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/DocLitBareMethodMarshallerImpl.java Tue Dec 5 12:11:00 2006
@@ -33,6 +33,7 @@
import org.apache.axis2.jaxws.marshaller.MethodParameter;
import org.apache.axis2.jaxws.message.Message;
import org.apache.axis2.jaxws.message.MessageException;
+import org.apache.axis2.jaxws.message.Protocol;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -200,7 +201,7 @@
* @see org.apache.axis2.jaxws.convertor.impl.MessageConvertorImpl#fromJAXBObject(java.lang.Object)
*/
@Override
- public Message marshalResponse(Object returnObject, Object[] holderObjects, OperationDescription operationDesc) throws WebServiceException {
+ public Message marshalResponse(Object returnObject, Object[] holderObjects, OperationDescription operationDesc, Protocol protocol ) throws WebServiceException {
try {
// Response wrapper is basically the return type. So the return object
// is a JAXB object. If there is a holder objects then that is the
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/DocLitWrappedMethodMarshallerImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/DocLitWrappedMethodMarshallerImpl.java?view=diff&rev=482754&r1=482753&r2=482754
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/DocLitWrappedMethodMarshallerImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/DocLitWrappedMethodMarshallerImpl.java Tue Dec 5 12:11:00 2006
@@ -135,7 +135,7 @@
* @see org.apache.axis2.jaxws.convertor.impl.MessageConvertorImpl#fromJAXBObject(java.lang.Object)
*/
@Override
- public Message marshalResponse(Object returnObject, Object[] holderObjects, OperationDescription operationDesc) throws WebServiceException {
+ public Message marshalResponse(Object returnObject, Object[] holderObjects, OperationDescription operationDesc, Protocol protocol) throws WebServiceException {
try {
// Get the necessary information from the OperationDesc
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/MethodMarshallerImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/MethodMarshallerImpl.java?view=diff&rev=482754&r1=482753&r2=482754
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/MethodMarshallerImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/MethodMarshallerImpl.java Tue Dec 5 12:11:00 2006
@@ -94,7 +94,7 @@
/* (non-Javadoc)
* @see org.apache.axis2.jaxws.marshaller.MethodMarshaller#marshalResponse(java.lang.Object, java.lang.Object[])
*/
- public abstract Message marshalResponse(Object returnObject, Object[] holderObjects, OperationDescription operationDesc)throws WebServiceException;
+ public abstract Message marshalResponse(Object returnObject, Object[] holderObjects, OperationDescription operationDesc, Protocol protocol)throws WebServiceException;
/* (non-Javadoc)
@@ -177,7 +177,7 @@
/* (non-Javadoc)
* @see org.apache.axis2.jaxws.marshaller.MethodMarshaller#marshalFaultResponse(java.lang.Throwable)
*/
- public Message marshalFaultResponse(Throwable throwable, OperationDescription operationDesc) throws WebServiceException {
+ public Message marshalFaultResponse(Throwable throwable, OperationDescription operationDesc, Protocol protocol) throws WebServiceException {
try {
Throwable t = ClassUtils.getRootCause(throwable);
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/RPCLitMethodMarshallerImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/RPCLitMethodMarshallerImpl.java?view=diff&rev=482754&r1=482753&r2=482754
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/RPCLitMethodMarshallerImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/RPCLitMethodMarshallerImpl.java Tue Dec 5 12:11:00 2006
@@ -50,7 +50,7 @@
}
@Override
- public Message marshalResponse(Object returnObject, Object[] holderObjects, OperationDescription operationDesc)
+ public Message marshalResponse(Object returnObject, Object[] holderObjects, OperationDescription operationDesc, Protocol protocol)
throws WebServiceException {
// TODO Unsupported
throw new UnsupportedOperationException();
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitBareMethodMarshaller.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitBareMethodMarshaller.java?view=diff&rev=482754&r1=482753&r2=482754
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitBareMethodMarshaller.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitBareMethodMarshaller.java Tue Dec 5 12:11:00 2006
@@ -128,18 +128,23 @@
}
}
- public Message marshalResponse(Object returnObject, Object[] signatureArgs, OperationDescription operationDesc)
+ public Message marshalResponse(Object returnObject,
+ Object[] signatureArgs,
+ OperationDescription operationDesc, Protocol protocol)
throws WebServiceException {
EndpointInterfaceDescription ed = operationDesc.getEndpointInterfaceDescription();
EndpointDescription endpointDesc = ed.getEndpointDescription();
- Protocol protocol = null;
- try {
- protocol = Protocol.getProtocolForBinding(endpointDesc.getBindingType()); //soap11;
- } catch (MessageException e) {
- // TODO better handling than this?
- e.printStackTrace();
+ // We want to respond with the same protocol as the request,
+ // It the protocol is null, then use the Protocol defined by the binding
+ if (protocol == null) {
+ try {
+ protocol = Protocol.getProtocolForBinding(endpointDesc.getBindingType());
+ } catch (MessageException e) {
+ // TODO better handling than this?
+ e.printStackTrace();
+ }
}
// Note all exceptions are caught and rethrown with a WebServiceException
@@ -199,7 +204,7 @@
EndpointDescription endpointDesc = ed.getEndpointDescription();
Protocol protocol = null;
try {
- protocol = Protocol.getProtocolForBinding(endpointDesc.getClientBindingID()); //soap11;
+ protocol = Protocol.getProtocolForBinding(endpointDesc.getClientBindingID());
} catch (MessageException e) {
// TODO better handling than this?
e.printStackTrace();
@@ -247,16 +252,19 @@
}
}
- public Message marshalFaultResponse(Throwable throwable, OperationDescription operationDesc) throws WebServiceException {
+ public Message marshalFaultResponse(Throwable throwable, OperationDescription operationDesc, Protocol protocol) throws WebServiceException {
EndpointInterfaceDescription ed = operationDesc.getEndpointInterfaceDescription();
EndpointDescription endpointDesc = ed.getEndpointDescription();
- Protocol protocol = null;
- try {
- protocol = Protocol.getProtocolForBinding(endpointDesc.getBindingType()); //soap11;
- } catch (MessageException e) {
- // TODO better handling than this?
- e.printStackTrace();
+ // We want to respond with the same protocol as the request,
+ // It the protocol is null, then use the Protocol defined by the binding
+ if (protocol == null) {
+ try {
+ protocol = Protocol.getProtocolForBinding(endpointDesc.getBindingType());
+ } catch (MessageException e) {
+ // TODO better handling than this?
+ e.printStackTrace();
+ }
}
// Note all exceptions are caught and rethrown with a WebServiceException
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitWrappedMethodMarshaller.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitWrappedMethodMarshaller.java?view=diff&rev=482754&r1=482753&r2=482754
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitWrappedMethodMarshaller.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitWrappedMethodMarshaller.java Tue Dec 5 12:11:00 2006
@@ -245,17 +245,21 @@
}
}
- public Message marshalResponse(Object returnObject, Object[] signatureArgs, OperationDescription operationDesc)
+ public Message marshalResponse(Object returnObject, Object[] signatureArgs,
+ OperationDescription operationDesc, Protocol protocol)
throws WebServiceException {
EndpointInterfaceDescription ed = operationDesc.getEndpointInterfaceDescription();
EndpointDescription endpointDesc = ed.getEndpointDescription();
- Protocol protocol = null;
- try {
- protocol = Protocol.getProtocolForBinding(endpointDesc.getBindingType()); //soap11;
- } catch (MessageException e) {
- // TODO better handling than this?
- e.printStackTrace();
+ // We want to respond with the same protocol as the request,
+ // It the protocol is null, then use the Protocol defined by the binding
+ if (protocol == null) {
+ try {
+ protocol = Protocol.getProtocolForBinding(endpointDesc.getBindingType());
+ } catch (MessageException e) {
+ // TODO better handling than this?
+ e.printStackTrace();
+ }
}
// Note all exceptions are caught and rethrown with a WebServiceException
@@ -356,7 +360,7 @@
EndpointDescription endpointDesc = ed.getEndpointDescription();
Protocol protocol = null;
try {
- protocol = Protocol.getProtocolForBinding(endpointDesc.getBindingType()); //soap11;
+ protocol = Protocol.getProtocolForBinding(endpointDesc.getClientBindingID());
} catch (MessageException e) {
// TODO better handling than this?
e.printStackTrace();
@@ -441,16 +445,19 @@
}
}
- public Message marshalFaultResponse(Throwable throwable, OperationDescription operationDesc) throws WebServiceException {
+ public Message marshalFaultResponse(Throwable throwable, OperationDescription operationDesc, Protocol protocol) throws WebServiceException {
EndpointInterfaceDescription ed = operationDesc.getEndpointInterfaceDescription();
EndpointDescription endpointDesc = ed.getEndpointDescription();
- Protocol protocol = null;
- try {
- protocol = Protocol.getProtocolForBinding(endpointDesc.getBindingType()); //soap11;
- } catch (MessageException e) {
- // TODO better handling than this?
- e.printStackTrace();
+ // We want to respond with the same protocol as the request,
+ // It the protocol is null, then use the Protocol defined by the binding
+ if (protocol == null) {
+ try {
+ protocol = Protocol.getProtocolForBinding(endpointDesc.getBindingType());
+ } catch (MessageException e) {
+ // TODO better handling than this?
+ e.printStackTrace();
+ }
}
// Note all exceptions are caught and rethrown with a WebServiceException
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/RPCLitMethodMarshaller.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/RPCLitMethodMarshaller.java?view=diff&rev=482754&r1=482753&r2=482754
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/RPCLitMethodMarshaller.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/RPCLitMethodMarshaller.java Tue Dec 5 12:11:00 2006
@@ -54,7 +54,7 @@
EndpointDescription endpointDesc = ed.getEndpointDescription();
Protocol protocol = null;
try {
- protocol = Protocol.getProtocolForBinding(endpointDesc.getBindingType()); //soap11;
+ protocol = Protocol.getProtocolForBinding(endpointDesc.getClientBindingID());
} catch (MessageException e) {
// TODO better handling than this?
e.printStackTrace();
@@ -164,17 +164,21 @@
- public Message marshalResponse(Object returnObject, Object[] signatureArgs, OperationDescription operationDesc)
+ public Message marshalResponse(Object returnObject, Object[] signatureArgs,
+ OperationDescription operationDesc, Protocol protocol)
throws WebServiceException {
EndpointInterfaceDescription ed = operationDesc.getEndpointInterfaceDescription();
EndpointDescription endpointDesc = ed.getEndpointDescription();
- Protocol protocol = null;
- try {
- protocol = Protocol.getProtocolForBinding(endpointDesc.getBindingType()); //soap11;
- } catch (MessageException e) {
- // TODO better handling than this?
- e.printStackTrace();
+ // We want to respond with the same protocol as the request,
+ // It the protocol is null, then use the Protocol defined by the binding
+ if (protocol == null) {
+ try {
+ protocol = Protocol.getProtocolForBinding(endpointDesc.getBindingType());
+ } catch (MessageException e) {
+ // TODO better handling than this?
+ e.printStackTrace();
+ }
}
// Note all exceptions are caught and rethrown with a WebServiceException
@@ -298,16 +302,20 @@
}
}
- public Message marshalFaultResponse(Throwable throwable, OperationDescription operationDesc) throws WebServiceException {
+ public Message marshalFaultResponse(Throwable throwable,
+ OperationDescription operationDesc, Protocol protocol) throws WebServiceException {
EndpointInterfaceDescription ed = operationDesc.getEndpointInterfaceDescription();
EndpointDescription endpointDesc = ed.getEndpointDescription();
- Protocol protocol = null;
- try {
- protocol = Protocol.getProtocolForBinding(endpointDesc.getBindingType()); //soap11;
- } catch (MessageException e) {
- // TODO better handling than this?
- e.printStackTrace();
+ // We want to respond with the same protocol as the request,
+ // It the protocol is null, then use the Protocol defined by the binding
+ if (protocol == null) {
+ try {
+ protocol = Protocol.getProtocolForBinding(endpointDesc.getBindingType());
+ } catch (MessageException e) {
+ // TODO better handling than this?
+ e.printStackTrace();
+ }
}
// Note all exceptions are caught and rethrown with a WebServiceException
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java?view=diff&rev=482754&r1=482753&r2=482754
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java Tue Dec 5 12:11:00 2006
@@ -66,6 +66,7 @@
initialize(mc);
OperationDescription operationDesc = getOperationDescription(mc); //mc.getOperationDescription();
+ Protocol requestProtocol = mc.getMessage().getProtocol();
MethodMarshaller methodMarshaller = getMethodMarshaller(mc.getMessage().getProtocol(), mc.getOperationDescription());
Object[] methodInputParams = methodMarshaller.demarshalRequest(mc.getMessage(), mc.getOperationDescription());
Method target = getJavaMethod(mc, serviceImplClass);
@@ -101,13 +102,16 @@
return null;
}
else if (response instanceof Throwable) {
- message = methodMarshaller.marshalFaultResponse((Throwable)response, mc.getOperationDescription());
+ message = methodMarshaller.marshalFaultResponse((Throwable)response, mc.getOperationDescription(),
+ requestProtocol); // Send the response using the same protocol as the request
}
else if(target.getReturnType().getName().equals("void")){
- message = methodMarshaller.marshalResponse(null, methodInputParams, mc.getOperationDescription());
+ message = methodMarshaller.marshalResponse(null, methodInputParams, mc.getOperationDescription(),
+ requestProtocol); // Send the response using the same protocol as the request
}
else{
- message = methodMarshaller.marshalResponse(response, methodInputParams, mc.getOperationDescription());
+ message = methodMarshaller.marshalResponse(response, methodInputParams, mc.getOperationDescription(),
+ requestProtocol); // Send the response using the same protocol as the request
}
MessageContext responseMsgCtx = MessageContextUtils.createMessageMessageContext(mc);
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyTests.java?view=diff&rev=482754&r1=482753&r2=482754
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyTests.java Tue Dec 5 12:11:00 2006
@@ -128,10 +128,7 @@
}
}
- /*
- * TODO Temporarily disabled by AXIS2-1825
- */
- public void _testInvokeWithWSDL(){
+ public void testInvokeWithWSDL(){
try{
if(!runningOnAxis){
return;
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/SOAP12ProxyTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/SOAP12ProxyTests.java?view=diff&rev=482754&r1=482753&r2=482754
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/SOAP12ProxyTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/SOAP12ProxyTests.java Tue Dec 5 12:11:00 2006
@@ -42,9 +42,8 @@
/**
* Send a SOAP 1.2 request and expect a SOAP 1.2 response.
- * TODO Temporarily disabled by AXIS2-1825
*/
- public void _testSOAP12RequestSOAP12Response() throws Exception {
+ public void testSOAP12RequestSOAP12Response() throws Exception {
System.out.println("---------------------------------------");
System.out.println("test: " + getName());
@@ -66,9 +65,8 @@
/**
* Send a SOAP 1.2 request, but have the server send back a SOAP 1.1
* response. This should result in an exception.
- * TODO Temporarily disabled by AXIS2-1825
*/
- public void _testSOAP12RequestSOAP11Response() {
+ public void testSOAP12RequestSOAP11Response() {
System.out.println("---------------------------------------");
System.out.println("test: " + getName());
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddressBookTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddressBookTests.java?view=diff&rev=482754&r1=482753&r2=482754
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddressBookTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddressBookTests.java Tue Dec 5 12:11:00 2006
@@ -47,10 +47,9 @@
/**
* Test the endpoint by invoking it with a JAX-WS Dispatch.
- * TODO Temporarily disabled by AXIS2-1825
*/
- public void _testAddressBookWithDispatch() throws Exception {
+ public void testAddressBookWithDispatch() throws Exception {
try {
System.out.println("----------------------------------");
System.out.println("test: " + getName());
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/MtomSampleTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/MtomSampleTests.java?view=diff&rev=482754&r1=482753&r2=482754
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/MtomSampleTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/MtomSampleTests.java Tue Dec 5 12:11:00 2006
@@ -165,10 +165,9 @@
/*
* Enable attachment optimization using both the SOAP12 binding
* property for MTOM
- * TODO Temporarily disabled by AXIS2-1825
*/
- public void _testSendImageAttachmentProperty12() throws Exception {
+ public void testSendImageAttachmentProperty12() throws Exception {
System.out.println("----------------------------------");
System.out.println("test: " + getName());
@@ -209,9 +208,8 @@
/*
* Enable attachment optimization using both the SOAP12 binding API
* for MTOM
- * TODO Temporarily disabled by AXIS2-1825
*/
- public void _testSendImageAttachmentAPI12() throws Exception {
+ public void testSendImageAttachmentAPI12() throws Exception {
System.out.println("----------------------------------");
System.out.println("test: " + getName());
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org