[jbossws-commits] JBossWS SVN: r4359 - in stack/native/trunk: src/test/java/org/jboss/test/ws/jaxws and 4 other directories.

Author: richard_opalka Date: 2007-08-14 06:39:29 -0400 (Tue, 14 Aug 2007) New Revision: 4359 Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762Impl.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase1.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase2.java stack/native/trunk/src/test/resources/jaxws/jbws1762/ stack/native/trunk/src/test/resources/jaxws/jbws1762/WEB-INF/ stack/native/trunk/src/test/resources/jaxws/jbws1762/WEB-INF/web.xml Removed: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762Impl.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase1.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase2.java stack/native/trunk/src/test/resources/jaxws/jbws1762/WEB-INF/ stack/native/trunk/src/test/resources/jaxws/jbws1762/WEB-INF/web.xml Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml Log: [JBWS-1762] merging enabled test to the trunk Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2007-08-14 10:29:44 UTC (rev 4358) +++ stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2007-08-14 10:39:29 UTC (rev 4359) @@ -356,6 +356,18 @@ </classes> </war> + <!-- jaxws-jbws1762 --> + <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762.war"/> + <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762.war/WEB-INF"/> + <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762.war/WEB-INF/classes"/> + <copy file="${tests.output.dir}/resources/jaxws/jbws1762/WEB-INF/web.xml" toDir="${tests.output.dir}/libs/jaxws-jbws1762.war/WEB-INF"/> + <copy toDir="${tests.output.dir}/libs/jaxws-jbws1762.war/WEB-INF/classes"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1762/JBWS1762.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1762/JBWS1762Impl.class"/> + </fileset> + </copy> + <!-- 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"> Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762 (from rev 4329, stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762) Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762.java =================================================================== --- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762.java 2007-08-13 10:55:42 UTC (rev 4329) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762.java 2007-08-14 10:39:29 UTC (rev 4359) @@ -1,32 +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.jbws1762; - -import javax.jws.WebService; - -@WebService -public interface JBWS1762 -{ - - String echo(String toEcho); - -} Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762.java (from rev 4329, stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762.java) =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762.java 2007-08-14 10:39:29 UTC (rev 4359) @@ -0,0 +1,32 @@ +/* + * 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.jbws1762; + +import javax.jws.WebService; + +@WebService +public interface JBWS1762 +{ + + String echo(String toEcho); + +} Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762Impl.java =================================================================== --- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762Impl.java 2007-08-13 10:55:42 UTC (rev 4329) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762Impl.java 2007-08-14 10:39:29 UTC (rev 4359) @@ -1,35 +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.jbws1762; - -import javax.jws.WebService; - -@WebService(name = "JBWS1762", serviceName = "JBWS1762Service", endpointInterface = "org.jboss.test.ws.jaxws.jbws1762.JBWS1762") -public class JBWS1762Impl implements JBWS1762 -{ - - public String echo(String toEcho) - { - return toEcho; - } - -} Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762Impl.java (from rev 4329, stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762Impl.java) =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762Impl.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762Impl.java 2007-08-14 10:39:29 UTC (rev 4359) @@ -0,0 +1,35 @@ +/* + * 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.jbws1762; + +import javax.jws.WebService; + +@WebService(name = "JBWS1762", serviceName = "JBWS1762Service", endpointInterface = "org.jboss.test.ws.jaxws.jbws1762.JBWS1762") +public class JBWS1762Impl implements JBWS1762 +{ + + public String echo(String toEcho) + { + return toEcho; + } + +} Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase1.java =================================================================== --- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase1.java 2007-08-13 10:55:42 UTC (rev 4329) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase1.java 2007-08-14 10:39:29 UTC (rev 4359) @@ -1,77 +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.jbws1762; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author Richard.Opalka(a)jboss.com - * @since 13-Aug-2007 - */ -public class JBWS1762TestCase1 extends JBossWSTest -{ - - private String targetNS = "http://jbws1762.jaxws.ws.test.jboss.org/"; - private JBWS1762 proxy; - - public static Test suite() - { - return new JBossWSTestSetup(JBWS1762TestCase1.class, "jaxws-jbws1762.war"); - } - - @Override - protected void setUp() throws Exception - { - super.setUp(); - - QName serviceName = new QName(targetNS, "JBWS1762Service"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1762/JBWS1762Service?wsdl"); - - if (true) { - System.out.println("FIXME: [JBWS-1762] Fix this issue"); - return; - } - Service service = Service.create(wsdlURL, serviceName); - proxy = (JBWS1762)service.getPort(JBWS1762.class); - } - - public void testIssue() throws Exception - { - if (true) { - System.out.println("FIXME: [JBWS-1762] Fix this issue"); - return; - } - assertEquals(proxy.echo("Hello!"), "Hello!"); - } - -} Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase1.java (from rev 4329, stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase1.java) =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase1.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase1.java 2007-08-14 10:39:29 UTC (rev 4359) @@ -0,0 +1,69 @@ +/* + * 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.jbws1762; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail + * + * @author Richard.Opalka(a)jboss.com + * @since 13-Aug-2007 + */ +public class JBWS1762TestCase1 extends JBossWSTest +{ + + private String targetNS = "http://jbws1762.jaxws.ws.test.jboss.org/"; + private JBWS1762 proxy; + + public static Test suite() + { + return new JBossWSTestSetup(JBWS1762TestCase1.class, "jaxws-jbws1762.war"); + } + + @Override + protected void setUp() throws Exception + { + super.setUp(); + + QName serviceName = new QName(targetNS, "JBWS1762Service"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1762/JBWS1762Service?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + proxy = (JBWS1762)service.getPort(JBWS1762.class); + } + + public void testIssue() throws Exception + { + assertEquals(proxy.echo("Hello!"), "Hello!"); + } + +} Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase2.java =================================================================== --- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase2.java 2007-08-13 10:55:42 UTC (rev 4329) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase2.java 2007-08-14 10:39:29 UTC (rev 4359) @@ -1,30 +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.jbws1762; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author Richard.Opalka(a)jboss.com - * @since 13-Aug-2007 - */ -public class JBWS1762TestCase2 extends JBWS1762TestCase1 {} Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase2.java (from rev 4329, stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase2.java) =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase2.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase2.java 2007-08-14 10:39:29 UTC (rev 4359) @@ -0,0 +1,30 @@ +/* + * 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.jbws1762; + +/** + * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail + * + * @author Richard.Opalka(a)jboss.com + * @since 13-Aug-2007 + */ +public class JBWS1762TestCase2 extends JBWS1762TestCase1 {} Copied: stack/native/trunk/src/test/resources/jaxws/jbws1762 (from rev 4329, stack/native/branches/native-2.0/src/test/resources/jaxws/jbws1762) Copied: stack/native/trunk/src/test/resources/jaxws/jbws1762/WEB-INF (from rev 4329, stack/native/branches/native-2.0/src/test/resources/jaxws/jbws1762/WEB-INF) Deleted: stack/native/trunk/src/test/resources/jaxws/jbws1762/WEB-INF/web.xml =================================================================== --- stack/native/branches/native-2.0/src/test/resources/jaxws/jbws1762/WEB-INF/web.xml 2007-08-13 10:55:42 UTC (rev 4329) +++ stack/native/trunk/src/test/resources/jaxws/jbws1762/WEB-INF/web.xml 2007-08-14 10:39:29 UTC (rev 4359) @@ -1,18 +0,0 @@ -<?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>JBWS1762Service</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.jbws1762.JBWS1762Impl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>JBWS1762Service</servlet-name> - <url-pattern>/JBWS1762Service</url-pattern> - </servlet-mapping> - -</web-app> Copied: stack/native/trunk/src/test/resources/jaxws/jbws1762/WEB-INF/web.xml (from rev 4329, stack/native/branches/native-2.0/src/test/resources/jaxws/jbws1762/WEB-INF/web.xml) =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws1762/WEB-INF/web.xml (rev 0) +++ stack/native/trunk/src/test/resources/jaxws/jbws1762/WEB-INF/web.xml 2007-08-14 10:39:29 UTC (rev 4359) @@ -0,0 +1,18 @@ +<?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>JBWS1762Service</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws1762.JBWS1762Impl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>JBWS1762Service</servlet-name> + <url-pattern>/JBWS1762Service</url-pattern> + </servlet-mapping> + +</web-app>