[jbossws-commits] JBossWS SVN: r9196 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2009-02-02 09:22:48 -0500 (Mon, 02 Feb 2009)
New Revision: 9196

Added:
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBeanNoAdapter.java
Removed:
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBeanMetro.java
Modified:
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java
Log:
[JBWS-2506] Renaming CalculatorBean SEI without @XmlJavaTypeAdapter


Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBeanMetro.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBeanMetro.java	2009-02-02 14:22:35 UTC (rev 9195)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBeanMetro.java	2009-02-02 14:22:48 UTC (rev 9196)
@@ -1,62 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, 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.smoke.tools;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlList;
-
- at WebService(targetNamespace = "http://foo.bar.com/calculator", serviceName="CalculatorBeanService")
-public class CalculatorBeanMetro
-{
-   @WebMethod
-   public int add(int a, int b)
-   {
-      return a+b;
-   }
-
-   @WebMethod
-   public int subtract(int a, int b)
-   {
-      return a-b;
-   }
-   
-   @WebMethod
-   public Set<Integer> getKeys(HashMap<Integer, String> map)
-   {
-      if (map != null)
-         return map.keySet();
-      else
-         return null;
-   }
-   
-   @WebMethod
-   @XmlList
-   public List<String> processList(@XmlList List<String> list)
-   {
-      return list;
-   }
-}

Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBeanNoAdapter.java (from rev 9144, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBeanMetro.java)
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBeanNoAdapter.java	                        (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBeanNoAdapter.java	2009-02-02 14:22:48 UTC (rev 9196)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, 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.smoke.tools;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Set;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.xml.bind.annotation.XmlList;
+
+ at WebService(targetNamespace = "http://foo.bar.com/calculator", serviceName="CalculatorBeanService")
+public class CalculatorBeanNoAdapter
+{
+   @WebMethod
+   public int add(int a, int b)
+   {
+      return a+b;
+   }
+
+   @WebMethod
+   public int subtract(int a, int b)
+   {
+      return a-b;
+   }
+   
+   @WebMethod
+   public Set<Integer> getKeys(HashMap<Integer, String> map)
+   {
+      if (map != null)
+         return map.keySet();
+      else
+         return null;
+   }
+   
+   @WebMethod
+   @XmlList
+   public List<String> processList(@XmlList List<String> list)
+   {
+      return list;
+   }
+}

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java	2009-02-02 14:22:35 UTC (rev 9195)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java	2009-02-02 14:22:48 UTC (rev 9196)
@@ -57,7 +57,7 @@
       JBOSS_HOME = System.getProperty("jboss.home");
       CLASSES_DIR = System.getProperty("test.classes.directory");
       //JBWS-2479
-      ENDPOINT_CLASS = isIntegrationMetro() ? "org.jboss.test.ws.jaxws.smoke.tools.CalculatorBeanMetro" : "org.jboss.test.ws.jaxws.smoke.tools.CalculatorBean";
+      ENDPOINT_CLASS = isIntegrationNative() ? "org.jboss.test.ws.jaxws.smoke.tools.CalculatorBean" : "org.jboss.test.ws.jaxws.smoke.tools.CalculatorBeanNoAdapter";
       TEST_DIR = createResourceFile("..").getAbsolutePath();
       origJavaHome = System.getProperty("java.home");
       

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java	2009-02-02 14:22:35 UTC (rev 9195)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java	2009-02-02 14:22:48 UTC (rev 9196)
@@ -285,6 +285,7 @@
       provider.setOutputDirectory(outputDirectory);
       //JBWS-2479: using different beans because the whole smoke tools test is supposed to be run for every stack
       //and we can't afford excluding it for Metro just because of JBWS-2479
-      provider.provide(isIntegrationMetro() ? CalculatorBeanMetro.class : CalculatorBean.class);
+      //JBWS-2506: different exception for CXF, same workaround 
+      provider.provide(isIntegrationNative() ? CalculatorBean.class : CalculatorBeanNoAdapter.class);
    }
 }