Author: darran.lofthouse(a)jboss.com Date: 2010-10-06 12:53:35 -0400 (Wed, 06 Oct 2010) New Revision: 13067 Added: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/Endpoint.java stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointFault.java stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointImpl.java stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/JBWS2637TestCase.java stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2637/ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2637/WEB-INF/ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2637/WEB-INF/web.xml Removed: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/Endpoint.java stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointFault.java stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointImpl.java stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/JBWS2637TestCase.java stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2637/WEB-INF/ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2637/WEB-INF/web.xml Modified: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/pom.xml Log: [JBPAPP-5198] Incorrect namespace prefix for message part in WSDL when generating WSDL for JAX-WS endpoint. Modified: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2010-10-06 16:31:28 UTC (rev 13066) +++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2010-10-06 16:53:35 UTC (rev 13067) @@ -158,7 +158,7 @@ wsdlInterface.addFault(interfaceFault); WSDLInterfaceOperationOutfault outfault = new WSDLInterfaceOperationOutfault(interfaceOperation); - String ns = getNamespace(fault.getJavaType(), operation.getQName().getNamespaceURI()); + String ns = getNamespace(fault.getJavaType(), fault.getXmlName().getNamespaceURI()); QName outFaultName = new QName(ns, fault.getXmlName().getLocalPart()); outfault.setRef(outFaultName); interfaceOperation.addOutfault(outfault); Modified: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2010-10-06 16:31:28 UTC (rev 13066) +++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2010-10-06 16:53:35 UTC (rev 13067) @@ -358,8 +358,8 @@ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2014/"> <include name="wsse.*" /> </metainf> - </jar> - + </jar> + <!-- jaxws-jbws2116--> <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2116.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -554,6 +554,17 @@ </metainf> </jar> + <!-- jaxws-jbws2637--> + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2637.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2637/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws2637/*.class" /> + <exclude name="org/jboss/test/ws/jaxws/jbws2637/*TestCase.class" /> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2637/WEB-INF"> + <include name="*" /> + </webinf> + </war> + <!-- jaxws-jbws2682 --> <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2682.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2682/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Copied: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637 (from rev 12840, stack/native/branches/jbossws-native-3.1.2.SP3_CP01_JBPAPP-4932/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637) Deleted: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/Endpoint.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP3_CP01_JBPAPP-4932/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/Endpoint.java 2010-08-23 18:37:58 UTC (rev 12840) +++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/Endpoint.java 2010-10-06 16:53:35 UTC (rev 13067) @@ -1,40 +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.jbws2637; - -import javax.jws.WebService; - -/** - * Test Endpoint to test WSDL generation when fault is - * in a different namespace. - * - * @author darran.lofthouse(a)jboss.com - * @since 20th August 2010 - * @see https://jira.jboss.org/jira/browse/JBWS-2637 - */ -@WebService(name = "Endpoint", targetNamespace = "http://ws.jboss.org/jbws2637") -public interface Endpoint -{ - - public String echo(final String message) throws EndpointFault; - -} Copied: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/Endpoint.java (from rev 12840, stack/native/branches/jbossws-native-3.1.2.SP3_CP01_JBPAPP-4932/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/Endpoint.java) =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/Endpoint.java (rev 0) +++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/Endpoint.java 2010-10-06 16:53:35 UTC (rev 13067) @@ -0,0 +1,40 @@ +/* + * 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.jbws2637; + +import javax.jws.WebService; + +/** + * Test Endpoint to test WSDL generation when fault is + * in a different namespace. + * + * @author darran.lofthouse(a)jboss.com + * @since 20th August 2010 + * @see https://jira.jboss.org/jira/browse/JBWS-2637 + */ +@WebService(name = "Endpoint", targetNamespace = "http://ws.jboss.org/jbws2637") +public interface Endpoint +{ + + public String echo(final String message) throws EndpointFault; + +} Deleted: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointFault.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP3_CP01_JBPAPP-4932/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointFault.java 2010-08-23 18:37:58 UTC (rev 12840) +++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointFault.java 2010-10-06 16:53:35 UTC (rev 13067) @@ -1,38 +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.jbws2637; - -import javax.xml.ws.WebFault; - -/** - * Exception mapped to different namespace. - * - * @author darran.lofthouse(a)jboss.com - * @since 20th August 2010 - */ -@WebFault(targetNamespace="http://ws.jboss.org/jbws2637/faults") -public class EndpointFault extends Exception -{ - - private static final long serialVersionUID = -6725899843509034056L; - -} Copied: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointFault.java (from rev 12840, stack/native/branches/jbossws-native-3.1.2.SP3_CP01_JBPAPP-4932/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointFault.java) =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointFault.java (rev 0) +++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointFault.java 2010-10-06 16:53:35 UTC (rev 13067) @@ -0,0 +1,38 @@ +/* + * 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.jbws2637; + +import javax.xml.ws.WebFault; + +/** + * Exception mapped to different namespace. + * + * @author darran.lofthouse(a)jboss.com + * @since 20th August 2010 + */ +@WebFault(targetNamespace="http://ws.jboss.org/jbws2637/faults") +public class EndpointFault extends Exception +{ + + private static final long serialVersionUID = -6725899843509034056L; + +} Deleted: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointImpl.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP3_CP01_JBPAPP-4932/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointImpl.java 2010-08-23 18:37:58 UTC (rev 12840) +++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointImpl.java 2010-10-06 16:53:35 UTC (rev 13067) @@ -1,45 +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.jbws2637; - -import javax.jws.WebService; - - -/** - * Test Endpoint to test WSDL generation when fault is - * in a different namespace. - * - * @author darran.lofthouse(a)jboss.com - * @since 20th August 2010 - * @see https://jira.jboss.org/jira/browse/JBWS-2637 - */ -@WebService(name = "Endpoint", serviceName = "EndpointService", targetNamespace = "http://ws.jboss.org/jbws2637", endpointInterface = "org.jboss.test.ws.jaxws.jbws2637.Endpoint") -public class EndpointImpl implements Endpoint -{ - - @Override - public String echo(String message) - { - return message; - } - -} Copied: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointImpl.java (from rev 12840, stack/native/branches/jbossws-native-3.1.2.SP3_CP01_JBPAPP-4932/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointImpl.java) =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointImpl.java (rev 0) +++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointImpl.java 2010-10-06 16:53:35 UTC (rev 13067) @@ -0,0 +1,45 @@ +/* + * 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.jbws2637; + +import javax.jws.WebService; + + +/** + * Test Endpoint to test WSDL generation when fault is + * in a different namespace. + * + * @author darran.lofthouse(a)jboss.com + * @since 20th August 2010 + * @see https://jira.jboss.org/jira/browse/JBWS-2637 + */ +@WebService(name = "Endpoint", serviceName = "EndpointService", targetNamespace = "http://ws.jboss.org/jbws2637", endpointInterface = "org.jboss.test.ws.jaxws.jbws2637.Endpoint") +public class EndpointImpl implements Endpoint +{ + + @Override + public String echo(String message) + { + return message; + } + +} Deleted: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/JBWS2637TestCase.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP3_CP01_JBPAPP-4932/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/JBWS2637TestCase.java 2010-08-23 18:37:58 UTC (rev 12840) +++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/JBWS2637TestCase.java 2010-10-06 16:53:35 UTC (rev 13067) @@ -1,79 +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.jbws2637; - -import java.io.File; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * [JBWS-2637] Incorrect namespace for fault - * messages. - * - * @author darran.lofthouse(a)jboss.com - * @since 23rd August 2010 - * @see https://jira.jboss.org/jira/browse/JBWS-2637 - */ -public class JBWS2637TestCase extends JBossWSTest -{ - - public final String TARGET_WSDL_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2637?wsdl"; - - private static final String FS = System.getProperty("file.separator"); // '/' on unix, '\' on windows - private static final String PS = System.getProperty("path.separator"); // ':' on unix, ';' on windows - private static final String EXT = ":".equals(PS) ? ".sh" : ".bat"; - - private String JBOSS_HOME = System.getProperty("jboss.home"); - - public static Test suite() throws Exception - { - return new JBossWSTestSetup(JBWS2637TestCase.class, "jaxws-jbws2637.war"); - } - - public void testWSConsume() throws Exception - { - // use absolute path for the output to be re-usable - String absOutput = "target/wsconsume/jbws2637"; - - String command = JBOSS_HOME + FS + "bin" + FS + "wsconsume" + EXT + " -k -o " + absOutput + " " + TARGET_WSDL_ADDRESS; - executeCommand(command); - - String packageDir = new File(absOutput + "/org/jboss/ws/jbws2637").getAbsolutePath(); - - checkFileExists(packageDir, "Echo.java"); - checkFileExists(packageDir, "EchoResponse.java"); - checkFileExists(packageDir, "Endpoint.java"); - checkFileExists(packageDir, "EndpointFault.java"); - checkFileExists(packageDir, "EndpointFault_Exception.java"); - checkFileExists(packageDir, "EndpointService.java"); - } - - private static void checkFileExists(String packageDir, String filename) - { - File expectedFile = new File(packageDir + FS + filename); - assertTrue("File '" + filename + "' missing from folder '" + packageDir + "'", expectedFile.exists()); - } - -} Copied: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/JBWS2637TestCase.java (from rev 12840, stack/native/branches/jbossws-native-3.1.2.SP3_CP01_JBPAPP-4932/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/JBWS2637TestCase.java) =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/JBWS2637TestCase.java (rev 0) +++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2637/JBWS2637TestCase.java 2010-10-06 16:53:35 UTC (rev 13067) @@ -0,0 +1,79 @@ +/* + * 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.jbws2637; + +import java.io.File; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-2637] Incorrect namespace for fault + * messages. + * + * @author darran.lofthouse(a)jboss.com + * @since 23rd August 2010 + * @see https://jira.jboss.org/jira/browse/JBWS-2637 + */ +public class JBWS2637TestCase extends JBossWSTest +{ + + public final String TARGET_WSDL_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2637?wsdl"; + + private static final String FS = System.getProperty("file.separator"); // '/' on unix, '\' on windows + private static final String PS = System.getProperty("path.separator"); // ':' on unix, ';' on windows + private static final String EXT = ":".equals(PS) ? ".sh" : ".bat"; + + private String JBOSS_HOME = System.getProperty("jboss.home"); + + public static Test suite() throws Exception + { + return new JBossWSTestSetup(JBWS2637TestCase.class, "jaxws-jbws2637.war"); + } + + public void testWSConsume() throws Exception + { + // use absolute path for the output to be re-usable + String absOutput = "target/wsconsume/jbws2637"; + + String command = JBOSS_HOME + FS + "bin" + FS + "wsconsume" + EXT + " -k -o " + absOutput + " " + TARGET_WSDL_ADDRESS; + executeCommand(command); + + String packageDir = new File(absOutput + "/org/jboss/ws/jbws2637").getAbsolutePath(); + + checkFileExists(packageDir, "Echo.java"); + checkFileExists(packageDir, "EchoResponse.java"); + checkFileExists(packageDir, "Endpoint.java"); + checkFileExists(packageDir, "EndpointFault.java"); + checkFileExists(packageDir, "EndpointFault_Exception.java"); + checkFileExists(packageDir, "EndpointService.java"); + } + + private static void checkFileExists(String packageDir, String filename) + { + File expectedFile = new File(packageDir + FS + filename); + assertTrue("File '" + filename + "' missing from folder '" + packageDir + "'", expectedFile.exists()); + } + +} Copied: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2637 (from rev 12840, stack/native/branches/jbossws-native-3.1.2.SP3_CP01_JBPAPP-4932/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2637) Copied: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2637/WEB-INF (from rev 12840, stack/native/branches/jbossws-native-3.1.2.SP3_CP01_JBPAPP-4932/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2637/WEB-INF) Deleted: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2637/WEB-INF/web.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP3_CP01_JBPAPP-4932/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2637/WEB-INF/web.xml 2010-08-23 18:37:58 UTC (rev 12840) +++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2637/WEB-INF/web.xml 2010-10-06 16:53:35 UTC (rev 13067) @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<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.jbws2637.Endpoint</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-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2637/WEB-INF/web.xml (from rev 12840, stack/native/branches/jbossws-native-3.1.2.SP3_CP01_JBPAPP-4932/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2637/WEB-INF/web.xml) =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2637/WEB-INF/web.xml (rev 0) +++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2637/WEB-INF/web.xml 2010-10-06 16:53:35 UTC (rev 13067) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<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.jbws2637.Endpoint</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>Endpoint</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app> \ No newline at end of file Modified: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/pom.xml 2010-10-06 16:31:28 UTC (rev 13066) +++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5198/modules/testsuite/pom.xml 2010-10-06 16:53:35 UTC (rev 13067) @@ -25,7 +25,7 @@ <hibernate.version>3.2.4.sp1</hibernate.version> <endpoint.servlet>org.jboss.wsf.stack.jbws.EndpointServlet</endpoint.servlet> <jboss.javaee.version>5.0.1.GA</jboss.javaee.version> - <hornetq.version>2.1.0.BETA3</hornetq.version> + <hornetq.version>2.1.0.Final</hornetq.version> </properties> <!-- Modules -->