Author: thomas.diesler(a)jboss.com Date: 2007-05-23 08:03:18 -0400 (Wed, 23 May 2007) New Revision: 3213 Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/namespace/ trunk/jbossws-core/src/test/resources/jaxws/namespace/ Removed: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/metadata/ trunk/jbossws-core/src/test/resources/jaxws/metadata/ Modified: trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/namespace/EndpointBean.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/namespace/EndpointInterface.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/namespace/JAXWSBuilderTestCase.java trunk/jbossws-core/src/test/resources/jaxws/namespace/WEB-INF/jboss-web.xml trunk/jbossws-core/src/test/resources/jaxws/namespace/WEB-INF/web.xml Log: Fix namespace testcase Modified: trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-05-23 12:02:26 UTC (rev 3212) +++ trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-05-23 12:03:18 UTC (rev 3213) @@ -230,15 +230,14 @@ </metainf> </jar> - <!-- jaxws metadata --> - <war warfile="${tests.output.dir}/libs/jaxws-metadata.war" webxml="${tests.output.dir}/resources/jaxws/metadata/WEB-INF/web.xml"> + <!-- jaxws namespace --> + <war warfile="${tests.output.dir}/libs/jaxws-namespace.war" webxml="${tests.output.dir}/resources/jaxws/namespace/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/metadata/EndpointBean.class"/> - <include name="org/jboss/test/ws/jaxws/metadata/EndpointInterface.class"/> + <include name="org/jboss/test/ws/jaxws/namespace/EndpointBean.class"/> + <include name="org/jboss/test/ws/jaxws/namespace/EndpointInterface.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/metadata/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxws/namespace/WEB-INF"> <include name="jboss-web.xml"/> - <include name="wsdl/*"/> </webinf> </war> Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/namespace (from rev 3199, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/metadata) Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/namespace/EndpointBean.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/metadata/EndpointBean.java 2007-05-23 05:45:07 UTC (rev 3199) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/namespace/EndpointBean.java 2007-05-23 12:03:18 UTC (rev 3213) @@ -19,22 +19,50 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.test.ws.jaxws.metadata; +package org.jboss.test.ws.jaxws.namespace; +import javax.annotation.Resource; import javax.jws.WebService; +import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPException; +import javax.xml.ws.WebServiceContext; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.handler.soap.SOAPMessageContext; +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.utils.DOMWriter; + /** * Test namespace differences at service and portType levels * * @author Thomas.Diesler(a)jboss.org * @since 29-Apr-2005 */ -@WebService(endpointInterface = "org.jboss.test.ws.jaxws.metadata.EndpointInterface", targetNamespace = "http://example.org/impl") +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.namespace.EndpointInterface", targetNamespace = "http://example.org/impl") public class EndpointBean implements EndpointInterface { + private static final Logger log = Logger.getLogger(EndpointBean.class); + + @Resource + WebServiceContext context; + public String echo(String message) { - System.out.println(message); + log.info("echo:" + message); + + try + { + SOAPMessageContext msgContext = (SOAPMessageContext)context.getMessageContext(); + SOAPBody body = msgContext.getMessage().getSOAPBody(); + String bodyStr = DOMWriter.printNode(body, false); + if (bodyStr.indexOf("http://example.org/sei") < 0) + throw new WebServiceException("Invalid body: " + bodyStr); + } + catch (SOAPException ex) + { + throw new WebServiceException(ex); + } + return message; } } Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/namespace/EndpointInterface.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/metadata/EndpointInterface.java 2007-05-23 05:45:07 UTC (rev 3199) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/namespace/EndpointInterface.java 2007-05-23 12:03:18 UTC (rev 3213) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.test.ws.jaxws.metadata; +package org.jboss.test.ws.jaxws.namespace; import javax.jws.WebMethod; import javax.jws.WebParam; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/namespace/JAXWSBuilderTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/metadata/JAXWSBuilderTestCase.java 2007-05-23 05:45:07 UTC (rev 3199) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/namespace/JAXWSBuilderTestCase.java 2007-05-23 12:03:18 UTC (rev 3213) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.test.ws.jaxws.metadata; +package org.jboss.test.ws.jaxws.namespace; // $Id: $ @@ -44,7 +44,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(JAXWSBuilderTestCase.class, "jaxws-metadata.war"); + return JBossWSTestSetup.newTestSetup(JAXWSBuilderTestCase.class, "jaxws-namespace.war"); } /** @@ -59,7 +59,7 @@ public void testSEIDerivedNamespaces() throws Exception { // Create the port - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-metadata?wsdl"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-namespace?wsdl"); QName qname = new QName("http://example.org/impl";, "EndpointBeanService"); Service service = Service.create(wsdlURL, qname); EndpointInterface port = service.getPort(EndpointInterface.class); Copied: trunk/jbossws-core/src/test/resources/jaxws/namespace (from rev 3199, trunk/jbossws-core/src/test/resources/jaxws/metadata) Modified: trunk/jbossws-core/src/test/resources/jaxws/namespace/WEB-INF/jboss-web.xml =================================================================== --- trunk/jbossws-core/src/test/resources/jaxws/metadata/WEB-INF/jboss-web.xml 2007-05-23 05:45:07 UTC (rev 3199) +++ trunk/jbossws-core/src/test/resources/jaxws/namespace/WEB-INF/jboss-web.xml 2007-05-23 12:03:18 UTC (rev 3213) @@ -3,5 +3,5 @@ <!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> <jboss-web> - <context-root>/jaxws-metadata</context-root> + <context-root>/jaxws-namespace</context-root> </jboss-web> \ No newline at end of file Modified: trunk/jbossws-core/src/test/resources/jaxws/namespace/WEB-INF/web.xml =================================================================== --- trunk/jbossws-core/src/test/resources/jaxws/metadata/WEB-INF/web.xml 2007-05-23 05:45:07 UTC (rev 3199) +++ trunk/jbossws-core/src/test/resources/jaxws/namespace/WEB-INF/web.xml 2007-05-23 12:03:18 UTC (rev 3213) @@ -7,7 +7,7 @@ <servlet> <servlet-name>TestService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.metadata.EndpointBean</servlet-class> + <servlet-class>org.jboss.test.ws.jaxws.namespace.EndpointBean</servlet-class> </servlet> <servlet-mapping>