Author: lresende
Date: Mon May 4 07:06:24 2009
New Revision: 771212
URL: http://svn.apache.org/viewvc?rev=771212&view=rev
Log:
TUSCANY-2978 - Minor update to make serice providers follow the same
implementation pattern
Modified:
tuscany/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java
tuscany/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorProviderFactory.java
tuscany/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorServiceProvider.java
tuscany/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceProvider.java
Modified:
tuscany/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java?rev=771212&r1=771211&r2=771212&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java
(original)
+++
tuscany/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java
Mon May 4 07:06:24 2009
@@ -24,6 +24,8 @@
import org.apache.tuscany.sca.host.embedded.SCADomain;
import org.json.JSONObject;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
@@ -41,15 +43,15 @@
private static final String SERVICE_URL = "http://localhost:8085/"; +
SERVICE_PATH;
- private SCADomain domain;
+ private static SCADomain domain;
//@BeforeClass
- public void setUp() throws Exception {
+ public static void setUp() throws Exception {
domain =
SCADomain.newInstance("org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCBinding.composite");
}
//@AfterClass
- public void tearDown() throws Exception {
+ public static void tearDown() throws Exception {
domain.close();
}
Modified:
tuscany/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorProviderFactory.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorProviderFactory.java?rev=771212&r1=771211&r2=771212&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorProviderFactory.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorProviderFactory.java
Mon May 4 07:06:24 2009
@@ -44,7 +44,7 @@
public OperationSelectorProvider
createServiceOperationSelectorProvider(RuntimeComponent component,
RuntimeComponentService service,
Binding binding) {
- return new JSONRPCOperationSelectorServiceProvider(component, service,
binding);
+ return new JSONRPCOperationSelectorServiceProvider(extensionPoints,
component, service, binding);
}
public Class<JSONRPCOperationSelector> getModelType() {
Modified:
tuscany/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorServiceProvider.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorServiceProvider.java?rev=771212&r1=771211&r2=771212&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorServiceProvider.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorServiceProvider.java
Mon May 4 07:06:24 2009
@@ -24,6 +24,7 @@
import org.apache.tuscany.sca.assembly.OperationSelector;
import org.apache.tuscany.sca.binding.http.HTTPBinding;
import
org.apache.tuscany.sca.binding.http.operationselector.jsonrpc.JSONRPCOperationSelector;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.invocation.Interceptor;
import org.apache.tuscany.sca.invocation.Phase;
import org.apache.tuscany.sca.provider.OperationSelectorProvider;
@@ -35,7 +36,10 @@
private RuntimeComponentService service;
private Binding binding;
- public JSONRPCOperationSelectorServiceProvider(RuntimeComponent component,
RuntimeComponentService service, Binding binding) {
+ public JSONRPCOperationSelectorServiceProvider(ExtensionPointRegistry
extensionPoints,
+ RuntimeComponent component,
+ RuntimeComponentService
service,
+ Binding binding) {
super();
this.component = component;
this.service = service;
Modified:
tuscany/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceProvider.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceProvider.java?rev=771212&r1=771211&r2=771212&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceProvider.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceProvider.java
Mon May 4 07:06:24 2009
@@ -52,8 +52,7 @@
}
public InterfaceContract
configureWireFormatInterfaceContract(InterfaceContract interfaceContract) {
- // TODO Auto-generated method stub
- return null;
+ return interfaceContract;
}
public Interceptor createInterceptor() {
