TUSCANY-3283 generate unannotated beans into the namespace of the WSDL rather than an empty namespace

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

4 files changed, 121 insertions, 10 deletions

diff --git a/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/ABean.java b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/ABean.java
index 8a99a81132..bcfa0f8be7 100644
--- a/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/ABean.java
+++ b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/ABean.java
@@ -18,10 +18,15 @@
  */
 package helloworld;
 
+import anotherpackage.BBean;
+
+
+
 public class ABean {
     
     protected String field1;
     protected String field2;
+    protected BBean field3;
 
     public String getField1() {
         return field1;
@@ -38,5 +43,13 @@ public class ABean {
     public void setField2(String field2) {
         this.field2 = field2;
     }
+
+    public BBean getField3() {
+        return field3;
+    }
+    
+    public void setField3(BBean field3) {
+        this.field3 = field3;
+    }
 }
 
diff --git a/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldClientImpl.java b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldClientImpl.java
new file mode 100644
index 0000000000..04fbe6934a
--- /dev/null
+++ b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldClientImpl.java
@@ -0,0 +1,68 @@
+/*
+ * 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 helloworld;
+
+
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+import yetanotherpackage.DBean;
+
+import anotherpackage.BBean;
+import anotherpackage.CBean;
+
+/**
+ * This class implements the HelloWorld service.
+ */
+@Service(HelloWorldService.class)
+public class HelloWorldClientImpl implements HelloWorldService {
+    
+    @Reference
+    protected HelloWorldService hwService;
+
+    public String getGreetings(String name) {
+        return "Hello " + hwService.getGreetings(name);
+    }
+    
+    public String getGreetingsBean(ABean bean){
+        return "Hello " + hwService.getGreetingsBean(bean);
+    }
+
+    public String getGreetingsBeanArray(ABean[] bean){
+        return "Hello " + hwService.getGreetingsBeanArray(bean);
+    }
+   
+    /*
+    public String getGreetingsBeanVector(Vector<ABean> bean){
+        return "Hello " + bean.get(0).getField1() + " " + bean.get(0).getField2();
+    }
+    */
+    
+    public String getGreetingsBBean(BBean bean){
+        return "Hello " + hwService.getGreetingsBBean(bean);
+    }
+    
+    public String getGreetingsCBean(CBean bean){
+        return "Hello " + hwService.getGreetingsCBean(bean);
+    }    
+    
+    public String getGreetingsDBean(DBean bean){
+        return "Hello " + hwService.getGreetingsDBean(bean);
+    }      
+}
diff --git a/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldImpl.java b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldImpl.java
index 83165307af..a92a819aaf 100644
--- a/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldImpl.java
+++ b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldImpl.java
@@ -18,31 +18,52 @@
  */
 package helloworld;
 
-import java.util.Vector;
+import javax.jws.WebService;
 
 import org.osoa.sca.annotations.Service;
 
+import yetanotherpackage.DBean;
+
+import anotherpackage.BBean;
+import anotherpackage.CBean;
+
 /**
  * This class implements the HelloWorld service.
  */
+@WebService
 @Service(HelloWorldService.class)
 public class HelloWorldImpl implements HelloWorldService {
 
     public String getGreetings(String name) {
         return "Hello " + name;
     }
-    
-    public String getGreetingsBean(ABean bean){
-        return "Hello " + bean.getField1() + " " + bean.getField2();
+
+    public String getGreetingsBean(ABean bean) {
+        return "Hello " + bean.getField1() + " " + bean.getField2()
+                + bean.getField3().getField1() + " "
+                + bean.getField3().getField2();
     }
 
-    public String getGreetingsBeanArray(ABean[] bean){
+    public String getGreetingsBeanArray(ABean[] bean) {
         return "Hello " + bean[0].getField1() + " " + bean[0].getField2();
     }
-   
+
     /*
-    public String getGreetingsBeanVector(Vector<ABean> bean){
-        return "Hello " + bean.get(0).getField1() + " " + bean.get(0).getField2();
+     * public String getGreetingsBeanVector(Vector<ABean> bean){ return "Hello "
+     * + bean.get(0).getField1() + " " + bean.get(0).getField2(); }
+     */
+
+    public String getGreetingsBBean(BBean bean) {
+        return "Hello " + bean.getField1() + " " + bean.getField2();
+    }
+
+    public String getGreetingsCBean(CBean bean) {
+        return "Hello " + bean.getField1() + " " + bean.getField2();
     }
-    */
+    
+    public String getGreetingsDBean(DBean bean) {
+        return "Hello " + bean.getField1() + " " + bean.getField2() + " "
+                + bean.getField3().getField1() + " "
+                + bean.getField3().getField2();
+    }    
 }
diff --git a/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldService.java b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldService.java
index 6f3d57e6f7..6b0425d473 100644
--- a/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldService.java
+++ b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldService.java
@@ -18,13 +18,19 @@
  */
 package helloworld;
 
-import java.util.Vector;
+import javax.jws.WebService;
 
 import org.osoa.sca.annotations.Remotable;
 
+import yetanotherpackage.DBean;
+
+import anotherpackage.BBean;
+import anotherpackage.CBean;
+
 /**
  * This is the business interface of the HelloWorld greetings service.
  */
+@WebService
 @Remotable
 public interface HelloWorldService {
 
@@ -32,5 +38,8 @@ public interface HelloWorldService {
     public String getGreetingsBean(ABean bean);
     public String getGreetingsBeanArray(ABean[] bean);
     //public String getGreetingsBeanVector(Vector<ABean> bean);
+    public String getGreetingsBBean(BBean bean);
+    public String getGreetingsCBean(CBean bean);
+    public String getGreetingsDBean(DBean bean);
 }