Author: richard.opalka(a)jboss.com Date: 2009-10-20 08:09:12 -0400 (Tue, 20 Oct 2009) New Revision: 10966 Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2717/ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2717/EndpointImpl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2717/JBWS2717TestCase.java framework/trunk/testsuite/test/resources/jaxws/jbws2717/ framework/trunk/testsuite/test/resources/jaxws/jbws2717/WEB-INF/ framework/trunk/testsuite/test/resources/jaxws/jbws2717/WEB-INF/web.xml Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml Log: [JBWS-2717] providing test case Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2009-10-20 11:35:21 UTC (rev 10965) +++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2009-10-20 12:09:12 UTC (rev 10966) @@ -839,6 +839,14 @@ </fileset> </jar> + <!-- jaxws-jbws2717 --> + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2717.war" + webxml="${tests.output.dir}/test-resources/jaxws/jbws2717/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws2717/EndpointImpl.class"/> + </classes> + </war> + <!-- jaxws namespace --> <war warfile="${tests.output.dir}/test-libs/jaxws-namespace.war" webxml="${tests.output.dir}/test-resources/jaxws/namespace/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2717/EndpointImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2717/EndpointImpl.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2717/EndpointImpl.java 2009-10-20 12:09:12 UTC (rev 10966) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.jbws2717; + +import javax.jws.WebMethod; +import javax.jws.WebService; + +/** + * Endpoint implementation. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +@WebService (name="Endpoint", serviceName="EndpointService") +public class EndpointImpl +{ + @WebMethod + public String echo(final String s) + { + return s; + } +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2717/JBWS2717TestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2717/JBWS2717TestCase.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2717/JBWS2717TestCase.java 2009-10-20 12:09:12 UTC (rev 10966) @@ -0,0 +1,57 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.jbws2717; + +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import java.net.URL; + +import junit.framework.Test; + +import org.jboss.wsf.common.IOUtils; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-2717] Send XML declarations with WSDL + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public class JBWS2717TestCase extends JBossWSTest +{ + + public static Test suite() + { + return new JBossWSTestSetup(JBWS2717TestCase.class, "jaxws-jbws2717.war"); + } + + public void testXmlDeclarationInWSDL() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2717?wsdl"); + InputStream wsdlContent = wsdlURL.openStream(); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + IOUtils.copyStream(baos, wsdlContent); + String wsdlAsText = new String(baos.toByteArray()); + assertTrue(wsdlAsText.startsWith("<?xml version")); + } + +} Added: framework/trunk/testsuite/test/resources/jaxws/jbws2717/WEB-INF/web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws2717/WEB-INF/web.xml (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/jbws2717/WEB-INF/web.xml 2009-10-20 12:09:12 UTC (rev 10966) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>TestService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws2717.EndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> +