Author: darran.lofthouse(a)jboss.com Date: 2010-06-02 13:03:24 -0400 (Wed, 02 Jun 2010) New Revision: 12410 Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/Endpoint.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/EndpointImpl.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/TheType.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2845/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2845/WEB-INF/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2845/WEB-INF/jboss-web.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2845/WEB-INF/web.xml Removed: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/Endpoint.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/EndpointImpl.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/TheType.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2845/WEB-INF/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2845/WEB-INF/jboss-web.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2845/WEB-INF/web.xml Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java Log: [JBPAPP-4412] NullPointerException deploying JAX-WS endpoint with types in target namespace ending with '#' Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml 2010-06-02 16:47:45 UTC (rev 12409) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml 2010-06-02 17:03:24 UTC (rev 12410) @@ -689,6 +689,17 @@ </webinf> </war> + <!-- jaxws-jbws2845 --> + <war warfile="${tests.output.dir}/libs/jaxws-jbws2845.war" webxml="${tests.output.dir}/resources/jaxws/jbws2845/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws2845/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/jbws2845/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> + <!-- 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"> Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java 2010-06-02 16:47:45 UTC (rev 12409) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java 2010-06-02 17:03:24 UTC (rev 12410) @@ -534,6 +534,9 @@ fname = fname.replace('/', '_'); fname = fname.replace(':', '_'); + fname = fname.replace('?', '_'); + fname = fname.replace('#', '_'); + File file = File.createTempFile("JBossWS_" + fname, ".xsd", tmpdir); return file; } Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845 (from rev 11404, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2845) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/Endpoint.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2845/Endpoint.java 2010-01-13 18:11:17 UTC (rev 11404) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/Endpoint.java 2010-06-02 17:03:24 UTC (rev 12410) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, 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.jbws2845; - -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; - -/** - * Test Endpoint. - * - * @author darran.lofthouse(a)jboss.com - * @since 13th January 2010 - */ -@WebService(name = "Endpoint", targetNamespace = "http://ws.jboss.org/jbws2845") -public interface Endpoint -{ - - @WebResult(targetNamespace = "http://ws.jboss.org/jbws2845/types#") - public TheType echo(@WebParam(targetNamespace = "http://ws.jboss.org/jbws2845/types#") final TheType message); - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/Endpoint.java (from rev 11404, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2845/Endpoint.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/Endpoint.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/Endpoint.java 2010-06-02 17:03:24 UTC (rev 12410) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.jbws2845; + +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; + +/** + * Test Endpoint. + * + * @author darran.lofthouse(a)jboss.com + * @since 13th January 2010 + */ +@WebService(name = "Endpoint", targetNamespace = "http://ws.jboss.org/jbws2845") +public interface Endpoint +{ + + @WebResult(targetNamespace = "http://ws.jboss.org/jbws2845/types#") + public TheType echo(@WebParam(targetNamespace = "http://ws.jboss.org/jbws2845/types#") final TheType message); + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/EndpointImpl.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2845/EndpointImpl.java 2010-01-13 18:11:17 UTC (rev 11404) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/EndpointImpl.java 2010-06-02 17:03:24 UTC (rev 12410) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, 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.jbws2845; - -import javax.jws.WebService; - -/** - * Test Endpoint implementation. - * - * @author darran.lofthouse(a)jboss.com - * @since 13th January 2010 - */ -@WebService(name = "Endpoint", targetNamespace = "http://ws.jboss.org/jbws2845", endpointInterface = "org.jboss.test.ws.jaxws.jbws2845.Endpoint") -public class EndpointImpl implements Endpoint -{ - - public TheType echo(final TheType message) - { - return message; - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/EndpointImpl.java (from rev 11404, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2845/EndpointImpl.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/EndpointImpl.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/EndpointImpl.java 2010-06-02 17:03:24 UTC (rev 12410) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.jbws2845; + +import javax.jws.WebService; + +/** + * Test Endpoint implementation. + * + * @author darran.lofthouse(a)jboss.com + * @since 13th January 2010 + */ +@WebService(name = "Endpoint", targetNamespace = "http://ws.jboss.org/jbws2845", endpointInterface = "org.jboss.test.ws.jaxws.jbws2845.Endpoint") +public class EndpointImpl implements Endpoint +{ + + public TheType echo(final TheType message) + { + return message; + } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.java 2010-01-13 18:11:17 UTC (rev 11404) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.java 2010-06-02 17:03:24 UTC (rev 12410) @@ -1,72 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, 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.jbws2845; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * [JBWS-2845] NullPointerException deploying JAX-WS endpoint with types in - * target namespace ending with '#' - * - * @author darran.lofthouse(a)jboss.com - * @since 13th January 2010 - * @see https://jira.jboss.org/jira/browse/JBWS-2845 - */ -public class JBWS2845TestCase extends JBossWSTest -{ - - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2845/"; - - private static Endpoint port; - - public static Test suite() throws Exception - { - return new JBossWSTestSetup(JBWS2845TestCase.class, "jaxws-jbws2845.war"); - } - - public void setUp() throws Exception - { - super.setUp(); - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - QName serviceName = new QName("http://ws.jboss.org/jbws2845";, "EndpointImplService"); - - Service service = Service.create(wsdlURL, serviceName); - port = service.getPort(Endpoint.class); - } - - public void testCall() throws Exception - { - TheType in = new TheType(); - in.setMessage("Happy New Year"); - - TheType response = port.echo(in); - assertEquals("Happy New Year", in.getMessage(), response.getMessage()); - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.java (from rev 11404, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.java 2010-06-02 17:03:24 UTC (rev 12410) @@ -0,0 +1,72 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.jbws2845; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-2845] NullPointerException deploying JAX-WS endpoint with types in + * target namespace ending with '#' + * + * @author darran.lofthouse(a)jboss.com + * @since 13th January 2010 + * @see https://jira.jboss.org/jira/browse/JBWS-2845 + */ +public class JBWS2845TestCase extends JBossWSTest +{ + + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2845/"; + + private static Endpoint port; + + public static Test suite() throws Exception + { + return new JBossWSTestSetup(JBWS2845TestCase.class, "jaxws-jbws2845.war"); + } + + public void setUp() throws Exception + { + super.setUp(); + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + QName serviceName = new QName("http://ws.jboss.org/jbws2845";, "EndpointImplService"); + + Service service = Service.create(wsdlURL, serviceName); + port = service.getPort(Endpoint.class); + } + + public void testCall() throws Exception + { + TheType in = new TheType(); + in.setMessage("Happy New Year"); + + TheType response = port.echo(in); + assertEquals("Happy New Year", in.getMessage(), response.getMessage()); + } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/TheType.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2845/TheType.java 2010-01-13 18:11:17 UTC (rev 11404) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/TheType.java 2010-06-02 17:03:24 UTC (rev 12410) @@ -1,18 +0,0 @@ -package org.jboss.test.ws.jaxws.jbws2845; - -public class TheType -{ - - private String message; - - public String getMessage() - { - return message; - } - - public void setMessage(String message) - { - this.message = message; - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/TheType.java (from rev 11404, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2845/TheType.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/TheType.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/TheType.java 2010-06-02 17:03:24 UTC (rev 12410) @@ -0,0 +1,18 @@ +package org.jboss.test.ws.jaxws.jbws2845; + +public class TheType +{ + + private String message; + + public String getMessage() + { + return message; + } + + public void setMessage(String message) + { + this.message = message; + } + +} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2845 (from rev 11404, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2845) Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2845/WEB-INF (from rev 11404, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2845/WEB-INF) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2845/WEB-INF/jboss-web.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2845/WEB-INF/jboss-web.xml 2010-01-13 18:11:17 UTC (rev 11404) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2845/WEB-INF/jboss-web.xml 2010-06-02 17:03:24 UTC (rev 12410) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!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-jbws2845</context-root> -</jboss-web> \ No newline at end of file Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2845/WEB-INF/jboss-web.xml (from rev 11404, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2845/WEB-INF/jboss-web.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2845/WEB-INF/jboss-web.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2845/WEB-INF/jboss-web.xml 2010-06-02 17:03:24 UTC (rev 12410) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!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-jbws2845</context-root> +</jboss-web> \ No newline at end of file Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2845/WEB-INF/web.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2845/WEB-INF/web.xml 2010-01-13 18:11:17 UTC (rev 11404) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2845/WEB-INF/web.xml 2010-06-02 17:03:24 UTC (rev 12410) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app version="2.4" 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"> - - <servlet> - <servlet-name>Endpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.jbws2845.EndpointImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>Endpoint</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> - -</web-app> \ No newline at end of file Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2845/WEB-INF/web.xml (from rev 11404, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2845/WEB-INF/web.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2845/WEB-INF/web.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2845/WEB-INF/web.xml 2010-06-02 17:03:24 UTC (rev 12410) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.4" 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"> + + <servlet> + <servlet-name>Endpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws2845.EndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>Endpoint</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> \ No newline at end of file