[jbossws-commits] JBossWS SVN: r12838 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931: src/main/java/org/jboss/ws/tools/wsdl and 5 other directories.

Monday, 23 August 2010


Author: darran.lofthouse(a)jboss.com
Date: 2010-08-23 13:50:43 -0400 (Mon, 23 Aug 2010)
New Revision: 12838

Added:
  
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/java/org/jboss/test/ws/jaxws/jbws2637/
  
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/java/org/jboss/test/ws/jaxws/jbws2637/Endpoint.java
  
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointFault.java
  
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointImpl.java
  
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/java/org/jboss/test/ws/jaxws/jbws2637/JBWS2637TestCase.java
  
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/resources/jaxws/jbws2637/
  
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/resources/jaxws/jbws2637/WEB-INF/
  
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/resources/jaxws/jbws2637/WEB-INF/web.xml
Removed:
  
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/java/org/jboss/test/ws/jaxws/jbws2637/Endpoint.java
  
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointFault.java
  
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointImpl.java
  
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/java/org/jboss/test/ws/jaxws/jbws2637/JBWS2637TestCase.java
  
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/resources/jaxws/jbws2637/WEB-INF/
  
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/resources/jaxws/jbws2637/WEB-INF/web.xml
Modified:
  
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/ant-import-tests/build-jars-jaxws.xml
  
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java
Log:
[JBPAPP-4931] Incorrect namespace prefix for message part in WSDL when generating WSDL for
JAX-WS endpoint.

Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/ant-import-tests/build-jars-jaxws.xml
===================================================================
---
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/ant-import-tests/build-jars-jaxws.xml	2010-08-23
17:39:58 UTC (rev 12837)
+++
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/ant-import-tests/build-jars-jaxws.xml	2010-08-23
17:50:43 UTC (rev 12838)
@@ -656,6 +656,17 @@
         <exclude
name="org/jboss/test/ws/jaxws/jbws2437/*TestCase.class"/>
       </fileset>
     </jar>
+    
+	<!-- jaxws-jbws2637-->
+	<war warfile="${tests.output.dir}/libs/jaxws-jbws2637.war"
webxml="${tests.output.dir}/resources/jaxws/jbws2637/WEB-INF/web.xml">
+		<classes dir="${tests.output.dir}/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}/resources/jaxws/jbws2637/WEB-INF">
+			<include name="*" />
+		</webinf>
+	</war>    
 
     <!-- jaxws-jbws2682 -->
     <war warfile="${tests.output.dir}/libs/jaxws-jbws2682.war"
webxml="${tests.output.dir}/resources/jaxws/jbws2682/WEB-INF/web.xml">

Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java
===================================================================
---
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java	2010-08-23
17:39:58 UTC (rev 12837)
+++
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java	2010-08-23
17:50:43 UTC (rev 12838)
@@ -221,7 +221,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);

Copied:
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/java/org/jboss/test/ws/jaxws/jbws2637
(from rev 12835,
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2637)

Deleted:
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/java/org/jboss/test/ws/jaxws/jbws2637/Endpoint.java
===================================================================
---
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2637/Endpoint.java	2010-08-23
15:50:35 UTC (rev 12835)
+++
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/java/org/jboss/test/ws/jaxws/jbws2637/Endpoint.java	2010-08-23
17:50:43 UTC (rev 12838)
@@ -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-2.0.1.SP2_CP08_JBPAPP-4931/src/test/java/org/jboss/test/ws/jaxws/jbws2637/Endpoint.java
(from rev 12835,
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2637/Endpoint.java)
===================================================================
---
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/java/org/jboss/test/ws/jaxws/jbws2637/Endpoint.java	
                       (rev 0)
+++
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/java/org/jboss/test/ws/jaxws/jbws2637/Endpoint.java	2010-08-23
17:50:43 UTC (rev 12838)
@@ -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-2.0.1.SP2_CP08_JBPAPP-4931/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointFault.java
===================================================================
---
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointFault.java	2010-08-23
15:50:35 UTC (rev 12835)
+++
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointFault.java	2010-08-23
17:50:43 UTC (rev 12838)
@@ -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-2.0.1.SP2_CP08_JBPAPP-4931/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointFault.java
(from rev 12835,
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointFault.java)
===================================================================
---
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointFault.java	
                       (rev 0)
+++
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointFault.java	2010-08-23
17:50:43 UTC (rev 12838)
@@ -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-2.0.1.SP2_CP08_JBPAPP-4931/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointImpl.java
===================================================================
---
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointImpl.java	2010-08-23
15:50:35 UTC (rev 12835)
+++
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointImpl.java	2010-08-23
17:50:43 UTC (rev 12838)
@@ -1,44 +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
-{
-
-   public String echo(String message)
-   {
-      return message;
-   }
-
-}

Copied:
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointImpl.java
(from rev 12835,
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointImpl.java)
===================================================================
---
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointImpl.java	
                       (rev 0)
+++
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/java/org/jboss/test/ws/jaxws/jbws2637/EndpointImpl.java	2010-08-23
17:50:43 UTC (rev 12838)
@@ -0,0 +1,44 @@
+/*
+ * 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
+{
+
+   public String echo(String message)
+   {
+      return message;
+   }
+
+}

Deleted:
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/java/org/jboss/test/ws/jaxws/jbws2637/JBWS2637TestCase.java
===================================================================
---
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2637/JBWS2637TestCase.java	2010-08-23
15:50:35 UTC (rev 12835)
+++
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/java/org/jboss/test/ws/jaxws/jbws2637/JBWS2637TestCase.java	2010-08-23
17:50:43 UTC (rev 12838)
@@ -1,134 +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 java.io.IOException;
-import java.io.OutputStream;
-
-import junit.framework.Test;
-
-import org.jboss.wsf.common.IOUtils;
-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());
-   }
-   
-   /*
-    *  Add methods from trunk usually expected in JBossWSTest 
-    */
-
-   /**
-    * Execute <b>command</b> in separate process.
-    * @param command command to execute
-    * @throws IOException if I/O error occurs
-    */
-   public void executeCommand(String command) throws IOException
-   {
-      this.executeCommand(command, null, null);
-   }
-
-   /**
-    * Execute <b>command</b> in separate process, copy process input to
<b>os</b>. If process will fail, display custom <b>message</b> in
assertion.
-    * @param command command to execute
-    * @param os output stream to copy process input to. If null,
<b>System.out</b> will be used
-    * @param message message to display if assertion fails
-    * @throws IOException if I/O error occurs
-    */
-   public void executeCommand(String command, OutputStream os, String message) throws
IOException
-   {
-      if (command == null)
-         throw new NullPointerException("Command cannot be null");
-
-      System.out.println("Executing command: " + command);
-      Process p = Runtime.getRuntime().exec(command);
-      System.out.println("Process input stream:");
-      IOUtils.copyStream(os == null ? System.out : os, p.getInputStream());
-      try
-      {
-         int statusCode = p.waitFor();
-         if (statusCode != 0)
-         {
-            System.err.println("Process error stream:");
-            IOUtils.copyStream(System.err, p.getErrorStream());
-         }
-         String fallbackMessage = "Process did exit with status " +
statusCode;
-         assertTrue(message != null ? message : fallbackMessage, statusCode == 0);
-      }
-      catch (InterruptedException ie)
-      {
-         ie.printStackTrace(System.err);
-      }
-      finally
-      {
-         p.destroy();
-      }
-   }
-}

Copied:
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/java/org/jboss/test/ws/jaxws/jbws2637/JBWS2637TestCase.java
(from rev 12835,
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2637/JBWS2637TestCase.java)
===================================================================
---
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/java/org/jboss/test/ws/jaxws/jbws2637/JBWS2637TestCase.java	
                       (rev 0)
+++
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/java/org/jboss/test/ws/jaxws/jbws2637/JBWS2637TestCase.java	2010-08-23
17:50:43 UTC (rev 12838)
@@ -0,0 +1,134 @@
+/*
+ * 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 java.io.IOException;
+import java.io.OutputStream;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.common.IOUtils;
+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());
+   }
+   
+   /*
+    *  Add methods from trunk usually expected in JBossWSTest 
+    */
+
+   /**
+    * Execute <b>command</b> in separate process.
+    * @param command command to execute
+    * @throws IOException if I/O error occurs
+    */
+   public void executeCommand(String command) throws IOException
+   {
+      this.executeCommand(command, null, null);
+   }
+
+   /**
+    * Execute <b>command</b> in separate process, copy process input to
<b>os</b>. If process will fail, display custom <b>message</b> in
assertion.
+    * @param command command to execute
+    * @param os output stream to copy process input to. If null,
<b>System.out</b> will be used
+    * @param message message to display if assertion fails
+    * @throws IOException if I/O error occurs
+    */
+   public void executeCommand(String command, OutputStream os, String message) throws
IOException
+   {
+      if (command == null)
+         throw new NullPointerException("Command cannot be null");
+
+      System.out.println("Executing command: " + command);
+      Process p = Runtime.getRuntime().exec(command);
+      System.out.println("Process input stream:");
+      IOUtils.copyStream(os == null ? System.out : os, p.getInputStream());
+      try
+      {
+         int statusCode = p.waitFor();
+         if (statusCode != 0)
+         {
+            System.err.println("Process error stream:");
+            IOUtils.copyStream(System.err, p.getErrorStream());
+         }
+         String fallbackMessage = "Process did exit with status " +
statusCode;
+         assertTrue(message != null ? message : fallbackMessage, statusCode == 0);
+      }
+      catch (InterruptedException ie)
+      {
+         ie.printStackTrace(System.err);
+      }
+      finally
+      {
+         p.destroy();
+      }
+   }
+}

Copied:
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/resources/jaxws/jbws2637
(from rev 12835,
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2637)

Copied:
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/resources/jaxws/jbws2637/WEB-INF
(from rev 12835,
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2637/WEB-INF)

Deleted:
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/resources/jaxws/jbws2637/WEB-INF/web.xml
===================================================================
---
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2637/WEB-INF/web.xml	2010-08-23
15:50:35 UTC (rev 12835)
+++
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/resources/jaxws/jbws2637/WEB-INF/web.xml	2010-08-23
17:50:43 UTC (rev 12838)
@@ -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-2.0.1.SP2_CP08_JBPAPP-4931/src/test/resources/jaxws/jbws2637/WEB-INF/web.xml
(from rev 12835,
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2637/WEB-INF/web.xml)
===================================================================
---
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/resources/jaxws/jbws2637/WEB-INF/web.xml	
                       (rev 0)
+++
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931/src/test/resources/jaxws/jbws2637/WEB-INF/web.xml	2010-08-23
17:50:43 UTC (rev 12838)
@@ -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


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

[jbossws-commits] JBossWS SVN: r12838 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4931: src/main/java/org/jboss/ws/tools/wsdl and 5 other directories.