You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/09/17 07:04:58 UTC
svn commit: r576257 - in /incubator/tuscany/branches/sca-java-1.0:
modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/
modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/
modules/binding-http/src/main/java/org/a...
Author: jsdelfino
Date: Sun Sep 16 22:04:55 2007
New Revision: 576257
URL: http://svn.apache.org/viewvc?rev=576257&view=rev
Log:
Fix for TUSCANY-1640, consolidated SPIs and cleaned up deprecated, adjusted binding and implementation providers. Removed a number of additional deprecated classes.
Removed:
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingInvoker.java
incubator/tuscany/branches/sca-java-1.0/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultModelFactoryExtensionPoint.java
incubator/tuscany/branches/sca-java-1.0/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModelFactoryExtensionPoint.java
incubator/tuscany/branches/sca-java-1.0/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider2.java
incubator/tuscany/branches/sca-java-1.0/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider2.java
incubator/tuscany/branches/sca-java-1.0/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvokerCreationException.java
incubator/tuscany/branches/sca-java-1.0/modules/host-http/src/main/java/org/apache/tuscany/sca/http/
incubator/tuscany/branches/sca-java-1.0/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/
incubator/tuscany/branches/sca-java-1.0/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/TargetMethodNotFoundException.java
incubator/tuscany/branches/sca-java-1.0/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/ExtensibleJavaInterfaceIntrospector.java
incubator/tuscany/branches/sca-java-1.0/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceIntrospector.java
incubator/tuscany/branches/sca-java-1.0/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/
Modified:
incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
incubator/tuscany/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomReferenceBindingProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSReferenceBindingProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceServiceBindingProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
incubator/tuscany/branches/sca-java-1.0/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java
incubator/tuscany/branches/sca-java-1.0/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationImplementationProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/host-embedded/src/test/java/test/crud/provider/CRUDImplementationProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java
incubator/tuscany/branches/sca-java-1.0/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
incubator/tuscany/branches/sca-java-1.0/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
incubator/tuscany/branches/sca-java-1.0/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
incubator/tuscany/branches/sca-java-1.0/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
Modified: incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java Sun Sep 16 22:04:55 2007
@@ -109,14 +109,6 @@
void setConstrainingType(ConstrainingType constrainingType);
/**
- * Returns true if the component references should be autowired.
- *
- * @return whether component references should be autowired.
- */
- @Deprecated
- boolean isAutowire();
-
- /**
* Return the Boolean value of autowire
* @return null/TRUE/FALSE
*/
Modified: incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java Sun Sep 16 22:04:55 2007
@@ -41,14 +41,6 @@
void setReference(Reference reference);
/**
- * Returns true if the component references should be autowired.
- *
- * @return whether component references should be autowired.
- */
- @Deprecated
- boolean isAutowire();
-
- /**
* Return the Boolean value of autowire
* @return null/TRUE/FALSE
*/
Modified: incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java Sun Sep 16 22:04:55 2007
@@ -84,14 +84,6 @@
void setLocal(boolean local);
/**
- * Returns true if the component references should be autowired.
- *
- * @return whether component references should be autowired.
- */
- @Deprecated
- boolean isAutowire();
-
- /**
* Return the Boolean value of autowire
* @return null/TRUE/FALSE
*/
Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomReferenceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomReferenceBindingProvider.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomReferenceBindingProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomReferenceBindingProvider.java Sun Sep 16 22:04:55 2007
@@ -61,33 +61,29 @@
httpClient.getHttpConnectionManager().getParams().setConnectionTimeout(60000);
}
- public Invoker createInvoker(Operation operation, boolean isCallback) {
- if (isCallback) {
- throw new UnsupportedOperationException();
- } else {
- String operationName = operation.getName();
- if (operationName.equals("get")) {
- return new AtomBindingInvoker.GetInvoker(operation, binding.getURI(), httpClient, authorizationHeader);
- } else if (operationName.equals("post")) {
- return new AtomBindingInvoker.PostInvoker(operation, binding.getURI(), httpClient, authorizationHeader);
- } else if (operationName.equals("put")) {
- return new AtomBindingInvoker.PutInvoker(operation, binding.getURI(), httpClient, authorizationHeader);
- } else if (operationName.equals("delete")) {
- return new AtomBindingInvoker.DeleteInvoker(operation, binding.getURI(), httpClient,
- authorizationHeader);
- } else if (operationName.equals("getFeed")) {
- return new AtomBindingInvoker.GetCollectionInvoker(operation, binding.getURI(), httpClient,
- authorizationHeader);
- } else if (operationName.equals("postMedia")) {
- return new AtomBindingInvoker.PostMediaInvoker(operation, binding.getURI(), httpClient,
+ public Invoker createInvoker(Operation operation) {
+ String operationName = operation.getName();
+ if (operationName.equals("get")) {
+ return new AtomBindingInvoker.GetInvoker(operation, binding.getURI(), httpClient, authorizationHeader);
+ } else if (operationName.equals("post")) {
+ return new AtomBindingInvoker.PostInvoker(operation, binding.getURI(), httpClient, authorizationHeader);
+ } else if (operationName.equals("put")) {
+ return new AtomBindingInvoker.PutInvoker(operation, binding.getURI(), httpClient, authorizationHeader);
+ } else if (operationName.equals("delete")) {
+ return new AtomBindingInvoker.DeleteInvoker(operation, binding.getURI(), httpClient,
+ authorizationHeader);
+ } else if (operationName.equals("getFeed")) {
+ return new AtomBindingInvoker.GetCollectionInvoker(operation, binding.getURI(), httpClient,
authorizationHeader);
- } else if (operationName.equals("putMedia")) {
- return new AtomBindingInvoker.PutMediaInvoker(operation, binding.getURI(), httpClient,
- authorizationHeader);
- }
-
- return new AtomBindingInvoker(operation, binding.getURI(), httpClient, authorizationHeader);
+ } else if (operationName.equals("postMedia")) {
+ return new AtomBindingInvoker.PostMediaInvoker(operation, binding.getURI(), httpClient,
+ authorizationHeader);
+ } else if (operationName.equals("putMedia")) {
+ return new AtomBindingInvoker.PutMediaInvoker(operation, binding.getURI(), httpClient,
+ authorizationHeader);
}
+
+ return new AtomBindingInvoker(operation, binding.getURI(), httpClient, authorizationHeader);
}
public InterfaceContract getBindingInterfaceContract() {
@@ -105,6 +101,10 @@
public void stop() {
httpClient = null;
+ }
+
+ public boolean supportsOneWayInvocation() {
+ return false;
}
}
Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java Sun Sep 16 22:04:55 2007
@@ -54,6 +54,10 @@
public InterfaceContract getBindingInterfaceContract() {
return service.getInterfaceContract();
}
+
+ public boolean supportsOneWayInvocation() {
+ return false;
+ }
public void start() {
RuntimeComponentService componentService = (RuntimeComponentService)service;
Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSReferenceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSReferenceBindingProvider.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSReferenceBindingProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSReferenceBindingProvider.java Sun Sep 16 22:04:55 2007
@@ -42,18 +42,18 @@
this.binding = binding;
}
- public Invoker createInvoker(Operation operation, boolean isCallback) {
- if (isCallback) {
- throw new UnsupportedOperationException();
- } else {
- return new RSSBindingInvoker(binding.getURI(), "rss_2.0");
- }
+ public Invoker createInvoker(Operation operation) {
+ return new RSSBindingInvoker(binding.getURI(), "rss_2.0");
+ }
+
+ public boolean supportsOneWayInvocation() {
+ return false;
}
public InterfaceContract getBindingInterfaceContract() {
return reference.getInterfaceContract();
}
-
+
public void start() {
}
Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java Sun Sep 16 22:04:55 2007
@@ -54,6 +54,10 @@
public InterfaceContract getBindingInterfaceContract() {
return service.getInterfaceContract();
}
+
+ public boolean supportsOneWayInvocation() {
+ return false;
+ }
public void start() {
RuntimeComponentService componentService = (RuntimeComponentService)service;
Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceServiceBindingProvider.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceServiceBindingProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceServiceBindingProvider.java Sun Sep 16 22:04:55 2007
@@ -67,6 +67,10 @@
public InterfaceContract getBindingInterfaceContract() {
return service.getInterfaceContract();
}
+
+ public boolean supportsOneWayInvocation() {
+ return false;
+ }
public void start() {
Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java Sun Sep 16 22:04:55 2007
@@ -136,13 +136,6 @@
return brokerID;
}
- public Invoker createInvoker(Operation operation, boolean isCallback) {
- if (isCallback) {
- throw new UnsupportedOperationException();
- }
- return createInvoker(operation);
- }
-
public Invoker createInvoker(Operation operation) {
if (invoker == null) {
invoker = new NotificationReferenceBindingInvoker(operation, this);
@@ -150,7 +143,7 @@
return invoker;
}
- public boolean supportsAsyncOneWayInvocation() {
+ public boolean supportsOneWayInvocation() {
return false;
}
Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java Sun Sep 16 22:04:55 2007
@@ -137,6 +137,10 @@
public InterfaceContract getBindingInterfaceContract() {
return service.getInterfaceContract();
}
+
+ public boolean supportsOneWayInvocation() {
+ return false;
+ }
public void start() {
if (started) {
Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java Sun Sep 16 22:04:55 2007
@@ -36,7 +36,7 @@
import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.invocation.MessageFactory;
import org.apache.tuscany.sca.node.SCADomain;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider2;
+import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
import org.apache.tuscany.sca.runtime.EndpointReference;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
@@ -48,7 +48,7 @@
*
* @version $Rev: 563772 $ $Date: 2007-08-08 07:50:49 +0100 (Wed, 08 Aug 2007) $
*/
-public class Axis2SCAReferenceBindingProvider implements ReferenceBindingProvider2 {
+public class Axis2SCAReferenceBindingProvider implements ReferenceBindingProvider {
private SCADomain domain;
private RuntimeComponent component;
@@ -95,7 +95,7 @@
return wsBinding.getBindingInterfaceContract();
}
- public boolean supportsAsyncOneWayInvocation() {
+ public boolean supportsOneWayInvocation() {
return false;
}
@@ -103,15 +103,6 @@
return new Axis2SCABindingInvoker(this, axisReferenceBindingProvider.createInvoker(operation));
}
- @Deprecated
- public Invoker createInvoker(Operation operation, boolean isCallback) {
- if (isCallback) {
- throw new UnsupportedOperationException();
- } else {
- return createInvoker(operation);
- }
- }
-
/**
* Uses the distributed domain service discovery feature to locate remote
* service endpoints
Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java Sun Sep 16 22:04:55 2007
@@ -37,12 +37,10 @@
import org.apache.tuscany.sca.domain.SCADomainService;
import org.apache.tuscany.sca.host.http.ServletHost;
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
-import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.invocation.MessageFactory;
import org.apache.tuscany.sca.node.SCADomain;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider2;
+import org.apache.tuscany.sca.provider.ServiceBindingProvider;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
import org.apache.tuscany.sca.runtime.RuntimeComponentService;
@@ -52,11 +50,10 @@
*
* @version $Rev: 563772 $ $Date: 2007-08-08 07:50:49 +0100 (Wed, 08 Aug 2007) $
*/
-public class Axis2SCAServiceBindingProvider implements ServiceBindingProvider2 {
+public class Axis2SCAServiceBindingProvider implements ServiceBindingProvider {
private final static Logger logger = Logger.getLogger(Axis2SCAServiceBindingProvider.class.getName());
- private SCADomain domain;
private SCABinding binding;
private Axis2ServiceProvider axisProvider;
private WebServiceBinding wsBinding;
@@ -70,7 +67,6 @@
DistributedSCABinding binding,
ServletHost servletHost,
MessageFactory messageFactory) {
- this.domain = domain;
this.binding = binding.getSCABinding();
wsBinding = (new DefaultWebServiceBindingFactory()).createWebServiceBinding();
@@ -205,12 +201,8 @@
return wsBinding.getBindingInterfaceContract();
}
- public boolean supportsAsyncOneWayInvocation() {
+ public boolean supportsOneWayInvocation() {
return false;
- }
-
- public Invoker createCallbackInvoker(Operation operation) {
- throw new UnsupportedOperationException();
}
public void start() {
Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java Sun Sep 16 22:04:55 2007
@@ -44,7 +44,7 @@
return reference.getInterfaceContract();
}
- public Invoker createInvoker(Operation operation, boolean isCallback) {
+ public Invoker createInvoker(Operation operation) {
return null;
}
@@ -52,6 +52,10 @@
}
public void stop() {
+ }
+
+ public boolean supportsOneWayInvocation() {
+ return false;
}
}
Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java Sun Sep 16 22:04:55 2007
@@ -19,8 +19,8 @@
package org.apache.tuscany.sca.binding.sca.impl;
-import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.assembly.OptimizableBinding;
+import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.domain.SCADomainService;
@@ -30,7 +30,7 @@
import org.apache.tuscany.sca.node.SCADomain;
import org.apache.tuscany.sca.provider.BindingProviderFactory;
import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider2;
+import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
import org.apache.tuscany.sca.runtime.EndpointReference;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
@@ -47,9 +47,8 @@
*
* @version $Rev$ $Date$
*/
-public class RuntimeSCAReferenceBindingProvider implements ReferenceBindingProvider2 {
+public class RuntimeSCAReferenceBindingProvider implements ReferenceBindingProvider {
- private ExtensionPointRegistry extensionPoints;
private SCADomain domain;
private RuntimeComponent component;
private RuntimeComponentReference reference;
@@ -57,14 +56,13 @@
private boolean started = false;
private BindingProviderFactory<DistributedSCABinding> distributedProviderFactory = null;
- private ReferenceBindingProvider2 distributedProvider = null;
+ private ReferenceBindingProvider distributedProvider = null;
public RuntimeSCAReferenceBindingProvider(ExtensionPointRegistry extensionPoints,
SCADomain domain,
RuntimeComponent component,
RuntimeComponentReference reference,
SCABinding binding) {
- this.extensionPoints = extensionPoints;
this.domain = domain;
this.component = component;
this.reference = reference;
@@ -145,8 +143,7 @@
DistributedSCABinding distributedBinding = new DistributedSCABindingImpl();
distributedBinding.setSCABinging(binding);
- distributedProvider =
- (ReferenceBindingProvider2)distributedProviderFactory
+ distributedProvider = distributedProviderFactory
.createReferenceBindingProvider(component, reference, distributedBinding);
}
}
@@ -162,9 +159,9 @@
}
}
- public boolean supportsAsyncOneWayInvocation() {
+ public boolean supportsOneWayInvocation() {
if (isTargetRemote()) {
- return distributedProvider.supportsAsyncOneWayInvocation();
+ return distributedProvider.supportsOneWayInvocation();
} else {
return false;
}
@@ -201,15 +198,6 @@
+ ").");
}
return invoker;
- }
- }
-
- @Deprecated
- public Invoker createInvoker(Operation operation, boolean isCallback) {
- if (isCallback) {
- throw new UnsupportedOperationException();
- } else {
- return createInvoker(operation);
}
}
Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java Sun Sep 16 22:04:55 2007
@@ -20,17 +20,15 @@
package org.apache.tuscany.sca.binding.sca.impl;
import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.assembly.OptimizableBinding;
import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.domain.SCADomainService;
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.node.SCADomain;
import org.apache.tuscany.sca.provider.BindingProviderFactory;
import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider2;
+import org.apache.tuscany.sca.provider.ServiceBindingProvider;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
import org.apache.tuscany.sca.runtime.RuntimeComponentService;
@@ -42,12 +40,12 @@
*
* @version $Rev$ $Date$
*/
-public class RuntimeSCAServiceBindingProvider implements ServiceBindingProvider2 {
+public class RuntimeSCAServiceBindingProvider implements ServiceBindingProvider {
- private SCADomain domain;
+ private SCADomain domain;
private RuntimeComponentService service;
private BindingProviderFactory<DistributedSCABinding> distributedProviderFactory;
- private ServiceBindingProvider2 distributedProvider;
+ private ServiceBindingProvider distributedProvider;
private DistributedSCABinding distributedBinding;
public RuntimeSCAServiceBindingProvider(ExtensionPointRegistry extensionPoints,
@@ -87,8 +85,8 @@
distributedBinding = new DistributedSCABindingImpl();
distributedBinding.setSCABinging(binding);
- distributedProvider = (ServiceBindingProvider2)
- distributedProviderFactory.createServiceBindingProvider(component, service, distributedBinding);
+ distributedProvider =
+ distributedProviderFactory.createServiceBindingProvider(component, service, distributedBinding);
} else {
@@ -121,16 +119,11 @@
}
}
- public boolean supportsAsyncOneWayInvocation() {
+ public boolean supportsOneWayInvocation() {
return false;
}
-
- public Invoker createCallbackInvoker(Operation operation) {
- throw new UnsupportedOperationException();
- }
-
+
public void start() {
-
if (distributedProvider != null) {
distributedProvider.start();
}
Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java Sun Sep 16 22:04:55 2007
@@ -26,11 +26,11 @@
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider2;
+import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-public class Axis2ReferenceBindingProvider implements ReferenceBindingProvider2 {
+public class Axis2ReferenceBindingProvider implements ReferenceBindingProvider {
private WebServiceBinding wsBinding;
private Axis2ServiceClient axisClient;
@@ -70,17 +70,8 @@
return wsBinding.getBindingInterfaceContract();
}
- public boolean supportsAsyncOneWayInvocation() {
+ public boolean supportsOneWayInvocation() {
return true;
- }
-
- @Deprecated
- public Invoker createInvoker(Operation operation, boolean isCallback) {
- if (isCallback) {
- throw new UnsupportedOperationException();
- } else {
- return createInvoker(operation);
- }
}
public Invoker createInvoker(Operation operation) {
Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java Sun Sep 16 22:04:55 2007
@@ -26,11 +26,11 @@
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider2;
+import org.apache.tuscany.sca.provider.ServiceBindingProvider;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-public class Axis2ServiceBindingProvider implements ServiceBindingProvider2 {
+public class Axis2ServiceBindingProvider implements ServiceBindingProvider {
private WebServiceBinding wsBinding;
private Axis2ServiceProvider axisProvider;
@@ -70,11 +70,7 @@
return wsBinding.getBindingInterfaceContract();
}
- public Invoker createCallbackInvoker(Operation operation) {
- throw new UnsupportedOperationException();
- }
-
- public boolean supportsAsyncOneWayInvocation() {
+ public boolean supportsOneWayInvocation() {
return true;
}
Modified: incubator/tuscany/branches/sca-java-1.0/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java Sun Sep 16 22:04:55 2007
@@ -56,13 +56,13 @@
Invoker createInvoker(RuntimeComponentService service, Operation operation);
/**
- * Create an invoker to call back to the given component
- * @param operation The operation
- * @return An invoker that handles the invocation logic, null should be
- * returned if no invoker is required
+ * For bindings that invoke one-way callback operations asynchronously,
+ * there is no need to perform a thread switch before calling the invoker.
+ * This method indicates whether the binding has this capability.
+ *
+ * @return true if the callback invoker is able to invoke one-way operations
+ * asynchronously, false if all invocations are synchronous
*/
- Invoker createCallbackInvoker(Operation operation);
-
- // InterfaceContract getImplementationInterfaceContract(RuntimeComponentService service);
-
+ boolean supportsOneWayInvocation();
+
}
Modified: incubator/tuscany/branches/sca-java-1.0/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java Sun Sep 16 22:04:55 2007
@@ -49,11 +49,10 @@
* binding protocol.
*
* @param operation The operation that the interceptor will handle
- * @param isCallback A flag to tell if the operation is for the callback
* @return An invoker that handles the invocation logic, null should be
* returned if no invoker is required
*/
- Invoker createInvoker(Operation operation, boolean isCallback);
+ Invoker createInvoker(Operation operation);
/**
* Get the effective interface contract imposed by the binding. For example,
@@ -65,4 +64,13 @@
*/
InterfaceContract getBindingInterfaceContract();
+ /**
+ * For bindings that invoke one-way operations asynchronously, there is no
+ * need to perform a thread switch before calling the invoker. This method
+ * indicates whether the binding has this capability.
+ *
+ * @return true if the binding invoker is able to invoke one-way operations
+ * asynchronously, false if all invocations are synchronous
+ */
+ boolean supportsOneWayInvocation();
}
Modified: incubator/tuscany/branches/sca-java-1.0/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java Sun Sep 16 22:04:55 2007
@@ -49,4 +49,15 @@
* interface contract for the component service will be used
*/
InterfaceContract getBindingInterfaceContract();
+
+ /**
+ * For bindings that invoke one-way callback operations asynchronously,
+ * there is no need to perform a thread switch before calling the invoker.
+ * This method indicates whether the binding has this capability.
+ *
+ * @return true if the callback invoker is able to invoke one-way operations
+ * asynchronously, false if all invocations are synchronous
+ */
+ boolean supportsOneWayInvocation();
+
}
Modified: incubator/tuscany/branches/sca-java-1.0/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java Sun Sep 16 22:04:55 2007
@@ -41,7 +41,6 @@
import org.apache.tuscany.sca.invocation.MessageFactory;
import org.apache.tuscany.sca.provider.ImplementationProvider;
import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider2;
import org.apache.tuscany.sca.runtime.EndpointReference;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
@@ -212,13 +211,7 @@
try {
ReferenceBindingProvider provider = ((RuntimeComponentReference)reference).getBindingProvider(binding);
if (provider != null) {
- Invoker invoker = null;
- if (provider instanceof ReferenceBindingProvider2) {
- invoker = ((ReferenceBindingProvider2)provider).createInvoker(operation);
- } else {
- // must be an old provider that only has the deprecated signature
- invoker = provider.createInvoker(operation, false);
- }
+ Invoker invoker = provider.createInvoker(operation);
if (invoker != null) {
chain.addInvoker(invoker);
}
@@ -238,13 +231,8 @@
private void addNonBlockingInterceptor(ComponentReference reference, Binding binding, InvocationChain chain) {
ReferenceBindingProvider provider = ((RuntimeComponentReference)reference).getBindingProvider(binding);
if (provider != null) {
- boolean supportsAsyncOneWayInvocation = false;
- if (provider instanceof ReferenceBindingProvider2) {
- supportsAsyncOneWayInvocation = ((ReferenceBindingProvider2)provider).supportsAsyncOneWayInvocation();
- } else {
- // must be an old provider that doesn't have this method
- }
- if (!supportsAsyncOneWayInvocation) {
+ boolean supportsOneWayInvocation = provider.supportsOneWayInvocation();
+ if (!supportsOneWayInvocation) {
chain.addInterceptor(new NonBlockingInterceptor(workScheduler));
}
}
Modified: incubator/tuscany/branches/sca-java-1.0/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java Sun Sep 16 22:04:55 2007
@@ -164,11 +164,15 @@
List<InvokerProxy> invokers = new ArrayList<InvokerProxy>();
private InvokerFactory factory;
- public Invoker createInvoker(Operation operation, boolean isCallback) {
+ public Invoker createInvoker(Operation operation) {
InvokerProxy invoker = new InvokerProxy(factory, operation);
invokers.add(invoker);
return invoker;
}
+
+ public boolean supportsOneWayInvocation() {
+ return false;
+ }
public InterfaceContract getBindingInterfaceContract() {
return null;
@@ -211,6 +215,10 @@
public InterfaceContract getBindingInterfaceContract() {
return null;
+ }
+
+ public boolean supportsOneWayInvocation() {
+ return false;
}
public void start() {
Modified: incubator/tuscany/branches/sca-java-1.0/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationImplementationProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationImplementationProvider.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationImplementationProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationImplementationProvider.java Sun Sep 16 22:04:55 2007
@@ -63,9 +63,9 @@
InvokerProxy invoker = new InvokerProxy(op);
return invoker;
}
-
- public Invoker createCallbackInvoker(Operation operation) {
- throw new RuntimeException("TODO: callbacks not yet implemented");
+
+ public boolean supportsOneWayInvocation() {
+ return false;
}
public void start() {
Modified: incubator/tuscany/branches/sca-java-1.0/modules/host-embedded/src/test/java/test/crud/provider/CRUDImplementationProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/host-embedded/src/test/java/test/crud/provider/CRUDImplementationProvider.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/host-embedded/src/test/java/test/crud/provider/CRUDImplementationProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/host-embedded/src/test/java/test/crud/provider/CRUDImplementationProvider.java Sun Sep 16 22:04:55 2007
@@ -57,10 +57,9 @@
CRUDInvoker invoker = new CRUDInvoker(operation, new ResourceManager(implementation.getDirectory()));
return invoker;
}
-
- public Invoker createCallbackInvoker(Operation operation) {
- CRUDInvoker invoker = new CRUDInvoker(operation, new ResourceManager(implementation.getDirectory()));
- return invoker;
+
+ public boolean supportsOneWayInvocation() {
+ return false;
}
public void start() {
Modified: incubator/tuscany/branches/sca-java-1.0/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java Sun Sep 16 22:04:55 2007
@@ -68,10 +68,9 @@
BPELInvoker invoker = new BPELInvoker(operation, odeServer, txMgr);
return invoker;
}
-
- public Invoker createCallbackInvoker(Operation operation) {
- BPELInvoker invoker = new BPELInvoker(operation, odeServer, txMgr);
- return invoker;
+
+ public boolean supportsOneWayInvocation() {
+ return false;
}
public void start() {
Modified: incubator/tuscany/branches/sca-java-1.0/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java Sun Sep 16 22:04:55 2007
@@ -41,7 +41,6 @@
import org.apache.tuscany.sca.core.invocation.CallableReferenceObjectFactory;
import org.apache.tuscany.sca.core.invocation.CallbackWireObjectFactory;
import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-import org.apache.tuscany.sca.core.invocation.TargetInvokerCreationException;
import org.apache.tuscany.sca.core.invocation.WireObjectFactory;
import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl;
@@ -254,21 +253,11 @@
void stop() {
}
- Invoker createInvoker(Operation operation) throws TargetInvokerCreationException {
+ Invoker createInvoker(Operation operation) throws NoSuchMethodException {
Class<?> implClass = instanceFactoryProvider.getImplementationClass();
- try {
- Method method = JavaInterfaceUtil.findMethod(implClass, operation);
- return new JavaImplementationInvoker(operation, method, component);
-
- } catch (NoSuchMethodException e) {
- throw new TargetMethodNotFoundException("No matching method is found for operation " + operation.getName()
- + " in the implementation ("
- + implClass
- + ") of component "
- + component.getURI(), e, operation);
- }
-
+ Method method = JavaInterfaceUtil.findMethod(implClass, operation);
+ return new JavaImplementationInvoker(operation, method, component);
}
private <B> WireObjectFactory<B> createWireFactory(Class<B> interfaze, RuntimeWire wire) {
Modified: incubator/tuscany/branches/sca-java-1.0/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java Sun Sep 16 22:04:55 2007
@@ -25,7 +25,6 @@
import org.apache.tuscany.sca.core.context.InstanceWrapper;
import org.apache.tuscany.sca.core.factory.ObjectFactory;
import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-import org.apache.tuscany.sca.core.invocation.TargetInvokerCreationException;
import org.apache.tuscany.sca.core.scope.Scope;
import org.apache.tuscany.sca.core.scope.ScopedImplementationProvider;
import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
@@ -134,17 +133,13 @@
public Invoker createInvoker(RuntimeComponentService service, Operation operation) {
try {
return componentContextProvider.createInvoker(operation);
- } catch (TargetInvokerCreationException e) {
+ } catch (NoSuchMethodException e) {
throw new IllegalArgumentException(e);
}
}
-
- public Invoker createCallbackInvoker(Operation operation) {
- try {
- return componentContextProvider.createInvoker(operation);
- } catch (TargetInvokerCreationException e) {
- throw new IllegalArgumentException(e);
- }
+
+ public boolean supportsOneWayInvocation() {
+ return false;
}
public Scope getScope() {
Modified: incubator/tuscany/branches/sca-java-1.0/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java Sun Sep 16 22:04:55 2007
@@ -43,9 +43,9 @@
NodeImplementationInvoker invoker = new NodeImplementationInvoker(implementation.getComposite());
return invoker;
}
-
- public Invoker createCallbackInvoker(Operation operation) {
- return null;
+
+ public boolean supportsOneWayInvocation() {
+ return false;
}
public void start() {
Modified: incubator/tuscany/branches/sca-java-1.0/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java Sun Sep 16 22:04:55 2007
@@ -45,9 +45,9 @@
NotificationComponentInvoker invoker = new NotificationComponentInvoker(operation, component);
return invoker;
}
-
- public Invoker createCallbackInvoker(Operation operation) {
- throw new UnsupportedOperationException();
+
+ public boolean supportsOneWayInvocation() {
+ return false;
}
public void start() {
Modified: incubator/tuscany/branches/sca-java-1.0/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProvider.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProvider.java Sun Sep 16 22:04:55 2007
@@ -1033,13 +1033,12 @@
}
- public Invoker createCallbackInvoker(Operation operation) {
-
- return createTargetInvoker(null, operation);
- }
-
public Invoker createInvoker(RuntimeComponentService service, Operation operation) {
return createTargetInvoker(service, operation);
+ }
+
+ public boolean supportsOneWayInvocation() {
+ return false;
}
private boolean setReferencesAndProperties() {
Modified: incubator/tuscany/branches/sca-java-1.0/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java Sun Sep 16 22:04:55 2007
@@ -43,9 +43,9 @@
ResourceImplementationInvoker invoker = new ResourceImplementationInvoker(implementation.getLocationURL());
return invoker;
}
-
- public Invoker createCallbackInvoker(Operation operation) {
- return null;
+
+ public boolean supportsOneWayInvocation() {
+ return false;
}
public void start() {
Modified: incubator/tuscany/branches/sca-java-1.0/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java Sun Sep 16 22:04:55 2007
@@ -59,9 +59,9 @@
public Invoker createInvoker(RuntimeComponentService service, Operation operation) {
return new SpringInvoker(component, springContext, service, operation);
}
-
- public Invoker createCallbackInvoker(Operation operation) {
- return new SpringInvoker(component, springContext, null, operation);
+
+ public boolean supportsOneWayInvocation() {
+ return false;
}
/**
Modified: incubator/tuscany/branches/sca-java-1.0/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java Sun Sep 16 22:04:55 2007
@@ -91,12 +91,12 @@
}
}
- public Invoker createCallbackInvoker(Operation operation) {
- return new XQueryInvoker(null, operation, implementation, referenceProxies, properties);
- }
-
public Invoker createInvoker(RuntimeComponentService service, Operation operation) {
return new XQueryInvoker(service, operation, implementation, referenceProxies, properties);
+ }
+
+ public boolean supportsOneWayInvocation() {
+ return false;
}
public void start() {
Modified: incubator/tuscany/branches/sca-java-1.0/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java Sun Sep 16 22:04:55 2007
@@ -44,18 +44,18 @@
this.binding = binding;
}
- public Invoker createInvoker(Operation operation, boolean isCallback) {
- if (isCallback) {
- throw new UnsupportedOperationException();
- } else {
- if (binding instanceof PolicySetAttachPoint) {
- PolicySetAttachPoint policySetAttachPoint = (PolicySetAttachPoint)binding;
- if ( !policySetAttachPoint.getPolicySets().isEmpty() ){
- return new EchoBindingPoliciedInvoker(policySetAttachPoint.getPolicySets());
- }
+ public Invoker createInvoker(Operation operation) {
+ if (binding instanceof PolicySetAttachPoint) {
+ PolicySetAttachPoint policySetAttachPoint = (PolicySetAttachPoint)binding;
+ if ( !policySetAttachPoint.getPolicySets().isEmpty() ){
+ return new EchoBindingPoliciedInvoker(policySetAttachPoint.getPolicySets());
}
- return new EchoBindingInvoker();
}
+ return new EchoBindingInvoker();
+ }
+
+ public boolean supportsOneWayInvocation() {
+ return false;
}
public InterfaceContract getBindingInterfaceContract() {
Modified: incubator/tuscany/branches/sca-java-1.0/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java Sun Sep 16 22:04:55 2007
@@ -52,6 +52,10 @@
public InterfaceContract getBindingInterfaceContract() {
return service.getInterfaceContract();
}
+
+ public boolean supportsOneWayInvocation() {
+ return false;
+ }
public void start() {
Modified: incubator/tuscany/branches/sca-java-1.0/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java Sun Sep 16 22:04:55 2007
@@ -54,10 +54,9 @@
CRUDImplementationInvoker invoker = new CRUDImplementationInvoker(operation, new ResourceManager(implementation.getDirectory()));
return invoker;
}
-
- public Invoker createCallbackInvoker(Operation operation) {
- CRUDImplementationInvoker invoker = new CRUDImplementationInvoker(operation, new ResourceManager(implementation.getDirectory()));
- return invoker;
+
+ public boolean supportsOneWayInvocation() {
+ return false;
}
public void start() {
Modified: incubator/tuscany/branches/sca-java-1.0/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java?rev=576257&r1=576256&r2=576257&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java Sun Sep 16 22:04:55 2007
@@ -88,11 +88,9 @@
POJOImplementationInvoker invoker = new POJOImplementationInvoker(pojoInstance, operation, method);
return invoker;
}
-
- public Invoker createCallbackInvoker(Operation operation) {
- Method method = implementation.getMethods().get(operation.getName());
- POJOImplementationInvoker invoker = new POJOImplementationInvoker(pojoInstance, operation, method);
- return invoker;
+
+ public boolean supportsOneWayInvocation() {
+ return false;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org