Author: heiko.braun(a)jboss.com Date: 2007-09-05 10:09:02 -0400 (Wed, 05 Sep 2007) New Revision: 4524 Added: framework/trunk/src/test/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/jboss-web.xml Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServletClient.java framework/trunk/src/test/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml Log: Extend serviceref tests Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServletClient.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServletClient.java 2007-09-05 14:06:53 UTC (rev 4523) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServletClient.java 2007-09-05 14:09:02 UTC (rev 4524) @@ -32,6 +32,7 @@ import javax.xml.ws.Service; import javax.xml.ws.WebServiceException; import javax.xml.ws.BindingProvider; +import javax.xml.ws.WebServiceRef; import javax.xml.ws.soap.SOAPBinding; import org.jboss.logging.Logger; @@ -41,6 +42,9 @@ // Provide logging private static Logger log = Logger.getLogger(ServletClient.class); + @WebServiceRef(name="service3") + TestEndpointService injectedService = null; + protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException { String inStr = req.getParameter("echo"); @@ -75,6 +79,12 @@ throw new WebServiceException("Invalid echo return: " + inStr); } + // Test the injected service as well + TestEndpoint injectedPort = injectedService.getTestEndpointPort(); + String outStr = injectedPort.echo("Test injected service"); + if (outStr.equals("Test injected service") == false) + throw new WebServiceException("Invalid echo return on injected service/port: " + inStr); + res.getWriter().print(inStr); } } Added: framework/trunk/src/test/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/jboss-web.xml =================================================================== --- framework/trunk/src/test/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/jboss-web.xml (rev 0) +++ framework/trunk/src/test/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/jboss-web.xml 2007-09-05 14:09:02 UTC (rev 4524) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd"> + +<jboss-web> + <!--class-loading> + <loader-repository>jbossws.samples:loader=IsolatedRepository + <loader-repository-config>java2ParentDelegation=false</loader-repository-config> + </loader-repository> + </class-loading--> + <!--service-ref> + <service-ref-name>service2</service-ref-name> + <wsdl-override>file:/home/hbraun/dev/prj/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/cts/data/wsdl/WSEjbMultipleClientInje +ctionTest1.ear/WSEjbMultipleClientInjectionTest1_ejb.jar/HelloService.wsdl</wsdl-override> + </service-ref--> +</jboss-web> Property changes on: framework/trunk/src/test/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/jboss-web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: framework/trunk/src/test/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml =================================================================== --- framework/trunk/src/test/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml 2007-09-05 14:06:53 UTC (rev 4523) +++ framework/trunk/src/test/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml 2007-09-05 14:09:02 UTC (rev 4524) @@ -30,5 +30,16 @@ <enable-mtom>true</enable-mtom> </port-component-ref> </service-ref> + + <service-ref> + <service-ref-name>service3</service-ref-name> + <service-interface>javax.xml.ws.Service</service-interface> + <wsdl-file>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-file> + <service-qname>{http://serviceref.samples.jaxws.ws.test.jboss.org/}Test... + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.serviceref.TestEndpoint</service-endpoint-interface> + <enable-mtom>true</enable-mtom> + </port-component-ref> + </service-ref> </web-app> \ No newline at end of file