3 files changed, 77 insertions, 0 deletions
diff --git a/sca-java-1.x/trunk/itest/jaxws/src/main/java/jtest/impl/TestClientImpl.java b/sca-java-1.x/trunk/itest/jaxws/src/main/java/jtest/impl/TestClientImpl.java
index 12fd257b54..7461d18af8 100644
--- a/sca-java-1.x/trunk/itest/jaxws/src/main/java/jtest/impl/TestClientImpl.java
+++ b/sca-java-1.x/trunk/itest/jaxws/src/main/java/jtest/impl/TestClientImpl.java
@@ -20,14 +20,19 @@
 package jtest.impl;
 
 import java.util.ArrayList;
+import java.util.Map;
 import org.osoa.sca.annotations.Reference;
 import org.osoa.sca.annotations.Service;
 
 import jtest.AbstractException;
+import jtest.Bean1;
+import jtest.Bean2;
 import jtest.TestClient;
 import jtest.TestConcrete1;
 import jtest.TestConcrete2;
 import jtest.TestService;
+import jtest.WrapBean;
+import jtest.WrapMap;
 
 /**
  * The test client implementation
@@ -64,4 +69,31 @@ public class TestClientImpl implements TestClient {
         data.add("World!");
         ref.sendList(data);
     }
+
+    public void runMapTypeTest() {
+        Map<String, String> myMap = ref.returnMap();
+        System.out.println(myMap.get("greeting"));
+    }
+
+    public void runWrapMapTypeTest() {
+        WrapMap myWrapMap = ref.returnWrapMap();
+        Map<String, String> myMap = myWrapMap.getMap();
+        System.out.println(myMap.get("greeting"));
+    }
+
+    public void runWildcardExtendsTest() {
+        Bean2 temp = new Bean2();
+        temp.setName("Me");
+        Bean1<Bean2> arg = new Bean1<Bean2>(temp);
+        ref.sendWildcardExtends(arg);
+    }
+
+    public void runWrapBeanTest() {
+        Bean2 temp = new Bean2();
+        temp.setName("Me");
+        Bean1<Bean2> arg = new Bean1<Bean2>(temp);
+        WrapBean bean = new WrapBean();
+        bean.setBean(arg);
+        ref.sendWrapBean(bean);
+    }
 }
diff --git a/sca-java-1.x/trunk/itest/jaxws/src/main/java/jtest/impl/TestServiceImpl.java b/sca-java-1.x/trunk/itest/jaxws/src/main/java/jtest/impl/TestServiceImpl.java
index 8537635590..77a7cfb6cf 100644
--- a/sca-java-1.x/trunk/itest/jaxws/src/main/java/jtest/impl/TestServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/jaxws/src/main/java/jtest/impl/TestServiceImpl.java
@@ -19,14 +19,20 @@
 
 package jtest.impl;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.osoa.sca.annotations.Service;
 
 import jtest.AbstractException;
+import jtest.Bean1;
+import jtest.Bean2;
 import jtest.ConcreteException;
 import jtest.TestAbstract;
 import jtest.TestService;
+import jtest.WrapBean;
+import jtest.WrapMap;
 
 /**
  * The test service implementation
@@ -48,4 +54,26 @@ public class TestServiceImpl implements TestService {
     public void sendList(List<String> data) {
         System.out.println(data.get(0) + " " + data.get(1));
     }
+
+    public Map<String, String> returnMap() {
+        Map<String, String> yourMap = new HashMap<String, String>();
+        yourMap.put("greeting", "Hello, World Map!");
+        return yourMap;
+    }
+
+    public WrapMap returnWrapMap() {
+        Map<String, String> yourMap = new HashMap<String, String>();
+        yourMap.put("greeting", "Hello, World Map!");
+        WrapMap wrapped = new WrapMap();
+        wrapped.setMap(yourMap);
+        return wrapped;
+    }
+
+    public void sendWildcardExtends(Bean1</*? extends*/ Bean2> arg) {
+        System.out.println("TestServiceImpl received generic bean " + arg);
+    }
+
+    public void sendWrapBean(WrapBean arg) {
+        System.out.println("TestServiceImpl received wrapped bean " + arg.getBean());
+    }
 }
diff --git a/sca-java-1.x/trunk/itest/jaxws/src/main/java/jtest/impl/TestWebServiceImpl.java b/sca-java-1.x/trunk/itest/jaxws/src/main/java/jtest/impl/TestWebServiceImpl.java
index 2c429358f3..eb089e8be1 100644
--- a/sca-java-1.x/trunk/itest/jaxws/src/main/java/jtest/impl/TestWebServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/jaxws/src/main/java/jtest/impl/TestWebServiceImpl.java
@@ -19,11 +19,15 @@
 package jtest.impl;
 
 import java.util.List;
+import java.util.Map;
 import javax.jws.WebService;
 
 import jtest.AbstractException;
+import jtest.Bean1;
+import jtest.Bean2;
 import jtest.ConcreteException;
 import jtest.TestAbstract;
+import jtest.TestConcrete1;
 import jtest.TestWebService;
 
 @WebService(endpointInterface = "jtest.TestWebService")
@@ -33,6 +37,11 @@ public class TestWebServiceImpl implements TestWebService {
         System.out.println(testData.getGreeting());
     }
 
+    public String sendConcrete(TestConcrete1 testData) {
+        System.out.println(testData.getGreeting());
+        return "Hi!";
+    }
+
     public void throwAbstract() throws AbstractException {
         throw new ConcreteException();
     }    
@@ -40,4 +49,12 @@ public class TestWebServiceImpl implements TestWebService {
     public void sendList(List<String> data) {
         System.out.println(data.get(0) + " " + data.get(1));
     }
+
+    public Map<String, String> returnMap() {
+        return null;
+    }
+
+    public void sendWildcardExtends(Bean1<Bean2> arg) {
+        System.out.println(arg);
+    }
 }