Author: rfeng
Date: Fri Sep 14 10:09:31 2007
New Revision: 575759
URL: http://svn.apache.org/viewvc?rev=575759&view=rev
Log:
Rename WireableBinding to OptimizableBinding
Added:
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
- copied, changed from r575440,
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireableBinding.java
Removed:
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireableBinding.java
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/builder/impl/BindingUtil.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.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/CallableReferenceImpl.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=575759&r1=575758&r2=575759&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
Fri Sep 14 10:09:31 2007
@@ -27,7 +27,7 @@
import org.apache.tuscany.sca.assembly.Component;
import org.apache.tuscany.sca.assembly.ComponentService;
import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.assembly.WireableBinding;
+import org.apache.tuscany.sca.assembly.OptimizableBinding;
import org.apache.tuscany.sca.policy.Intent;
import org.apache.tuscany.sca.policy.IntentAttachPointType;
import org.apache.tuscany.sca.policy.PolicySet;
@@ -38,7 +38,7 @@
*
* @version $Rev$ $Date$
*/
-public class TestSCABindingImpl implements SCABinding, WireableBinding,
PolicySetAttachPoint {
+public class TestSCABindingImpl implements SCABinding, OptimizableBinding,
PolicySetAttachPoint {
private String name;
private String uri;
private List<Object> extensions = new ArrayList<Object>();
Copied:
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
(from r575440,
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/OptimizableBinding.java?p2=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java&p1=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireableBinding.java&r1=575440&r2=575759&rev=575759&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/OptimizableBinding.java
Fri Sep 14 10:09:31 2007
@@ -19,22 +19,13 @@
package org.apache.tuscany.sca.assembly;
/**
- * Represent a binding that supports SCA wiring between component references
and services
+ * Represent a reference binding that supports optimized SCA local wiring
between component
+ * references and services
*
* @version $Rev$ $Date$
*
- * @deprecated To be factored in the base Binding as reported in TUSCANY-1534:
- *
- * - all bindings should be "wireable", i.e. can be configured using an SCA
wire
- *
- * - only some bindings will care about pointers to the in-memory model objects
- * representing the target component, service and binding
- *
- * - all this stuff is only relevant for references so it's confusing to have
it on
- * bindings which apply to services as well.
*/
[EMAIL PROTECTED]
-public interface WireableBinding extends Binding, Cloneable {
+public interface OptimizableBinding extends Binding, Cloneable {
/**
* @param component
Modified:
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java?rev=575759&r1=575758&r2=575759&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java
(original)
+++
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java
Fri Sep 14 10:09:31 2007
@@ -26,7 +26,7 @@
import org.apache.tuscany.sca.assembly.ComponentReference;
import org.apache.tuscany.sca.assembly.ComponentService;
import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.assembly.WireableBinding;
+import org.apache.tuscany.sca.assembly.OptimizableBinding;
import org.apache.tuscany.sca.policy.PolicySet;
import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
@@ -58,11 +58,11 @@
hasCompatiblePolicySets(binding, serviceBinding)) {
Binding cloned = binding;
- if (binding instanceof WireableBinding) {
+ if (binding instanceof OptimizableBinding) {
// TODO: We need to clone the reference binding
try {
- cloned =
(Binding)((WireableBinding)binding).clone();
- WireableBinding endpoint =
((WireableBinding)cloned);
+ cloned =
(Binding)((OptimizableBinding)binding).clone();
+ OptimizableBinding endpoint =
((OptimizableBinding)cloned);
endpoint.setTargetComponent(component);
endpoint.setTargetComponentService(service);
endpoint.setTargetBinding(serviceBinding);
Modified:
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java?rev=575759&r1=575758&r2=575759&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
Fri Sep 14 10:09:31 2007
@@ -44,7 +44,7 @@
import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.assembly.Service;
import org.apache.tuscany.sca.assembly.Wire;
-import org.apache.tuscany.sca.assembly.WireableBinding;
+import org.apache.tuscany.sca.assembly.OptimizableBinding;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderMonitor;
import org.apache.tuscany.sca.assembly.builder.Problem.Severity;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
@@ -765,7 +765,7 @@
bindings.addAll(reference.getBindings());
promotedReference.getBindings().clear();
for (Binding binding : bindings) {
- if ((!(binding instanceof WireableBinding)) || binding.getURI() !=
null) {
+ if ((!(binding instanceof OptimizableBinding)) || binding.getURI()
!= null) {
promotedReference.getBindings().add(binding);
}
}
@@ -784,7 +784,7 @@
}
promotedReference.setCallback(assemblyFactory.createCallback());
for (Binding binding : callbackBindings) {
- if ((!(binding instanceof WireableBinding)) || binding.getURI() !=
null) {
+ if ((!(binding instanceof OptimizableBinding)) || binding.getURI()
!= null) {
promotedReference.getCallback().getBindings().add(binding);
}
}
Modified:
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java?rev=575759&r1=575758&r2=575759&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java
(original)
+++
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java
Fri Sep 14 10:09:31 2007
@@ -22,7 +22,7 @@
import org.apache.tuscany.sca.assembly.Binding;
import org.apache.tuscany.sca.assembly.Multiplicity;
-import org.apache.tuscany.sca.assembly.WireableBinding;
+import org.apache.tuscany.sca.assembly.OptimizableBinding;
/**
* This class encapsulates utility methods to deal with reference definitions
@@ -68,7 +68,7 @@
if (count != 1) {
if (count == 0) {
for (Binding binding: bindings) {
- if (!(binding instanceof WireableBinding) ||
binding.getURI()!=null) {
+ if (!(binding instanceof OptimizableBinding) ||
binding.getURI()!=null) {
return true;
}
}
@@ -80,7 +80,7 @@
if (count < 1) {
if (count == 0) {
for (Binding binding: bindings) {
- if (!(binding instanceof WireableBinding) ||
binding.getURI()!=null) {
+ if (!(binding instanceof OptimizableBinding) ||
binding.getURI()!=null) {
return true;
}
}
Modified:
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java?rev=575759&r1=575758&r2=575759&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
Fri Sep 14 10:09:31 2007
@@ -20,7 +20,7 @@
package org.apache.tuscany.sca.binding.sca.impl;
import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.assembly.WireableBinding;
+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.Domain;
@@ -89,8 +89,8 @@
boolean targetIsRemote = false;
// first look at the target service and see if this has been resolved
- if (((WireableBinding)binding).getTargetComponentService() != null) {
- if
(((WireableBinding)binding).getTargetComponentService().isUnresolved() == true)
{
+ if (((OptimizableBinding)binding).getTargetComponentService() != null)
{
+ if
(((OptimizableBinding)binding).getTargetComponentService().isUnresolved() ==
true) {
targetIsRemote = true;
} else {
targetIsRemote = false;
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=575759&r1=575758&r2=575759&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
Fri Sep 14 10:09:31 2007
@@ -20,7 +20,7 @@
package org.apache.tuscany.sca.binding.sca.impl;
import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.assembly.WireableBinding;
+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.Domain;
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=575759&r1=575758&r2=575759&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
Fri Sep 14 10:09:31 2007
@@ -26,7 +26,7 @@
import org.apache.tuscany.sca.assembly.ComponentService;
import org.apache.tuscany.sca.assembly.Extensible;
import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.assembly.WireableBinding;
+import org.apache.tuscany.sca.assembly.OptimizableBinding;
import org.apache.tuscany.sca.policy.Intent;
import org.apache.tuscany.sca.policy.IntentAttachPointType;
import org.apache.tuscany.sca.policy.PolicySet;
@@ -37,7 +37,7 @@
*
* @version $Rev$ $Date$
*/
-public class SCABindingImpl implements SCABinding, Extensible,
PolicySetAttachPoint, WireableBinding {
+public class SCABindingImpl implements SCABinding, Extensible,
PolicySetAttachPoint, OptimizableBinding {
private String name;
private String uri;
private List<Object> extensions = new ArrayList<Object>();
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=575759&r1=575758&r2=575759&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
Fri Sep 14 10:09:31 2007
@@ -33,7 +33,7 @@
import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.assembly.SCABindingFactory;
import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.assembly.WireableBinding;
+import org.apache.tuscany.sca.assembly.OptimizableBinding;
import org.apache.tuscany.sca.context.RequestContextFactory;
import
org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.core.context.ComponentContextHelper;
@@ -204,19 +204,19 @@
// TODO - we should look at all the bindings now
associated with the
// unresolved target but we assume the SCA binding
here as
// its currently the only wireable one
- if (binding instanceof WireableBinding) {
- WireableBinding scaBinding = (WireableBinding)binding;
+ if (binding instanceof OptimizableBinding) {
+ OptimizableBinding scaBinding =
(OptimizableBinding)binding;
// clone the SCA binding and fill in service details
// its cloned as each target
SCABinding clonedSCABinding = null;
try {
- clonedSCABinding =
(SCABinding)((WireableBinding)scaBinding).clone();
+ clonedSCABinding =
(SCABinding)((OptimizableBinding)scaBinding).clone();
clonedSCABinding.setURI(service.getName());
// wireable binding stuff needs to go. SCA binding
uses it
// currently to get to the service to work out if
the service
// is resolved.
- WireableBinding endpoint =
((WireableBinding)clonedSCABinding);
+ OptimizableBinding endpoint =
((OptimizableBinding)clonedSCABinding);
endpoint.setTargetComponentService(service);
//endpoint.setTargetComponent(component); - not
known for unresolved target
//endpoint.setTargetBinding(serviceBinding); - not
known for unresolved target
@@ -256,8 +256,8 @@
Component targetComponent = null;
ComponentService targetComponentService = null;
Binding targetBinding = null;
- if (binding instanceof WireableBinding) {
- WireableBinding endpoint = (WireableBinding)binding;
+ if (binding instanceof OptimizableBinding) {
+ OptimizableBinding endpoint = (OptimizableBinding)binding;
targetComponent = endpoint.getTargetComponent();
targetComponentService = endpoint.getTargetComponentService();
targetBinding = endpoint.getTargetBinding();
Modified:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java?rev=575759&r1=575758&r2=575759&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
Fri Sep 14 10:09:31 2007
@@ -29,7 +29,7 @@
import org.apache.tuscany.sca.assembly.ComponentService;
import org.apache.tuscany.sca.assembly.Reference;
import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.assembly.WireableBinding;
+import org.apache.tuscany.sca.assembly.OptimizableBinding;
import org.apache.tuscany.sca.core.assembly.CompositeActivator;
import org.apache.tuscany.sca.core.assembly.CompositeActivatorImpl;
import org.apache.tuscany.sca.core.assembly.EndpointReferenceImpl;
@@ -219,7 +219,7 @@
}
for (Binding binding : reference.getBindings()) {
- if (binding instanceof WireableBinding) {
+ if (binding instanceof OptimizableBinding) {
String targetURI = binding.getURI();
int index = targetURI.lastIndexOf('/');
String serviceName = "";
@@ -241,13 +241,13 @@
}
}
}
- WireableBinding wireableBinding =
(WireableBinding)binding;
- wireableBinding.setTargetComponent(targetComponet);
-
wireableBinding.setTargetComponentService(targetService);
+ OptimizableBinding optimizableBinding =
(OptimizableBinding)binding;
+ optimizableBinding.setTargetComponent(targetComponet);
+
optimizableBinding.setTargetComponentService(targetService);
if (targetService != null) {
for (Binding serviceBinding :
targetService.getBindings()) {
if (serviceBinding.getClass() ==
binding.getClass()) {
-
wireableBinding.setTargetBinding(serviceBinding);
+
optimizableBinding.setTargetBinding(serviceBinding);
break;
}
}
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=575759&r1=575758&r2=575759&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
Fri Sep 14 10:09:31 2007
@@ -42,7 +42,7 @@
import org.apache.tuscany.sca.assembly.Multiplicity;
import org.apache.tuscany.sca.assembly.Reference;
import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.assembly.WireableBinding;
+import org.apache.tuscany.sca.assembly.OptimizableBinding;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import
org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.core.assembly.CompositeActivator;
@@ -96,12 +96,12 @@
ComponentReference componentReference =
assemblyFactory.createComponentReference();
componentReference.setName("$self$." + service.getName());
for (Binding binding : service.getBindings()) {
- if (binding instanceof WireableBinding) {
- WireableBinding wireableBinding =
(WireableBinding)((WireableBinding)binding).clone();
- wireableBinding.setTargetBinding(binding);
- wireableBinding.setTargetComponent(component);
- wireableBinding.setTargetComponentService(service);
- componentReference.getBindings().add(wireableBinding);
+ if (binding instanceof OptimizableBinding) {
+ OptimizableBinding optimizableBinding =
(OptimizableBinding)((OptimizableBinding)binding).clone();
+ optimizableBinding.setTargetBinding(binding);
+ optimizableBinding.setTargetComponent(component);
+ optimizableBinding.setTargetComponentService(service);
+ componentReference.getBindings().add(optimizableBinding);
} else {
componentReference.getBindings().add(binding);
}
@@ -175,12 +175,12 @@
ref.getTargets().add(service);
ref.getBindings().clear();
for (Binding binding : service.getBindings()) {
- if (binding instanceof WireableBinding) {
- WireableBinding wireableBinding =
(WireableBinding)((WireableBinding)binding).clone();
- wireableBinding.setTargetBinding(binding);
- wireableBinding.setTargetComponent(component);
- wireableBinding.setTargetComponentService(service);
- ref.getBindings().add(wireableBinding);
+ if (binding instanceof OptimizableBinding) {
+ OptimizableBinding optimizableBinding =
(OptimizableBinding)((OptimizableBinding)binding).clone();
+ optimizableBinding.setTargetBinding(binding);
+ optimizableBinding.setTargetComponent(component);
+ optimizableBinding.setTargetComponentService(service);
+ ref.getBindings().add(optimizableBinding);
} 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=575759&r1=575758&r2=575759&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
Fri Sep 14 10:09:31 2007
@@ -31,7 +31,7 @@
import org.apache.tuscany.sca.assembly.Multiplicity;
import org.apache.tuscany.sca.assembly.Reference;
import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.assembly.WireableBinding;
+import org.apache.tuscany.sca.assembly.OptimizableBinding;
import org.apache.tuscany.sca.context.RequestContextFactory;
import org.apache.tuscany.sca.core.assembly.CompositeActivator;
import org.apache.tuscany.sca.core.invocation.ProxyFactory;
@@ -222,12 +222,12 @@
ref.getTargets().add(service);
ref.getBindings().clear();
for (Binding binding : service.getBindings()) {
- if (binding instanceof WireableBinding) {
- WireableBinding wireableBinding =
(WireableBinding)((WireableBinding)binding).clone();
- wireableBinding.setTargetBinding(binding);
- wireableBinding.setTargetComponent(component);
- wireableBinding.setTargetComponentService(service);
- ref.getBindings().add(wireableBinding);
+ if (binding instanceof OptimizableBinding) {
+ OptimizableBinding optimizableBinding =
(OptimizableBinding)((OptimizableBinding)binding).clone();
+ optimizableBinding.setTargetBinding(binding);
+ optimizableBinding.setTargetComponent(component);
+ optimizableBinding.setTargetComponentService(service);
+ ref.getBindings().add(optimizableBinding);
} else {
ref.getBindings().add(binding);
}
@@ -270,12 +270,12 @@
ComponentReference componentReference =
assemblyFactory.createComponentReference();
componentReference.setName("$self$." + service.getName());
for (Binding binding : service.getBindings()) {
- if (binding instanceof WireableBinding) {
- WireableBinding wireableBinding =
(WireableBinding)((WireableBinding)binding).clone();
- wireableBinding.setTargetBinding(binding);
- wireableBinding.setTargetComponent(component);
- wireableBinding.setTargetComponentService(service);
- componentReference.getBindings().add(wireableBinding);
+ if (binding instanceof OptimizableBinding) {
+ OptimizableBinding optimizableBinding =
(OptimizableBinding)((OptimizableBinding)binding).clone();
+ optimizableBinding.setTargetBinding(binding);
+ optimizableBinding.setTargetComponent(component);
+ optimizableBinding.setTargetComponentService(service);
+ componentReference.getBindings().add(optimizableBinding);
} 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=575759&r1=575758&r2=575759&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
Fri Sep 14 10:09:31 2007
@@ -21,7 +21,7 @@
import java.util.List;
import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.WireableBinding;
+import org.apache.tuscany.sca.assembly.OptimizableBinding;
import org.apache.tuscany.sca.core.context.CallableReferenceImpl;
import org.apache.tuscany.sca.core.factory.ObjectCreationException;
import org.apache.tuscany.sca.invocation.Message;
@@ -167,12 +167,12 @@
ref.getTargets().add(service);
ref.getBindings().clear();
for (Binding binding : service.getBindings()) {
- if (binding instanceof WireableBinding) {
- WireableBinding wireableBinding =
(WireableBinding)((WireableBinding)binding).clone();
- wireableBinding.setTargetBinding(binding);
- wireableBinding.setTargetComponent(component);
- wireableBinding.setTargetComponentService(service);
- ref.getBindings().add(wireableBinding);
+ if (binding instanceof OptimizableBinding) {
+ OptimizableBinding optimizableBinding =
(OptimizableBinding)((OptimizableBinding)binding).clone();
+ optimizableBinding.setTargetBinding(binding);
+ optimizableBinding.setTargetComponent(component);
+ optimizableBinding.setTargetComponentService(service);
+ ref.getBindings().add(optimizableBinding);
} 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=575759&r1=575758&r2=575759&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
Fri Sep 14 10:09:31 2007
@@ -39,6 +39,7 @@
import org.apache.tuscany.sca.assembly.CompositeService;
import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.assembly.SCABindingFactory;
+import org.apache.tuscany.sca.assembly.OptimizableBinding;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
import org.apache.tuscany.sca.assembly.xml.Constants;
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=575759&r1=575758&r2=575759&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
Fri Sep 14 10:09:31 2007
@@ -28,7 +28,7 @@
import org.apache.tuscany.sca.assembly.CompositeService;
import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.assembly.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.WireableBinding;
+import org.apache.tuscany.sca.assembly.OptimizableBinding;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
import org.apache.tuscany.sca.assembly.xml.Constants;
import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
