Author: lresende
Date: Fri Aug 1 18:10:19 2008
New Revision: 681925
URL: http://svn.apache.org/viewvc?rev=681925&view=rev
Log:
Small refactoring on the jsonRPC tests artifacts
Added:
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/bean/
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
(contents, props changed)
- copied, changed from r681907,
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/TestBean.java
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
(contents, props changed)
- copied, changed from r681907,
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
(contents, props changed)
- copied, changed from r681907,
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/BusinessException.java
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
(contents, props changed)
- copied, changed from r681907,
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java
Removed:
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/BusinessException.java
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/TestBean.java
Modified:
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
Copied:
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
(from r681907,
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/TestBean.java)
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java?p2=tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java&p1=tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/TestBean.java&r1=681907&r2=681925&rev=681925&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/TestBean.java
(original)
+++
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
Fri Aug 1 18:10:19 2008
@@ -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;
Propchange:
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Aug 1 18:10:19 2008
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/TestBean.java:671193
Copied:
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
(from r681907,
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java)
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java?p2=tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java&p1=tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java&r1=681907&r2=681925&rev=681925&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java
(original)
+++
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
Fri Aug 1 18:10:19 2008
@@ -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.Map;
import java.util.Set;
+import bean.TestBean;
+
/**
* Interface of our sample JSONRPC service.
*
@@ -36,7 +38,7 @@
void echoRuntimeException() throws RuntimeException;
- void echoBusinessException() throws BusinessException;
+ void echoBusinessException() throws EchoBusinessException;
int echoInt(int param);
Propchange:
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Aug 1 18:10:19 2008
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java:671193
Copied:
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
(from r681907,
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/BusinessException.java)
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java?p2=tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java&p1=tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/BusinessException.java&r1=681907&r2=681925&rev=681925&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/BusinessException.java
(original)
+++
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
Fri Aug 1 18:10:19 2008
@@ -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);
}
Propchange:
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Aug 1 18:10:19 2008
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/BusinessException.java:671193
Copied:
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
(from r681907,
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java)
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java?p2=tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java&p1=tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java&r1=681907&r2=681925&rev=681925&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java
(original)
+++
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
Fri Aug 1 18:10:19 2008
@@ -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.Map;
import java.util.Set;
+import bean.TestBean;
+
+
/**
@@ -40,8 +43,8 @@
return "echo: " + msg;
}
- public void echoBusinessException() throws BusinessException {
- throw new BusinessException("Business Exception");
+ public void echoBusinessException() throws EchoBusinessException {
+ throw new EchoBusinessException("Business Exception");
}
Propchange:
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Aug 1 18:10:19 2008
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java:671193
Modified:
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite?rev=681925&r1=681924&r2=681925&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
(original)
+++
tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
Fri Aug 1 18:10:19 2008
@@ -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>