[jbossws-commits] JBossWS SVN: r3666 - in branches/jbossws-2.0: jbossws-core/ant-import-tests and 2 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Wed Jun 20 10:34:11 EDT 2007


Author: thomas.diesler at jboss.com
Date: 2007-06-20 10:34:10 -0400 (Wed, 20 Jun 2007)
New Revision: 3666

Added:
   branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1446/
   branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1446/EJB3Bean.java
   branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1446/EndpointInterface.java
   branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1446/JBWS1446TestCase.java
Modified:
   branches/jbossws-2.0/integration/spi/src/main/etc/wsconsume.sh
   branches/jbossws-2.0/integration/spi/src/main/etc/wsprovide.sh
   branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml
Log:
[JBWS-1446] Invalid WSDL when a parameter of type Object is part of a webmethod

Modified: branches/jbossws-2.0/integration/spi/src/main/etc/wsconsume.sh
===================================================================
--- branches/jbossws-2.0/integration/spi/src/main/etc/wsconsume.sh	2007-06-20 13:41:25 UTC (rev 3665)
+++ branches/jbossws-2.0/integration/spi/src/main/etc/wsconsume.sh	2007-06-20 14:34:10 UTC (rev 3666)
@@ -98,10 +98,10 @@
 
 # stack specific dependencies
 if [ "x$JBOSSWS_NATIVE" = "x" ]; then
-   echo "Seems to be a Sun-RI stack deployed"
+   echo "JBossWS-SunRI stack deployed"
    WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-sunri-client.jar"
 else
-   echo "Seems to be a JBossWS-Native stack deployed"
+   echo "JBossWS-Native stack deployed"
    WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/javassist.jar"
    WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-xml-binding.jar"
    WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-client.jar"

Modified: branches/jbossws-2.0/integration/spi/src/main/etc/wsprovide.sh
===================================================================
--- branches/jbossws-2.0/integration/spi/src/main/etc/wsprovide.sh	2007-06-20 13:41:25 UTC (rev 3665)
+++ branches/jbossws-2.0/integration/spi/src/main/etc/wsprovide.sh	2007-06-20 14:34:10 UTC (rev 3666)
@@ -98,15 +98,15 @@
 
 # stack specific dependencies
 if [ "x$JBOSSWS_NATIVE" = "x" ]; then
-   echo "Seems to be a Sun-RI stack deployed"
+   echo "JBossWS-SunRI stack deployed"
    WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-sunri-client.jar"
    WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxws-api.jar"
    WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jsr181-api.jar"
    WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/saaj-api.jar"
    WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/saaj-impl.jar"
 else
-   echo "Seems to be a JBossWS-Native stack deployed"	
-	WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-xml-binding.jar"
+   echo "JBossWS-Native stack deployed"	
+   WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-xml-binding.jar"
    WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/javassist.jar"
    WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossall-client.jar"
    WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-client.jar"

Modified: branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml	2007-06-20 13:41:25 UTC (rev 3665)
+++ branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml	2007-06-20 14:34:10 UTC (rev 3666)
@@ -197,6 +197,13 @@
       </fileset>
     </war>
 
+    <!-- jaxws-jbws1446 -->
+    <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1446.jar">
+      <fileset dir="${tests.output.dir}/classes">
+        <include name="org/jboss/test/ws/jaxws/jbws1446/EJB3Bean.class"/>
+      </fileset>
+    </jar>
+    
     <!-- jaxws-jbws1529 -->
     <war warfile="${tests.output.dir}/libs/jaxws-jbws1529.war" webxml="${tests.output.dir}/resources/jaxws/jbws1529/WEB-INF/web.xml">
       <classes dir="${tests.output.dir}/classes">

Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1446/EJB3Bean.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1446/EJB3Bean.java	                        (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1446/EJB3Bean.java	2007-06-20 14:34:10 UTC (rev 3666)
@@ -0,0 +1,44 @@
+/*
+ * 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.jbws1446;
+
+import javax.ejb.Stateless;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.jboss.logging.Logger;
+
+ at Stateless
+ at WebService
+ at SOAPBinding(style = SOAPBinding.Style.RPC)
+public class EJB3Bean
+{
+   private static Logger log = Logger.getLogger(EJB3Bean.class);
+
+   @WebMethod
+   public Object helloObject(Object msg)
+   {
+      log.info("helloObject: " + msg.getClass() + " - " + msg);
+      return msg;
+   }
+}

Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1446/EndpointInterface.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1446/EndpointInterface.java	                        (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1446/EndpointInterface.java	2007-06-20 14:34:10 UTC (rev 3666)
@@ -0,0 +1,20 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Thu Nov 02 21:17:37 CET 2006
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+package org.jboss.test.ws.jaxws.jbws1446;
+
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+ at WebService
+ at SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface EndpointInterface
+{
+   public Object helloObject(Object msg);
+}

Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1446/JBWS1446TestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1446/JBWS1446TestCase.java	                        (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1446/JBWS1446TestCase.java	2007-06-20 14:34:10 UTC (rev 3666)
@@ -0,0 +1,68 @@
+/*
+ * 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.jbws1446;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-1446] Invalid WSDL when a parameter of type Object is part of a webmethod
+ *
+ * http://jira.jboss.org/jira/browse/JBWS-1446
+ *
+ * @author Thomas.Diesler at jboss.com
+ * @since 20-Jun-2007
+ */
+public class JBWS1446TestCase extends JBossWSTest
+{
+   private static EndpointInterface port;
+   
+   public static Test suite()
+   {
+      return JBossWSTestSetup.newTestSetup(JBWS1446TestCase.class, "jaxws-jbws1446.jar");
+   }
+
+   public void setUp() throws MalformedURLException
+   {
+      if (port == null)
+      {
+         URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1446/EJB3Bean?wsdl");
+         QName serviceName = new QName("http://jbws1446.jaxws.ws.test.jboss.org/", "EJB3BeanService");
+         Service service = Service.create(wsdlURL, serviceName);
+         port = service.getPort(EndpointInterface.class);
+      }
+   }
+
+   public void testObjectAccess() throws Exception
+   {
+      Object hello = port.helloObject("hello");
+      assertEquals("hello", hello);
+   }
+}
\ No newline at end of file




More information about the jbossws-commits mailing list