You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2009/08/08 17:57:57 UTC
svn commit: r802403 -
/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java
Author: slaws
Date: Sat Aug 8 15:57:57 2009
New Revision: 802403
URL: http://svn.apache.org/viewvc?rev=802403&view=rev
Log:
Make endpoints point to the component/service for which they are created so that the URIs are correct. A previous change to the runtime wire now looks down the promotion hierarchy in order to find the leaf component and service
Modified:
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java
Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java?rev=802403&r1=802402&r2=802403&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java Sat Aug 8 15:57:57 2009
@@ -89,6 +89,9 @@
// create an endpoint for each component service binding
for (ComponentService service : component.getServices()) {
+ /* change to finding the promoted component and service
+ * when the wire is created as storing them here leads to
+ * the wrong URI being calculated
Component endpointComponent = component;
ComponentService endpointService = service;
@@ -100,11 +103,12 @@
endpointService = ServiceConfigurationUtil.getPromotedComponentService(compositeService);
endpointComponent = ServiceConfigurationUtil.getPromotedComponent(compositeService);
} // end if
+ */
for (Binding binding : service.getBindings()) {
Endpoint endpoint = assemblyFactory.createEndpoint();
- endpoint.setComponent(endpointComponent);
- endpoint.setService(endpointService);
+ endpoint.setComponent(component);
+ endpoint.setService(service);
endpoint.setBinding(binding);
endpoint.setUnresolved(false);
service.getEndpoints().add(endpoint);