Removing redundant jaxws annotations.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@670025 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 6 insertions, 172 deletions

diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
index 074ec85fce..a31cc3d45a 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
+++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
@@ -29,29 +29,9 @@ import java.util.Map;
 public interface HelloLocalServiceSimple {
     String getGreetings(String name);
     String[] getGreetingsArray(String[] names);
-    /**
-     * Add the RequestWrapper/ResponseWrapper annotations to support Collections.  These annotations are used
-     * by the remotable interface that extends this interface.
-     * @param names
-     * @return
-     */
     List<String> getGreetingsList(List<String> names);
-    
-    /**
-     * Add the RequestWrapper/ResponseWrapper annotations to support Collections.  These annotations are used
-     * by the remotable interface that extends this interface.
-     * @param names
-     * @return
-     */
-    // @RequestWrapper(className="org.apache.tuscany.sca.itest.databindings.jaxb.impl.jaxws.GetGreetingsList")
-    // @ResponseWrapper(className="org.apache.tuscany.sca.itest.databindings.jaxb.impl.jaxws.GetGreetingsListResponse")
     ArrayList<String> getGreetingsArrayList(ArrayList<String> names);
-    
-    // @WebMethod(exclude=true)
     Map<String, String> getGreetingsMap(Map<String, String> namesMap);
-    
-    // @WebMethod(exclude=true)
     HashMap<String, String> getGreetingsHashMap(HashMap<String, String> namesMap);
-    
     String getGreetingsVarArgs(String... names);
 }
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
index 3bceba1e92..199335c38c 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
+++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
@@ -24,11 +24,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-
 import org.apache.tuscany.sca.itest.databindings.jaxb.HelloLocalServiceSimple;
 import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimple;
 import org.osoa.sca.annotations.Service;
@@ -38,20 +33,12 @@ import org.osoa.sca.annotations.Service;
  * The implementation provides both a local and a remotable service.
  */
 @Service(interfaces = {HelloServiceSimple.class, HelloLocalServiceSimple.class})
-@WebService(targetNamespace = "http://jaxb.databindings.itest.sca.tuscany.apache.org/")
 public class HelloServiceSimpleImpl implements HelloServiceSimple {
-
-    @WebMethod
-    @WebResult(name = "return", targetNamespace = "")
-    public String getGreetings(@WebParam(name = "arg0", targetNamespace = "")
-    String name) {
+    public String getGreetings(String name) {
         return "Hello " + name;
     }
 
-    @WebMethod
-    @WebResult(name = "return", targetNamespace = "")
-    public String[] getGreetingsArray(@WebParam(name = "arg0", targetNamespace = "")
-    String[] names) {
+    public String[] getGreetingsArray(String[] names) {
         String[] resps = new String[names.length];
         for (int i = 0; i < names.length; ++i) {
             resps[i] = "Hello " + names[i];
@@ -59,10 +46,7 @@ public class HelloServiceSimpleImpl implements HelloServiceSimple {
         return resps;
     }
 
-    @WebMethod
-    @WebResult(name = "return", targetNamespace = "")
-    public List<String> getGreetingsList(@WebParam(name = "arg0", targetNamespace = "")
-    List<String> names) {
+    public List<String> getGreetingsList(List<String> names) {
         List<String> resps = new ArrayList<String>();
         for (int i = 0; i < names.size(); ++i) {
             resps.add("Hello " + names.get(i));
@@ -70,10 +54,7 @@ public class HelloServiceSimpleImpl implements HelloServiceSimple {
         return resps;
     }
 
-    @WebMethod
-    @WebResult(name = "return", targetNamespace = "")
-    public ArrayList<String> getGreetingsArrayList(@WebParam(name = "arg0", targetNamespace = "")
-    ArrayList<String> names) {
+    public ArrayList<String> getGreetingsArrayList(ArrayList<String> names) {
         ArrayList<String> resps = new ArrayList<String>();
         for (int i = 0; i < names.size(); ++i) {
             resps.add("Hello " + names.get(i));
@@ -81,21 +62,14 @@ public class HelloServiceSimpleImpl implements HelloServiceSimple {
         return resps;
     }
 
-    //    @WebMethod
-    //    @WebResult(name = "return", targetNamespace = "")
-    public Map<String, String> getGreetingsMap(
-    // @WebParam(name = "arg0", targetNamespace = "")
-    Map<String, String> namesMap) {
+    public Map<String, String> getGreetingsMap(Map<String, String> namesMap) {
         for (Map.Entry<String, String> entry : namesMap.entrySet()) {
             entry.setValue("Hello " + entry.getKey());
         }
         return namesMap;
     }
 
-    @WebMethod
-    @WebResult(name = "return", targetNamespace = "")
-    public HashMap<String, String> getGreetingsHashMap(@WebParam(name = "arg0", targetNamespace = "")
-    HashMap<String, String> namesMap) {
+    public HashMap<String, String> getGreetingsHashMap(HashMap<String, String> namesMap) {
         for (Map.Entry<String, String> entry : namesMap.entrySet()) {
             entry.setValue("Hello " + entry.getKey());
         }
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/jaxws/GetGreetingsList.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/jaxws/GetGreetingsList.java
deleted file mode 100644
index c8d08eed85..0000000000
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/jaxws/GetGreetingsList.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.itest.databindings.jaxb.impl.jaxws;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * This wrapper class was initially generated by wsgen.
- * 
- * @version $Rev$ $Date$
- */
-@XmlRootElement(name = "getGreetingsList", namespace = "http://impl.jaxb.databindings.itest.sca.tuscany.apache.org/")
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "getGreetingsList", namespace = "http://impl.jaxb.databindings.itest.sca.tuscany.apache.org/")
-public class GetGreetingsList {
-
-    @XmlElement(name = "arg0", namespace = "")
-    private List<String> arg0;
-
-    /**
-     * 
-     * @return
-     *     returns List<String>
-     */
-    public List<String> getArg0() {
-        return this.arg0;
-    }
-
-    /**
-     * 
-     * @param arg0
-     *     the value for the arg0 property
-     */
-    public void setArg0(List<String> arg0) {
-        this.arg0 = arg0;
-    }
-
-}
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/jaxws/GetGreetingsListResponse.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/jaxws/GetGreetingsListResponse.java
deleted file mode 100644
index 17ca0ca596..0000000000
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/jaxws/GetGreetingsListResponse.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.itest.databindings.jaxb.impl.jaxws;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * This wrapper class was initially generated by wsgen.
- * 
- * @version $Rev$ $Date$
- */
-@XmlRootElement(name = "getGreetingsListResponse", namespace = "http://impl.jaxb.databindings.itest.sca.tuscany.apache.org/")
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "getGreetingsListResponse", namespace = "http://impl.jaxb.databindings.itest.sca.tuscany.apache.org/")
-public class GetGreetingsListResponse {
-
-    @XmlElement(name = "return", namespace = "")
-    private List<String> _return;
-
-    /**
-     * 
-     * @return
-     *     returns List<String>
-     */
-    public List<String> getReturn() {
-        return this._return;
-    }
-
-    /**
-     * 
-     * @param _return
-     *     the value for the _return property
-     */
-    public void setReturn(List<String> _return) {
-        this._return = _return;
-    }
-
-}