Small refactoring on the jsonRPC tests artifacts

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

5 files changed, 16 insertions, 11 deletions

diff --git a/java/sca/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/TestBean.java b/java/sca/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
index 6da00ffab9..a7ee5997a3 100644
--- a/java/sca/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/TestBean.java
+++ b/java/sca/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.sca.binding.jsonrpc;
+package bean;
 
 public class TestBean {
     private String testString;
diff --git a/java/sca/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java b/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
index 5f5f9da346..a83f439e3e 100644
--- a/java/sca/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java
+++ b/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.sca.binding.jsonrpc;
+package echo;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -25,6 +25,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import bean.TestBean;
+
 /**
  * Interface of our sample JSONRPC service.
  * 
@@ -36,7 +38,7 @@ public interface Echo {
     
     void echoRuntimeException() throws RuntimeException;
     
-    void echoBusinessException() throws BusinessException;
+    void echoBusinessException() throws EchoBusinessException;
     
     int echoInt(int param);
     
diff --git a/java/sca/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/BusinessException.java b/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
index 9c9367d91a..bf8c7d2c8a 100644
--- a/java/sca/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/BusinessException.java
+++ b/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.sca.binding.jsonrpc;
+package echo;
 
-public class BusinessException extends Exception {
+public class EchoBusinessException extends Exception {
     private static final long serialVersionUID = 7234119326657905710L;
 
-    public BusinessException(String message)
+    public EchoBusinessException(String message)
 	{
 		super(message);
 	}
diff --git a/java/sca/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java b/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
index 8038e919b7..fd51eb0da1 100644
--- a/java/sca/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java
+++ b/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.sca.binding.jsonrpc;
+package echo;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -26,6 +26,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import bean.TestBean;
+
+
 
 
 /**
@@ -40,8 +43,8 @@ public class EchoComponentImpl implements Echo {
         return "echo: " + msg;
     }
 
-	public void echoBusinessException() throws BusinessException {
-		throw new BusinessException("Business Exception");
+	public void echoBusinessException() throws EchoBusinessException {
+		throw new EchoBusinessException("Business Exception");
 		
 	}
 
diff --git a/java/sca/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite b/java/sca/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
index 491b42c69c..978fdcfa7f 100644
--- a/java/sca/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
+++ b/java/sca/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
@@ -24,12 +24,12 @@
 	name="JSONRPCBinding">

 

     <service name="EchoService" promote="EchoComponent">

-        <interface.java interface="org.apache.tuscany.sca.binding.jsonrpc.Echo"/>

+        <interface.java interface="echo.Echo"/>

         <tuscany:binding.jsonrpc uri="http://localhost:8085/SCADomain/EchoService"/>

     </service>

 

     <component name="EchoComponent">

-        <implementation.java class="org.apache.tuscany.sca.binding.jsonrpc.EchoComponentImpl"/>

+        <implementation.java class="echo.EchoComponentImpl"/>

     </component>

     

 </composite>