Author: alessio.soldano(a)jboss.com Date: 2010-03-11 07:01:07 -0500 (Thu, 11 Mar 2010) New Revision: 11763 Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2955/ClientSOAPHandler.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2955/EndpointImpl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2955/EndpointService.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2955/JBWS2955TestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2956/ClientSOAPHandler.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2956/JBWS2956TestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2956/OnewayEndpointImpl.java Log: [JBWS-2955][JBWS-2956] Minor cleanup Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2955/ClientSOAPHandler.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2955/ClientSOAPHandler.java 2010-03-11 11:37:57 UTC (rev 11762) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2955/ClientSOAPHandler.java 2010-03-11 12:01:07 UTC (rev 11763) @@ -22,15 +22,12 @@ package org.jboss.test.ws.jaxws.jbws2955; import javax.xml.soap.SOAPBody; -import javax.xml.soap.SOAPElementFactory; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.ws.handler.LogicalMessageContext; import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; -import org.jboss.logging.Logger; -import org.jboss.wsf.common.DOMWriter; import org.jboss.wsf.common.handler.GenericSOAPHandler; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -65,11 +62,10 @@ } body.addDocument(document); message.saveChanges(); - } catch (SOAPException e) { - e.printStackTrace(); + throw new RuntimeException(e); } return true; } Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2955/EndpointImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2955/EndpointImpl.java 2010-03-11 11:37:57 UTC (rev 11762) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2955/EndpointImpl.java 2010-03-11 12:01:07 UTC (rev 11763) @@ -21,11 +21,8 @@ */ package org.jboss.test.ws.jaxws.jbws2955; -import javax.jws.HandlerChain; import javax.jws.WebService; -import org.jboss.logging.Logger; - @WebService(name = "Endpoint", portName = "EndpointPort", serviceName="EndpointService", targetNamespace = "http://ws.jboss.org/jbws2955", endpointInterface = "org.jboss.test.ws.jaxws.jbws2955.Endpoint") public class EndpointImpl implements Endpoint { Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2955/EndpointService.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2955/EndpointService.java 2010-03-11 11:37:57 UTC (rev 11762) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2955/EndpointService.java 2010-03-11 12:01:07 UTC (rev 11763) @@ -30,7 +30,6 @@ import javax.xml.ws.WebEndpoint; import javax.xml.ws.WebServiceClient; import javax.xml.ws.WebServiceException; -import javax.xml.ws.WebServiceFeature; @WebServiceClient(name = "EndpointService", targetNamespace = "http://ws.jboss.org/jbws2955") @HandlerChain(file = "client-handlers.xml") Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2955/JBWS2955TestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2955/JBWS2955TestCase.java 2010-03-11 11:37:57 UTC (rev 11762) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2955/JBWS2955TestCase.java 2010-03-11 12:01:07 UTC (rev 11763) @@ -22,25 +22,12 @@ package org.jboss.test.ws.jaxws.jbws2955; import java.net.URL; -import java.util.Iterator; -import javax.xml.namespace.QName; -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPBody; -import javax.xml.soap.SOAPConnection; -import javax.xml.soap.SOAPConnectionFactory; -import javax.xml.soap.SOAPEnvelope; -import javax.xml.soap.SOAPMessage; -import javax.xml.ws.Service; - import junit.framework.Test; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - public class JBWS2955TestCase extends JBossWSTest { @@ -57,7 +44,6 @@ { super.setUp(); URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - QName serviceName = new QName("http://ws.jboss.org/jbws2955";, "EndpointService"); EndpointService service = new EndpointService(wsdlURL); port = service.getEndpointPort(); } Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2956/ClientSOAPHandler.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2956/ClientSOAPHandler.java 2010-03-11 11:37:57 UTC (rev 11762) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2956/ClientSOAPHandler.java 2010-03-11 12:01:07 UTC (rev 11763) @@ -22,19 +22,14 @@ package org.jboss.test.ws.jaxws.jbws2956; import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPBody; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPFault; import javax.xml.soap.SOAPMessage; import javax.xml.ws.handler.LogicalMessageContext; import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.handler.soap.SOAPMessageContext; import javax.xml.ws.soap.SOAPFaultException; import org.jboss.wsf.common.handler.GenericSOAPHandler; -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; public class ClientSOAPHandler extends GenericSOAPHandler<LogicalMessageContext> { @@ -53,7 +48,7 @@ MessageFactory factory = MessageFactory.newInstance(); SOAPMessage resMessage = factory.createMessage(); fault = resMessage.getSOAPBody().addFault(); - fault.setFaultString("this is exception threwn by client outbound"); + fault.setFaultString("this is an exception thrown by client outbound"); throw new SOAPFaultException(fault); } catch (SOAPException e) Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2956/JBWS2956TestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2956/JBWS2956TestCase.java 2010-03-11 11:37:57 UTC (rev 11762) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2956/JBWS2956TestCase.java 2010-03-11 12:01:07 UTC (rev 11763) @@ -22,25 +22,12 @@ package org.jboss.test.ws.jaxws.jbws2956; import java.net.URL; -import java.util.Iterator; -import javax.xml.namespace.QName; -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPBody; -import javax.xml.soap.SOAPConnection; -import javax.xml.soap.SOAPConnectionFactory; -import javax.xml.soap.SOAPEnvelope; -import javax.xml.soap.SOAPMessage; -import javax.xml.ws.Service; - import junit.framework.Test; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - public class JBWS2956TestCase extends JBossWSTest { @@ -57,7 +44,6 @@ { super.setUp(); URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - QName serviceName = new QName("http://ws.jboss.org/jbws2956";, "EndpointService"); OnewayEndpointService service = new OnewayEndpointService(wsdlURL); port = service.getOnewayEndpointPort(); } Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2956/OnewayEndpointImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2956/OnewayEndpointImpl.java 2010-03-11 11:37:57 UTC (rev 11762) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2956/OnewayEndpointImpl.java 2010-03-11 12:01:07 UTC (rev 11763) @@ -21,7 +21,6 @@ */ package org.jboss.test.ws.jaxws.jbws2956; -import javax.jws.HandlerChain; import javax.jws.WebService;