diff options
author | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-05-02 00:43:35 +0000 |
---|---|---|
committer | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-05-02 00:43:35 +0000 |
commit | 88389b44557c4465d011d9a7cd69421ed8857686 (patch) | |
tree | f728b3933ab65db8c3580b681e073f1af7d66337 /branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src | |
parent | 7dcc8f6ff21977553ea41d144429ffeb4ff19bd1 (diff) |
TUSCANY-2968 - Changing binding to tuscany namespace and other small updates
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@770874 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
5 files changed, 10 insertions, 10 deletions
diff --git a/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceInterceptor.java b/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatInterceptor.java index 1b629962e5..68152b0321 100644 --- a/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceInterceptor.java +++ b/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatInterceptor.java @@ -23,7 +23,7 @@ import org.apache.tuscany.sca.invocation.Interceptor; import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.invocation.Message; -public class JSONRPCWireFormatServiceInterceptor implements Interceptor { +public class JSONRPCWireFormatInterceptor implements Interceptor { public Invoker getNext() { // TODO Auto-generated method stub diff --git a/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatReferenceProvider.java b/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatReferenceProvider.java index d75e730949..5e1151dc95 100644 --- a/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatReferenceProvider.java +++ b/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatReferenceProvider.java @@ -23,6 +23,7 @@ import org.apache.tuscany.sca.assembly.Binding; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.interfacedef.InterfaceContract; import org.apache.tuscany.sca.invocation.Interceptor; +import org.apache.tuscany.sca.invocation.Phase; import org.apache.tuscany.sca.provider.WireFormatProvider; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentReference; @@ -40,18 +41,15 @@ public class JSONRPCWireFormatReferenceProvider implements WireFormatProvider { } public InterfaceContract configureWireFormatInterfaceContract(InterfaceContract interfaceContract) { - // TODO Auto-generated method stub return null; } public Interceptor createInterceptor() { - // TODO Auto-generated method stub return null; } public String getPhase() { - // TODO Auto-generated method stub - return null; + return Phase.REFERENCE_BINDING_WIREFORMAT; } } diff --git a/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceProvider.java b/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceProvider.java index 1de2171a07..983e54c1a7 100644 --- a/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceProvider.java +++ b/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceProvider.java @@ -23,6 +23,7 @@ import org.apache.tuscany.sca.assembly.Binding; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.interfacedef.InterfaceContract; import org.apache.tuscany.sca.invocation.Interceptor; +import org.apache.tuscany.sca.invocation.Phase; import org.apache.tuscany.sca.provider.WireFormatProvider; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentService; @@ -50,8 +51,7 @@ public class JSONRPCWireFormatServiceProvider implements WireFormatProvider { } public String getPhase() { - // TODO Auto-generated method stub - return null; + return Phase.SERVICE_BINDING_WIREFORMAT; } } diff --git a/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java b/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java index 444d45cf37..b9608115be 100644 --- a/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java +++ b/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java @@ -37,7 +37,7 @@ import com.meterware.httpunit.WebResponse; /** * @version $Rev$ $Date$ */ -public class JSONRPCServiceTestCase{ +public class JSONRPCServiceTestCase { private static final String SERVICE_PATH = "/EchoService"; diff --git a/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite b/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite index 978fdcfa7f..692918fa69 100644 --- a/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite +++ b/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite @@ -18,14 +18,16 @@ * under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
targetNamespace="http://jsonrpc"
xmlns:jsonrpc="http://jsonrpc"
name="JSONRPCBinding">
<service name="EchoService" promote="EchoComponent">
<interface.java interface="echo.Echo"/>
- <tuscany:binding.jsonrpc uri="http://localhost:8085/SCADomain/EchoService"/>
+ <binding.http uri="http://localhost:8085/SCADomain/EchoService">
+ <wireFormat.jsonrpc/>
+ <operationSelector.jsonrpc/>
+ </binding.http>
</service>
<component name="EchoComponent">
|