[jbossws-commits] JBossWS SVN: r11973 - in stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws: jaxws/samples/wseventing and 2 other directories.

Author: richard.opalka(a)jboss.com Date: 2010-04-13 02:02:32 -0400 (Tue, 13 Apr 2010) New Revision: 11973 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/EchoImpl.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/NotifyImpl.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonManagementEndpoint.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonRegistrationEndpoint.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wseventing/CustomEventSource.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wseventing/CustomSubscriptionManager.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wseventing/InVMServlet.java Log: [JBWS-2991] fixing JAXWS test cases Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/EchoImpl.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/EchoImpl.java 2010-04-13 05:58:30 UTC (rev 11972) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/EchoImpl.java 2010-04-13 06:02:32 UTC (rev 11973) @@ -21,8 +21,6 @@ */ package org.jboss.test.ws.interop.nov2007.wsaSoap12; -import org.jboss.ws.annotation.EndpointConfig; - import javax.jws.WebMethod; import javax.jws.WebParam; import javax.jws.WebResult; @@ -30,6 +28,7 @@ import javax.jws.soap.SOAPBinding; import javax.xml.ws.Action; import javax.xml.ws.BindingType; +import javax.xml.ws.soap.Addressing; /** * @author Alessio Soldano, alessio.soldano(a)jboss.com @@ -43,7 +42,7 @@ portName = "CustomBinding_Echo1" ) @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) -@EndpointConfig(configName = "Standard SOAP 1.2 WSAddressing Endpoint") +@Addressing @BindingType(javax.xml.ws.soap.SOAPBinding.SOAP12HTTP_BINDING) public class EchoImpl implements Echo { Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/NotifyImpl.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/NotifyImpl.java 2010-04-13 05:58:30 UTC (rev 11972) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/NotifyImpl.java 2010-04-13 06:02:32 UTC (rev 11973) @@ -21,8 +21,6 @@ */ package org.jboss.test.ws.interop.nov2007.wsaSoap12; -import org.jboss.ws.annotation.EndpointConfig; - import javax.jws.WebMethod; import javax.jws.Oneway; import javax.jws.WebParam; @@ -30,6 +28,7 @@ import javax.jws.soap.SOAPBinding; import javax.xml.ws.Action; import javax.xml.ws.BindingType; +import javax.xml.ws.soap.Addressing; /** * @author Alessio Soldano, alessio.soldano(a)jboss.com @@ -43,7 +42,7 @@ portName = "CustomBinding_Notify1" ) @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) -@EndpointConfig(configName = "Standard SOAP 1.2 WSAddressing Endpoint") +@Addressing @BindingType(javax.xml.ws.soap.SOAPBinding.SOAP12HTTP_BINDING) public class NotifyImpl implements Notify { Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonManagementEndpoint.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonManagementEndpoint.java 2010-04-13 05:58:30 UTC (rev 11972) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonManagementEndpoint.java 2010-04-13 06:02:32 UTC (rev 11973) @@ -22,9 +22,9 @@ package org.jboss.test.ws.jaxws.samples.wseventing; import javax.jws.WebService; +import javax.xml.ws.soap.Addressing; import org.jboss.logging.Logger; -import org.jboss.ws.annotation.EndpointConfig; import org.jboss.ws.extensions.eventing.jaxws.AbstractSubscriptionManagerEndpoint; /** @@ -37,7 +37,7 @@ targetNamespace = "http://schemas.xmlsoap.org/ws/2004/08/eventing", wsdlLocation = "/WEB-INF/wsdl/sysmon.wsdl", endpointInterface = "org.jboss.ws.extensions.eventing.jaxws.SubscriptionManagerEndpoint") -@EndpointConfig(configName = "Standard WSAddressing Endpoint") +@Addressing public class SysmonManagementEndpoint extends AbstractSubscriptionManagerEndpoint { private static final Logger log = Logger.getLogger(SysmonManagementEndpoint.class); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonRegistrationEndpoint.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonRegistrationEndpoint.java 2010-04-13 05:58:30 UTC (rev 11972) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonRegistrationEndpoint.java 2010-04-13 06:02:32 UTC (rev 11973) @@ -22,9 +22,9 @@ package org.jboss.test.ws.jaxws.samples.wseventing; import javax.jws.WebService; +import javax.xml.ws.soap.Addressing; import org.jboss.logging.Logger; -import org.jboss.ws.annotation.EndpointConfig; import org.jboss.ws.extensions.eventing.jaxws.AbstractEventSourceEndpoint; /** @@ -37,7 +37,7 @@ targetNamespace = "http://schemas.xmlsoap.org/ws/2004/08/eventing", wsdlLocation = "/WEB-INF/wsdl/sysmon.wsdl", endpointInterface = "org.jboss.ws.extensions.eventing.jaxws.EventSourceEndpoint") -@EndpointConfig(configName = "Standard WSAddressing Endpoint") +@Addressing public class SysmonRegistrationEndpoint extends AbstractEventSourceEndpoint { private static final Logger log = Logger.getLogger(SysmonRegistrationEndpoint.class); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java 2010-04-13 05:58:30 UTC (rev 11972) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java 2010-04-13 06:02:32 UTC (rev 11973) @@ -28,13 +28,13 @@ import javax.xml.soap.MessageFactory; import javax.xml.soap.SOAPMessage; import javax.xml.ws.addressing.AddressingBuilder; -import javax.xml.ws.addressing.AddressingException; import javax.xml.ws.addressing.soap.SOAPAddressingBuilder; import javax.xml.ws.addressing.soap.SOAPAddressingProperties; +import javax.xml.ws.soap.SOAPFaultException; +import org.jboss.ws.extensions.addressing.soap.SOAPAddressingPropertiesImpl; import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.ws.extensions.addressing.soap.SOAPAddressingPropertiesImpl; /** * Test the SOAPAddressingProperties @@ -158,7 +158,7 @@ props.readHeaders(message); fail("ERRORNOUS_XML should cause a parsing exception due to missing wsa:Action value"); } - catch (AddressingException e) + catch (SOAPFaultException e) { // expected an exception } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wseventing/CustomEventSource.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wseventing/CustomEventSource.java 2010-04-13 05:58:30 UTC (rev 11972) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wseventing/CustomEventSource.java 2010-04-13 06:02:32 UTC (rev 11973) @@ -22,9 +22,9 @@ package org.jboss.test.ws.jaxws.wseventing; import javax.jws.WebService; +import javax.xml.ws.soap.Addressing; import org.jboss.logging.Logger; -import org.jboss.ws.annotation.EndpointConfig; import org.jboss.ws.extensions.eventing.jaxws.AbstractEventSourceEndpoint; /** @@ -37,7 +37,7 @@ targetNamespace = "http://schemas.xmlsoap.org/ws/2004/08/eventing", wsdlLocation = "/WEB-INF/wsdl/windreport.wsdl", endpointInterface = "org.jboss.ws.extensions.eventing.jaxws.EventSourceEndpoint") -@EndpointConfig(configName = "Standard WSAddressing Endpoint") +@Addressing public class CustomEventSource extends AbstractEventSourceEndpoint { private static final Logger log = Logger.getLogger(CustomEventSource.class); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wseventing/CustomSubscriptionManager.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wseventing/CustomSubscriptionManager.java 2010-04-13 05:58:30 UTC (rev 11972) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wseventing/CustomSubscriptionManager.java 2010-04-13 06:02:32 UTC (rev 11973) @@ -22,9 +22,9 @@ package org.jboss.test.ws.jaxws.wseventing; import javax.jws.WebService; +import javax.xml.ws.soap.Addressing; import org.jboss.logging.Logger; -import org.jboss.ws.annotation.EndpointConfig; import org.jboss.ws.extensions.eventing.jaxws.AbstractSubscriptionManagerEndpoint; /** @@ -37,7 +37,7 @@ targetNamespace = "http://schemas.xmlsoap.org/ws/2004/08/eventing", wsdlLocation = "/WEB-INF/wsdl/windreport.wsdl", endpointInterface = "org.jboss.ws.extensions.eventing.jaxws.SubscriptionManagerEndpoint") -@EndpointConfig(configName = "Standard WSAddressing Endpoint") +@Addressing public class CustomSubscriptionManager extends AbstractSubscriptionManagerEndpoint { private static final Logger log = Logger.getLogger(CustomSubscriptionManager.class); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wseventing/InVMServlet.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wseventing/InVMServlet.java 2010-04-13 05:58:30 UTC (rev 11972) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wseventing/InVMServlet.java 2010-04-13 06:02:32 UTC (rev 11973) @@ -31,7 +31,6 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.ServletException; import javax.naming.InitialContext; -import javax.naming.NamingException; import java.io.IOException; import java.net.URI;