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/03 23:12:20 UTC
svn commit: r572427 - in /incubator/tuscany/java/sca/modules:
assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/
assembly/src/main/java/org/apache/tuscany/sca/assembly/
binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/ cor...
Author: jsdelfino
Date: Mon Sep 3 14:12:19 2007
New Revision: 572427
URL: http://svn.apache.org/viewvc?rev=572427&view=rev
Log:
Started to cleanup WireableBinding. Removed remote property as it's duplicating interface.remotable and is only applicable to service-side bindings.
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireableBinding.java
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java?rev=572427&r1=572426&r2=572427&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java Mon Sep 3 14:12:19 2007
@@ -46,7 +46,6 @@
private Component targetComponent;
private ComponentService targetComponentService;
private Binding targetBinding;
- private boolean isRemote = false;
List<Intent> requiredIntents = new ArrayList<Intent>();
List<PolicySet> policySets = new ArrayList<PolicySet>();
@@ -133,23 +132,6 @@
*/
public void setTargetBinding(Binding targetBinding) {
this.targetBinding = targetBinding;
- }
-
- /**
- * If a reference targets in a component running in a separate
- * node then its binding will be set remote until runtime
- *
- * @param isRemote
- */
- public void setRemote(boolean isRemote){
- this.isRemote = isRemote;
- }
-
- /**
- * @return the flag indicating whether the binding targets a remote component
- */
- public boolean isRemote(){
- return isRemote;
}
public List<PolicySet> getPolicySets() {
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireableBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireableBinding.java?rev=572427&r1=572426&r2=572427&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireableBinding.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireableBinding.java Mon Sep 3 14:12:19 2007
@@ -41,19 +41,6 @@
void setTargetBinding(Binding binding);
/**
- * If a reference targets in a component running in a separate
- * node then its binding will be set remote until runtime
- *
- * @param isRemote
- */
- void setRemote(boolean isRemote);
-
- /**
- * @return the flag indicating whether the binding targets a remote component
- */
- boolean isRemote();
-
- /**
* @return
*/
Binding getTargetBinding();
Modified: incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java?rev=572427&r1=572426&r2=572427&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java Mon Sep 3 14:12:19 2007
@@ -55,7 +55,8 @@
SCABinding binding) {
this.service = service;
// if there is potentially a wire to this service that crosses the node boundary
- if (((WireableBinding)binding).isRemote()) {
+ if (service.getInterfaceContract().getInterface().isRemotable()) {
+
// look to see if a distributed SCA binding implementation has
// been included on the classpath. This will be needed by the
// provider itself to do it's thing
Modified: incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java?rev=572427&r1=572426&r2=572427&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java Mon Sep 3 14:12:19 2007
@@ -49,7 +49,6 @@
private Component targetComponent;
private ComponentService targetComponentService;
private Binding targetBinding;
- private boolean isRemote = false;
private DistributedSCADomain distributedDomain;
@@ -194,24 +193,6 @@
*/
public void setTargetBinding(Binding targetBinding) {
this.targetBinding = targetBinding;
- }
-
- /**
- * If a reference targets a component running in a separate
- * node then its binding will be set remote to kick
- * off runtime resolution
- *
- * @param isRemote
- */
- public void setRemote(boolean isRemote){
- this.isRemote = isRemote;
- }
-
- /**
- * @return the flag indicating whether the binding targets a remote component
- */
- public boolean isRemote(){
- return isRemote;
}
// Operations needed by the distributed SCA binding
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java?rev=572427&r1=572426&r2=572427&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java Mon Sep 3 14:12:19 2007
@@ -356,11 +356,6 @@
* @param binding
*/
private void addServiceBindingProvider(RuntimeComponent component, RuntimeComponentService service, Binding binding) {
- // REVIEW: Is this the right way to mark the binding as remote?
- if ((binding instanceof WireableBinding) && (service.getInterfaceContract().getInterface().isRemotable())) {
- WireableBinding wireableBinding = (WireableBinding)binding;
- wireableBinding.setRemote(true);
- }
BindingProviderFactory providerFactory =
(BindingProviderFactory)providerFactories.getProviderFactory(binding.getClass());
if (providerFactory != null) {
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java?rev=572427&r1=572426&r2=572427&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java Mon Sep 3 14:12:19 2007
@@ -99,7 +99,6 @@
wireableBinding.setTargetBinding(binding);
wireableBinding.setTargetComponent(component);
wireableBinding.setTargetComponentService(service);
- wireableBinding.setRemote(false);
componentReference.getBindings().add(wireableBinding);
} else {
componentReference.getBindings().add(binding);
@@ -179,7 +178,6 @@
wireableBinding.setTargetBinding(binding);
wireableBinding.setTargetComponent(component);
wireableBinding.setTargetComponentService(service);
- wireableBinding.setRemote(false);
ref.getBindings().add(wireableBinding);
} else {
ref.getBindings().add(binding);
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java?rev=572427&r1=572426&r2=572427&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java Mon Sep 3 14:12:19 2007
@@ -227,7 +227,6 @@
wireableBinding.setTargetBinding(binding);
wireableBinding.setTargetComponent(component);
wireableBinding.setTargetComponentService(service);
- wireableBinding.setRemote(false);
ref.getBindings().add(wireableBinding);
} else {
ref.getBindings().add(binding);
@@ -276,7 +275,6 @@
wireableBinding.setTargetBinding(binding);
wireableBinding.setTargetComponent(component);
wireableBinding.setTargetComponentService(service);
- wireableBinding.setRemote(false);
componentReference.getBindings().add(wireableBinding);
} else {
componentReference.getBindings().add(binding);
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java?rev=572427&r1=572426&r2=572427&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java Mon Sep 3 14:12:19 2007
@@ -148,7 +148,6 @@
wireableBinding.setTargetBinding(binding);
wireableBinding.setTargetComponent(component);
wireableBinding.setTargetComponentService(service);
- wireableBinding.setRemote(false);
ref.getBindings().add(wireableBinding);
} else {
ref.getBindings().add(binding);
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java?rev=572427&r1=572426&r2=572427&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java Mon Sep 3 14:12:19 2007
@@ -361,7 +361,6 @@
SCABindingFactory scaBindingFactory = factories.getFactory(SCABindingFactory.class);
SCABinding binding = scaBindingFactory.createSCABinding();
binding.setURI(targetURI);
- ((WireableBinding)binding).setRemote(true);
reference.getBindings().add(binding);
return new ServiceReferenceImpl<B>(businessInterface, component, reference, binding, runtime
.getProxyFactory(), runtime.getCompositeActivator());
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java?rev=572427&r1=572426&r2=572427&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java Mon Sep 3 14:12:19 2007
@@ -160,7 +160,6 @@
SCABindingFactory scaBindingFactory = factories.getFactory(SCABindingFactory.class);
SCABinding binding = scaBindingFactory.createSCABinding();
binding.setURI(targetURI);
- ((WireableBinding)binding).setRemote(true);
reference.getBindings().add(binding);
return new ServiceReferenceImpl<B>(businessInterface, component, reference, binding, runtime
.getProxyFactory(), runtime.getCompositeActivator());
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org