Author: thomas.diesler(a)jboss.com Date: 2007-05-30 04:15:50 -0400 (Wed, 30 May 2007) New Revision: 3298 Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpointImpl.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpointImpl.java Log: Fix service names Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java 2007-05-30 08:01:59 UTC (rev 3297) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java 2007-05-30 08:15:50 UTC (rev 3298) @@ -54,7 +54,7 @@ public void testClientAccess() throws Exception { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-binding?wsdl"); - QName qname = new QName("http://org.jboss.ws/jaxws/binding", "SOAPEndpointService"); + QName qname = new QName("http://org.jboss.ws/jaxws/binding", "SOAPEndpointBeanService"); Service service = Service.create(wsdlURL, qname); SOAPEndpoint port = (SOAPEndpoint)service.getPort(SOAPEndpoint.class); Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java 2007-05-30 08:01:59 UTC (rev 3297) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java 2007-05-30 08:15:50 UTC (rev 3298) @@ -60,7 +60,7 @@ if (trackerPort == null) { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-handlerlifecycle/tracker?wsdl"); - QName serviceName = new QName("http://org.jboss.ws/jaxws/handlerlifecycle", "TrackerEndpointService"); + QName serviceName = new QName("http://org.jboss.ws/jaxws/handlerlifecycle", "TrackerEndpointBeanService"); Service service = Service.create(wsdlURL, serviceName); trackerPort = (TrackerEndpoint)service.getPort(TrackerEndpoint.class); } @@ -68,7 +68,7 @@ if (port == null) { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-handlerlifecycle/soap?wsdl"); - QName serviceName = new QName("http://org.jboss.ws/jaxws/handlerlifecycle", "SOAPEndpointService"); + QName serviceName = new QName("http://org.jboss.ws/jaxws/handlerlifecycle", "SOAPEndpointBeanService"); Service service = Service.create(wsdlURL, serviceName); port = (SOAPEndpoint)service.getPort(SOAPEndpoint.class); } Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java 2007-05-30 08:01:59 UTC (rev 3297) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java 2007-05-30 08:15:50 UTC (rev 3298) @@ -49,7 +49,7 @@ public void testClientAccess() throws Exception { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-handlerscope?wsdl"); - QName serviceName = new QName("http://org.jboss.ws/jaxws/handlerscope", "SOAPEndpointService"); + QName serviceName = new QName("http://org.jboss.ws/jaxws/handlerscope", "SOAPEndpointBeanService"); Service service = Service.create(wsdlURL, serviceName); SOAPEndpoint port = (SOAPEndpoint)service.getPort(SOAPEndpoint.class); Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java 2007-05-30 08:01:59 UTC (rev 3297) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java 2007-05-30 08:15:50 UTC (rev 3298) @@ -42,7 +42,7 @@ * @author darran.lofthouse(a)jboss.com * @since 19-October-2006 */ -@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws1190.TestEndpoint", targetNamespace = "http://org.jboss/test/ws/jbws1190", name = "Test") +@WebService(name = "Test", serviceName = "TestService", targetNamespace = "http://org.jboss/test/ws/jbws1190", endpointInterface = "org.jboss.test.ws.jaxws.jbws1190.TestEndpoint") public class TestEndpointImpl implements TestEndpoint { Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.java 2007-05-30 08:01:59 UTC (rev 3297) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.java 2007-05-30 08:15:50 UTC (rev 3298) @@ -23,7 +23,7 @@ import javax.jws.WebService; -(a)WebService(endpointInterface="org.jboss.test.ws.jaxws.jbws1357.JBWS1357", name="JBWS1357") +@WebService(name="JBWS1357", serviceName="JBWS1357Service", endpointInterface="org.jboss.test.ws.jaxws.jbws1357.JBWS1357") public class JBWS1357Impl implements JBWS1357 { public String echo(String message) Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java 2007-05-30 08:01:59 UTC (rev 3297) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java 2007-05-30 08:15:50 UTC (rev 3298) @@ -25,7 +25,7 @@ // An endpoint implementation that does not define a target namespace // does NOT inherit the namespace from the referrenced SEI -(a)WebService(endpointInterface="org.jboss.test.ws.jaxws.jbws1529.JBWS1529", name="JBWS1529") +@WebService(name="JBWS1529", serviceName="JBWS1529Service", endpointInterface="org.jboss.test.ws.jaxws.jbws1529.JBWS1529") public class JBWS1529Impl implements JBWS1529 { public String echo(String message) throws UserException Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java 2007-05-30 08:01:59 UTC (rev 3297) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java 2007-05-30 08:15:50 UTC (rev 3298) @@ -31,7 +31,7 @@ import org.jboss.annotation.ejb.RemoteBinding; import org.jboss.wsf.spi.annotation.WebContext; -@WebService(name = "EJB3Bean", targetNamespace = "http://org.jboss.ws/jbws944") +@WebService(name = "EJB3Bean", serviceName = "EJB3BeanService", targetNamespace = "http://org.jboss.ws/jbws944") @WebContext(contextRoot = "/jaxws-jbws944", urlPattern = "/FooBean01") @SOAPBinding(style = SOAPBinding.Style.RPC) @Remote(EJB3RemoteInterface.class) Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.java 2007-05-30 08:01:59 UTC (rev 3297) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.java 2007-05-30 08:15:50 UTC (rev 3298) @@ -23,7 +23,7 @@ import javax.jws.WebService; -(a)WebService(endpointInterface="org.jboss.test.ws.jaxws.wrapped.accessor.Accessor", name="Accessor") +@WebService(name="Accessor", serviceName="AccessorService", endpointInterface="org.jboss.test.ws.jaxws.wrapped.accessor.Accessor") public class AccessorImpl implements Accessor { public String fieldAccessor(String one, int two) Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.java 2007-05-30 08:01:59 UTC (rev 3297) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.java 2007-05-30 08:15:50 UTC (rev 3298) @@ -42,7 +42,7 @@ * @since 24-Nov-2005 */ @SOAPBinding(style = SOAPBinding.Style.DOCUMENT, parameterStyle = SOAPBinding.ParameterStyle.BARE) -@WebService(name = "FaultToEndpoint", targetNamespace = "http://org.jboss.ws/addressing/replyto") +@WebService(name = "FaultToEndpoint", serviceName = "FaultToEndpointService", targetNamespace = "http://org.jboss.ws/addressing/replyto") public class FaultToEndpointImpl { // provide logging Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpointImpl.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpointImpl.java 2007-05-30 08:01:59 UTC (rev 3297) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpointImpl.java 2007-05-30 08:15:50 UTC (rev 3298) @@ -40,7 +40,7 @@ * @since 24-Nov-2005 */ @SOAPBinding(style = SOAPBinding.Style.RPC) -@WebService(name = "InitialEndpoint", targetNamespace = "http://org.jboss.ws/addressing/replyto") +@WebService(name = "InitialEndpoint", serviceName = "InitialEndpointService", targetNamespace = "http://org.jboss.ws/addressing/replyto") @EndpointConfig(configName = "Standard WSAddressing Endpoint") public class InitialEndpointImpl implements InitialEndpoint { Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpointImpl.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpointImpl.java 2007-05-30 08:01:59 UTC (rev 3297) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpointImpl.java 2007-05-30 08:15:50 UTC (rev 3298) @@ -42,7 +42,7 @@ * @since 24-Nov-2005 */ @SOAPBinding(style = SOAPBinding.Style.RPC) -@WebService(name = "ReplyToEndpoint", targetNamespace = "http://org.jboss.ws/addressing/replyto") +@WebService(name = "ReplyToEndpoint", serviceName = "ReplyToEndpointService", targetNamespace = "http://org.jboss.ws/addressing/replyto") public class ReplyToEndpointImpl implements ReplyToEndpoint { // provide logging