You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2009/12/09 04:56:22 UTC
svn commit: r888695 - in
/tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl:
ComponentPolicyBuilderImpl.java EndpointReferenceBuilderImpl.java
Author: rfeng
Date: Wed Dec 9 03:56:21 2009
New Revision: 888695
URL: http://svn.apache.org/viewvc?rev=888695&view=rev
Log:
Fix the builder problems that cause otest regressions
Modified:
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java
Modified: tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java?rev=888695&r1=888694&r2=888695&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java Wed Dec 9 03:56:21 2009
@@ -101,7 +101,8 @@
if (model instanceof PolicySubject) {
PolicySubject subject = (PolicySubject)model;
- if (ignoreExclusiveIntents) {
+ if (!ignoreExclusiveIntents) {
+ // The intents are merged and the exclusion check will be done after
policySubject.getRequiredIntents().addAll(subject.getRequiredIntents());
} else {
Set<Intent> intents = new HashSet<Intent>();
Modified: tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java?rev=888695&r1=888694&r2=888695&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java Wed Dec 9 03:56:21 2009
@@ -424,6 +424,7 @@
targetComponentService,
targetBinding,
true));
+ endpointRef.setBinding(targetBinding);
endpointRef.setStatus(EndpointReference.WIRED_TARGET_FOUND_AND_MATCHED);
// relying on the registry here to resolve the real endpoint
reference.getEndpointReferences().add(endpointRef);
@@ -550,7 +551,8 @@
targetComponentService,
targetBinding,
true));
- endpointRef.setStatus(EndpointReference.WIRED_TARGET_NOT_FOUND);
+ endpointRef.setBinding(targetBinding);
+ endpointRef.setStatus(EndpointReference.WIRED_TARGET_FOUND_AND_MATCHED);
// relying on the registry here to resolve the real endpoint
reference.getEndpointReferences().add(endpointRef);