4 files changed, 23 insertions, 45 deletions
diff --git a/sca-cpp/trunk/modules/java/test/Client.java b/sca-cpp/trunk/modules/java/test/Client.java
index ff2d3fee13..c3bd875fcc 100644
--- a/sca-cpp/trunk/modules/java/test/Client.java
+++ b/sca-cpp/trunk/modules/java/test/Client.java
@@ -23,16 +23,12 @@ public interface Client {
 
     String echo(String x);
     
-    Iterable<?> getall();
+    Iterable<?> get(Iterable<String> id);
     
-    Iterable<?> get(String id);
+    Iterable<String> post(Iterable<String> collection, Iterable<?> item);
     
-    String post(Iterable<?> item);
+    Boolean put(Iterable<String> id, Iterable<?> item);
     
-    Boolean put(String id, Iterable<?> entry);
-    
-    Boolean deleteall();
-    
-    Boolean delete(String id);
+    Boolean delete(Iterable<String> id);
     
 }
diff --git a/sca-cpp/trunk/modules/java/test/ClientImpl.java b/sca-cpp/trunk/modules/java/test/ClientImpl.java
index 4bd3498dd5..ade2ba302e 100644
--- a/sca-cpp/trunk/modules/java/test/ClientImpl.java
+++ b/sca-cpp/trunk/modules/java/test/ClientImpl.java
@@ -25,27 +25,19 @@ public class ClientImpl {
         return server.echo(x);
     }
     
-    public Iterable<?> getall(Server server) {
-        return server.getall();
-    }
-    
-    public Iterable<?> get(String id, Server server) {
+    public Iterable<?> get(Iterable<String> id, Server server) {
         return server.get(id);
     }
     
-    public String post(Iterable<?> item, Server server) {
-        return server.post(item);
+    public Iterable<String> post(Iterable<String> collection, Iterable<?> item, Server server) {
+        return server.post(collection, item);
     }
     
-    public Boolean put(String id, Iterable<?> item, Server server) {
+    public Boolean put(Iterable<String> id, Iterable<?> item, Server server) {
         return server.put(id, item);
     }
     
-    public Boolean deleteall(Server server) {
-        return server.deleteall();
-    }
-    
-    public Boolean delete(String id, Server server) {
+    public Boolean delete(Iterable<String> id, Server server) {
         return server.delete(id);
     }
     
diff --git a/sca-cpp/trunk/modules/java/test/Server.java b/sca-cpp/trunk/modules/java/test/Server.java
index 917ccfd6b9..3dfe3c84ef 100644
--- a/sca-cpp/trunk/modules/java/test/Server.java
+++ b/sca-cpp/trunk/modules/java/test/Server.java
@@ -23,16 +23,12 @@ public interface Server {
 
     String echo(String x);
     
-    Iterable<?> getall();
+    Iterable<?> get(Iterable<String> id);
     
-    Iterable<?> get(String id);
+    Iterable<String> post(Iterable<String> collection, Iterable<?> item);
     
-    String post(Iterable<?> item);
+    Boolean put(Iterable<String> id, Iterable<?> item);
     
-    Boolean put(String id, Iterable<?> entry);
-    
-    Boolean deleteall();
-    
-    Boolean delete(String id);
+    Boolean delete(Iterable<String> id);
     
 }
diff --git a/sca-cpp/trunk/modules/java/test/ServerImpl.java b/sca-cpp/trunk/modules/java/test/ServerImpl.java
index dd4e227123..d979c20a15 100644
--- a/sca-cpp/trunk/modules/java/test/ServerImpl.java
+++ b/sca-cpp/trunk/modules/java/test/ServerImpl.java
@@ -27,31 +27,25 @@ public class ServerImpl {
         return x;
     }
     
-    public Iterable<?> getall() {
-        return list("Sample Feed", "123456789",
-                list("Item", "111", list(list("'javaClass", "services.Item"), list("'name", "Apple"), list("'currencyCode", "USD"), list("'currencySymbol", "$"), list("'price", 2.99))),
-                list("Item", "222", list(list("'javaClass", "services.Item"), list("'name", "Orange"), list("'currencyCode", "USD"), list("'currencySymbol", "$"), list("'price", 3.55))),
-                list("Item", "333", list(list("'javaClass", "services.Item"), list("'name", "Pear"), list("'currencyCode", "USD"), list("'currencySymbol", "$"), list("'price", 1.55))));
-    }
-    
-    public Iterable<?> get(String id) {
+    public Iterable<?> get(Iterable<String> id) {
+        if (isNil(id))
+            return list("Sample Feed", "123456789",
+                    list("Item", "111", list(list("'javaClass", "services.Item"), list("'name", "Apple"), list("'currencyCode", "USD"), list("'currencySymbol", "$"), list("'price", 2.99))),
+                    list("Item", "222", list(list("'javaClass", "services.Item"), list("'name", "Orange"), list("'currencyCode", "USD"), list("'currencySymbol", "$"), list("'price", 3.55))),
+                    list("Item", "333", list(list("'javaClass", "services.Item"), list("'name", "Pear"), list("'currencyCode", "USD"), list("'currencySymbol", "$"), list("'price", 1.55))));
         Iterable<?> entry = list(list("'javaClass", "services.Item"), list("'name", "Apple"), list("'currencyCode", "USD"), list("'currencySymbol", "$"), list("'price", 2.99));
         return list("Item", id, entry);
     }
 
-    public String post(Iterable<?> item) {
-        return "123456789";
+    public Iterable<String> post(Iterable<String> collection, Iterable<?> item) {
+        return list("123456789");
     }
     
-    public Boolean put(String id, Iterable<?> entry) {
-        return true;
-    }
-
-    public Boolean deleteall() {
+    public Boolean put(Iterable<String> id, Iterable<?> item) {
         return true;
     }
 
-    public Boolean delete(String id) {
+    public Boolean delete(Iterable<String> id) {
         return true;
     }
 }