svn commit: r820526 - in /tuscany/java/sca/modules/binding-jsonrpc-runtime: META-INF/ src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/ src/test/java/echo/

[lr...@apache.org]

Author: lresende
Date: Thu Oct  1 04:03:12 2009
New Revision: 820526

URL: http://svn.apache.org/viewvc?rev=820526&view=rev
Log:
More updates to port JSON-RPC binding to 2.x

Modified:
    tuscany/java/sca/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF
    tuscany/java/sca/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
    tuscany/java/sca/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
    tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java

Modified: tuscany/java/sca/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF?rev=820526&r1=820525&r2=820526&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF (original)
+++ tuscany/java/sca/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF Thu Oct  1 04:03:12 2009
@@ -8,7 +8,8 @@
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA JSON-RPC Binding Runtime
-Import-Package: javax.servlet,
+Import-Package: com.metaparadigm.jsonrpc;version="1.0.0",
+ javax.servlet,
  javax.servlet.http,
  javax.xml.namespace,
  javax.xml.stream;version="1.0",
@@ -27,6 +28,7 @@
  org.apache.tuscany.sca.monitor;version="2.0",
  org.apache.tuscany.sca.provider,
  org.apache.tuscany.sca.runtime,
+ org.json;version="1.0.0",
  org.oasisopen.sca;version="2.0.0",
  org.oasisopen.sca.annotation
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.jsonrpc.runtime

Modified: tuscany/java/sca/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java?rev=820526&r1=820525&r2=820526&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java (original)
+++ tuscany/java/sca/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java Thu Oct  1 04:03:12 2009
@@ -19,8 +19,6 @@
 
 package org.apache.tuscany.sca.binding.jsonrpc.provider;
 
-import javax.xml.soap.MessageFactory;
-
 import org.apache.tuscany.sca.assembly.Endpoint;
 import org.apache.tuscany.sca.assembly.EndpointReference;
 import org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBinding;
@@ -28,6 +26,7 @@
 import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 import org.apache.tuscany.sca.host.http.ServletHost;
 import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;
+import org.apache.tuscany.sca.invocation.MessageFactory;
 import org.apache.tuscany.sca.provider.BindingProviderFactory;
 import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
 import org.apache.tuscany.sca.provider.ServiceBindingProvider;

Modified: tuscany/java/sca/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java?rev=820526&r1=820525&r2=820526&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java (original)
+++ tuscany/java/sca/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java Thu Oct  1 04:03:12 2009
@@ -40,7 +40,7 @@
 import org.apache.tuscany.sca.runtime.RuntimeWire;
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.osoa.sca.ServiceRuntimeException;
+import org.oasisopen.sca.ServiceRuntimeException;
 
 import com.metaparadigm.jsonrpc.JSONRPCBridge;
 import com.metaparadigm.jsonrpc.JSONRPCResult;

Modified: tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java?rev=820526&r1=820525&r2=820526&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java (original)
+++ tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java Thu Oct  1 04:03:12 2009
@@ -25,7 +25,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 import bean.TestBean;