Author: darran.lofthouse(a)jboss.com Date: 2008-08-25 10:51:39 -0400 (Mon, 25 Aug 2008) New Revision: 8133 Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/java/org/jboss/test/ws/jaxws/jbws1813/ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/java/org/jboss/test/ws/jaxws/jbws1813/Endpoint.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/java/org/jboss/test/ws/jaxws/jbws1813/EndpointImpl.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/resources/jaxws/jbws1813/ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/resources/jaxws/jbws1813/META-INF/ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/resources/jaxws/jbws1813/META-INF/application.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/resources/jaxws/jbws1813/META-INF/jboss.xml Removed: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/java/org/jboss/test/ws/jaxws/jbws1813/Endpoint.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/java/org/jboss/test/ws/jaxws/jbws1813/EndpointImpl.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/resources/jaxws/jbws1813/META-INF/ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/resources/jaxws/jbws1813/META-INF/application.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/resources/jaxws/jbws1813/META-INF/jboss.xml Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/.classpath stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/ant-import-tests/build-jars-jaxws.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/main/etc/component-info.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/main/etc/component-info42.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/version.properties Log: [JBPAPP-1126] context-root in jboss.xml is ignored. Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/.classpath =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/.classpath 2008-08-25 12:06:38 UTC (rev 8132) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/.classpath 2008-08-25 14:51:39 UTC (rev 8133) @@ -3,6 +3,7 @@ <classpathentry kind="src" path="src/main/java"/> <classpathentry kind="src" path="output/tests/wsconsume/java"/> <classpathentry kind="src" path="src/test/java"/> + <classpathentry kind="src" path="src/test-framework/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="thirdparty/activation.jar"/> <classpathentry kind="lib" path="thirdparty/getopt.jar"/> Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/ant-import-tests/build-jars-jaxws.xml 2008-08-25 12:06:38 UTC (rev 8132) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/ant-import-tests/build-jars-jaxws.xml 2008-08-25 14:51:39 UTC (rev 8133) @@ -425,6 +425,24 @@ </webinf> </war> + <!-- jaxws-jbws1813 --> + <jar destfile="${tests.output.dir}/libs/jaxws-jbws1813.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1813/EndpointImpl.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1813/META-INF"> + <include name="jboss.xml"/> + </metainf> + </jar> + <jar destfile="${tests.output.dir}/libs/jaxws-jbws1813.ear"> + <fileset dir="${tests.output.dir}/libs"> + <include name="jaxws-jbws1813.jar"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1813/META-INF"> + <include name="application.xml"/> + </metainf> + </jar> + <!-- jaxws-jbws1854 --> <war destfile="${tests.output.dir}/libs/jaxws-jbws1854.war" webxml="${tests.output.dir}/resources/jaxws/jbws1854/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/main/etc/component-info.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/main/etc/component-info.xml 2008-08-25 12:06:38 UTC (rev 8132) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/main/etc/component-info.xml 2008-08-25 14:51:39 UTC (rev 8133) @@ -14,10 +14,13 @@ <artifact id="jbossws-core-scripts.zip"/> <import componentref="jboss/jbossws-common"> - <compatible version="@jbossws-common@"/> + <compatible version="1.0.0.GA"/> + <compatible version="1.0.0.GA-brew"/> + <compatible version="1.0.0.GA_CP01-brew"/> </import> <import componentref="jboss/jbossws-framework"> - <compatible version="@jbossws-framework@"/> + <compatible version="2.0.1.GA"/> + <compatible version="2.0.1.GA-brew"/> </import> <import componentref="jboss/jbossws-spi"> <compatible version="@jbossws-spi@"/> @@ -32,16 +35,17 @@ <compatible version="@ibm-wsdl4j@-brew"/> </import> <import componentref="jbpm/bpel"> - <compatible version="@jbpm-bpel@"/> + <compatible version="1.1.0.Beta5"/> + <compatible version="1.1.0.GA"/> </import> <import componentref="stax-api"> <compatible version="@stax-api@"/> </import> <import componentref="sun-jaxb"> - <compatible version="@sun-jaxb@"/> + <compatible version="2.1.4-brew"/> </import> <import componentref="sun-jaxws"> - <compatible version="@sun-jaxws@"/> + <compatible version="2.1.1-brew"/> </import> <import componentref="woodstox"> <compatible version="@woodstox@"/> @@ -49,6 +53,7 @@ </import> <import componentref="wscommons-policy"> <compatible version="@wscommons-policy@"/> + <compatible version="1.0-brew"/> </import> <export> Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/main/etc/component-info42.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/main/etc/component-info42.xml 2008-08-25 12:06:38 UTC (rev 8132) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/main/etc/component-info42.xml 2008-08-25 14:51:39 UTC (rev 8133) @@ -10,14 +10,25 @@ <import componentref="jboss/jbossws"> <compatible version=&quot;@repository.id(a)&quot;/&gt; </import> + <import componentref="jboss/jbossxb"> - <compatible version="@jboss-jbossxb-jboss42@"/> - <compatible version="@jboss-jbossxb-jboss42@-brew"/> + <compatible version="1.0.0.SP1"/> + <compatible version="1.0.0.SP1-brew"/> + <compatible version="1.0.0.SP3-brew"/> </import> <import componentref="jboss/remoting"> - <compatible version="@jboss-remoting-jboss42@"/> - <compatible version="@jboss-remoting-jboss42@-brew"/> + <compatible version="2.2.2.GA_CP01-brew"/> + <compatible version="2.2.2.GA_CP02-brew"/> + <compatible version="2.2.2.SP1"/> + <compatible version="2.2.2.SP1-brew"/> + <compatible version="2.2.2.SP1.patch01-brew"/> + <compatible version="2.2.2.SP4-brew"/> + <compatible version="2.2.2.SP5-brew"/> + <compatible version="2.2.2.SP7-brew"/> + <compatible version="2.2.2.SP8-brew"/> + <compatible version="2.2.2.SP9-brew"/> </import> + <export> </export> Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/java/org/jboss/test/ws/jaxws/jbws1813 (from rev 8107, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1813) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/java/org/jboss/test/ws/jaxws/jbws1813/Endpoint.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1813/Endpoint.java 2008-08-14 16:25:00 UTC (rev 8107) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/java/org/jboss/test/ws/jaxws/jbws1813/Endpoint.java 2008-08-25 14:51:39 UTC (rev 8133) @@ -1,40 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1813; - -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.jws.soap.SOAPBinding.Style; - -@WebService(name = "Endpoint", targetNamespace = "http://org.jboss.ws/jbws1813") -@SOAPBinding(style = Style.RPC) -public interface Endpoint -{ - - @WebMethod - @WebResult(targetNamespace = "http://org.jboss.ws/jbws1813", partName = "return") - public String echo(@WebParam(name = "arg0", partName = "arg0") String arg0); - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/java/org/jboss/test/ws/jaxws/jbws1813/Endpoint.java (from rev 8107, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1813/Endpoint.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/java/org/jboss/test/ws/jaxws/jbws1813/Endpoint.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/java/org/jboss/test/ws/jaxws/jbws1813/Endpoint.java 2008-08-25 14:51:39 UTC (rev 8133) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1813; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.Style; + +@WebService(name = "Endpoint", targetNamespace = "http://org.jboss.ws/jbws1813") +@SOAPBinding(style = Style.RPC) +public interface Endpoint +{ + + @WebMethod + @WebResult(targetNamespace = "http://org.jboss.ws/jbws1813", partName = "return") + public String echo(@WebParam(name = "arg0", partName = "arg0") String arg0); + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/java/org/jboss/test/ws/jaxws/jbws1813/EndpointImpl.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1813/EndpointImpl.java 2008-08-14 16:25:00 UTC (rev 8107) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/java/org/jboss/test/ws/jaxws/jbws1813/EndpointImpl.java 2008-08-25 14:51:39 UTC (rev 8133) @@ -1,48 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1813; - -import javax.ejb.Stateless; -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.jws.soap.SOAPBinding.Style; - -import org.jboss.logging.Logger; -import org.jboss.wsf.spi.annotation.WebContext; - -@WebService(name = "Endpoint", serviceName = "EndpointService", targetNamespace = "http://org.jboss.ws/jbws1813") -@Stateless(name = "Endpoint") -@SOAPBinding(style = Style.RPC) -@WebContext(urlPattern="/*") -public class EndpointImpl -{ - // Provide logging - private static Logger log = Logger.getLogger(EndpointImpl.class); - - @WebMethod - public String echo(String input) - { - log.info(input); - return input; - } -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/java/org/jboss/test/ws/jaxws/jbws1813/EndpointImpl.java (from rev 8107, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1813/EndpointImpl.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/java/org/jboss/test/ws/jaxws/jbws1813/EndpointImpl.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/java/org/jboss/test/ws/jaxws/jbws1813/EndpointImpl.java 2008-08-25 14:51:39 UTC (rev 8133) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1813; + +import javax.ejb.Stateless; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.Style; + +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.annotation.WebContext; + +@WebService(name = "Endpoint", serviceName = "EndpointService", targetNamespace = "http://org.jboss.ws/jbws1813") +@Stateless(name = "Endpoint") +@SOAPBinding(style = Style.RPC) +@WebContext(urlPattern="/*") +public class EndpointImpl +{ + // Provide logging + private static Logger log = Logger.getLogger(EndpointImpl.class); + + @WebMethod + public String echo(String input) + { + log.info(input); + return input; + } +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java 2008-08-14 16:25:00 UTC (rev 8107) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java 2008-08-25 14:51:39 UTC (rev 8133) @@ -1,66 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1813; - -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; - -/** - * context-root in jboss.xml is ignored - * - * http://jira.jboss.org/jira/browse/JBWS-1813 - * - * @author Thomas.Diesler(a)jboss.com - * @since 09-Oct-2007 - */ -public class JBWS1813TestCase extends JBossWSTest -{ - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/test-context"; - - public static Test suite() - { - return new JBossWSTestSetup(JBWS1813TestCase.class, "jaxws-jbws1813.ear"); - } - - public void testPositive() throws Exception - { - if ( isTargetJBoss40() ) - { - System.out.println("FIXME [JBWS-1813] context-root in jboss.xml is ignored"); - return; - } - - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - QName serviceName = new QName("http://org.jboss.ws/jbws1813", "EndpointService"); - Endpoint port = Service.create(wsdlURL, serviceName).getPort(Endpoint.class); - - String retObj = port.echo("Hello"); - assertEquals("Hello", retObj); - } -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java (from rev 8107, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java 2008-08-25 14:51:39 UTC (rev 8133) @@ -0,0 +1,66 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1813; + +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; + +/** + * context-root in jboss.xml is ignored + * + * http://jira.jboss.org/jira/browse/JBWS-1813 + * + * @author Thomas.Diesler(a)jboss.com + * @since 09-Oct-2007 + */ +public class JBWS1813TestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/test-context"; + + public static Test suite() + { + return new JBossWSTestSetup(JBWS1813TestCase.class, "jaxws-jbws1813.ear"); + } + + public void testPositive() throws Exception + { + if ( isTargetJBoss40() ) + { + System.out.println("FIXME [JBWS-1813] context-root in jboss.xml is ignored"); + return; + } + + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + QName serviceName = new QName("http://org.jboss.ws/jbws1813", "EndpointService"); + Endpoint port = Service.create(wsdlURL, serviceName).getPort(Endpoint.class); + + String retObj = port.echo("Hello"); + assertEquals("Hello", retObj); + } +} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/resources/jaxws/jbws1813 (from rev 8107, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1813) Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/resources/jaxws/jbws1813/META-INF (from rev 8107, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1813/META-INF) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/resources/jaxws/jbws1813/META-INF/application.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1813/META-INF/application.xml 2008-08-14 16:25:00 UTC (rev 8107) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/resources/jaxws/jbws1813/META-INF/application.xml 2008-08-25 14:51:39 UTC (rev 8133) @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<application 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/application_1_4.xsd" version="1.4"> - - <module> - <java>jaxws-jbws1813.jar</java> - </module> - -</application> \ No newline at end of file Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/resources/jaxws/jbws1813/META-INF/application.xml (from rev 8107, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1813/META-INF/application.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/resources/jaxws/jbws1813/META-INF/application.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/resources/jaxws/jbws1813/META-INF/application.xml 2008-08-25 14:51:39 UTC (rev 8133) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<application 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/application_1_4.xsd" version="1.4"> + + <module> + <java>jaxws-jbws1813.jar</java> + </module> + +</application> \ No newline at end of file Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/resources/jaxws/jbws1813/META-INF/jboss.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1813/META-INF/jboss.xml 2008-08-14 16:25:00 UTC (rev 8107) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/resources/jaxws/jbws1813/META-INF/jboss.xml 2008-08-25 14:51:39 UTC (rev 8133) @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.2//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_2.dtd"> - -<jboss> - - <webservices> - <context-root>/test-context</context-root> - </webservices> -</jboss> Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/resources/jaxws/jbws1813/META-INF/jboss.xml (from rev 8107, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1813/META-INF/jboss.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/resources/jaxws/jbws1813/META-INF/jboss.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/src/test/resources/jaxws/jbws1813/META-INF/jboss.xml 2008-08-25 14:51:39 UTC (rev 8133) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.2//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_2.dtd"> + +<jboss> + + <webservices> + <context-root>/test-context</context-root> + </webservices> +</jboss> Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/version.properties =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/version.properties 2008-08-25 12:06:38 UTC (rev 8132) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1126/version.properties 2008-08-25 14:51:39 UTC (rev 8133) @@ -5,8 +5,8 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-2.0 -version.id=2.0.1.SP2_CP03 -repository.id=2.0.1.SP2_CP03 +version.id=2.0.1.SP2_CP03_JBPAPP-1126 +repository.id=2.0.1.SP2_CP03_JBPAPP-1126 implementation.title=JBoss Web Services - Native implementation.url=http://www.jboss.org/products/jbossws @@ -24,7 +24,7 @@ wscommons-policy=1.0 # Dependend integration projects -jbossws-spi=1.0.0.GA +jbossws-spi=1.0.0.GA_JBPAPP-1126 jbossws-common=1.0.0.GA_CP01 jbossws-framework=2.0.1.GA jbossws-jboss40=2.0.1.GA