Author: slaws
Date: Fri May 8 21:09:07 2009
New Revision: 773103
URL: http://svn.apache.org/viewvc?rev=773103&view=rev
Log:
Add missing endpoint clone and add helloworld-bpel back into the build. The
missing clone meant that the reference side wire was pointing directly to the
service side endpoint. When the reference side wire endpoint was configured
with the reference binding interface contract the service side wire was also
being reconfigured erroneously
Modified:
tuscany/java/sca/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointReferenceBuilderImpl.java
tuscany/java/sca/samples/pom.xml
Modified:
tuscany/java/sca/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointReferenceBuilderImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointReferenceBuilderImpl.java?rev=773103&r1=773102&r2=773103&view=diff
==============================================================================
---
tuscany/java/sca/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointReferenceBuilderImpl.java
(original)
+++
tuscany/java/sca/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointReferenceBuilderImpl.java
Fri May 8 21:09:07 2009
@@ -303,24 +303,27 @@
// populate the endpoint reference
try {
- Binding cloned = (Binding) referenceBinding.clone();
+ Binding clonedBinding = (Binding) referenceBinding.clone();
// Set the binding URI to the URI of the target service
// that has been matched
if (referenceBinding.getURI() == null) {
- cloned.setURI(serviceEndpoint.getBinding().getURI());
+
clonedBinding.setURI(serviceEndpoint.getBinding().getURI());
}
// TODO - EPR can we remove this?
- if (cloned instanceof OptimizableBinding) {
- OptimizableBinding optimizableBinding =
(OptimizableBinding)cloned;
+ if (clonedBinding instanceof OptimizableBinding) {
+ OptimizableBinding optimizableBinding =
(OptimizableBinding)clonedBinding;
optimizableBinding.setTargetComponent(serviceEndpoint.getComponent());
optimizableBinding.setTargetComponentService(serviceEndpoint.getService());
optimizableBinding.setTargetBinding(serviceEndpoint.getBinding());
}
- endpointReference.setBinding(cloned);
- endpointReference.setTargetEndpoint(serviceEndpoint);
+ endpointReference.setBinding(clonedBinding);
+
+ Endpoint2 clonedEndpoint = (Endpoint2)serviceEndpoint.clone();
+
+ endpointReference.setTargetEndpoint(clonedEndpoint);
} catch (Exception ex) {
// do nothing
Modified: tuscany/java/sca/samples/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/samples/pom.xml?rev=773103&r1=773102&r2=773103&view=diff
==============================================================================
--- tuscany/java/sca/samples/pom.xml (original)
+++ tuscany/java/sca/samples/pom.xml Fri May 8 21:09:07 2009
@@ -43,7 +43,7 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
- <!-- module>helloworld-bpel</module -->
+ <module>helloworld-bpel</module>
<module>calculator</module>
<module>calculator-equinox</module>
<module>calculator-osgi</module>
