diff options
| author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2010-01-20 06:20:53 +0000 |
|---|---|---|
| committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2010-01-20 06:20:53 +0000 |
| commit | 60f5bce98ed1ce21b111c0d006d2dfd02106371b (patch) | |
| tree | 1964272ea9422fd03f2e694ebbdca94b0132bd7d /sca-java-2.x/trunk/modules/builder | |
| parent | 734dac1eaf4ff319d8355d08335aeb019abf727e (diff) | |
Update to the latest version of OSGi Remote Service Admin
Fix the issues to pass OSGi SCA configuration type TCK
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@901079 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
2 files changed, 2 insertions, 1 deletions
diff --git a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java index 000c4d2887..0eed2bdb16 100644 --- a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java +++ b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java @@ -294,7 +294,7 @@ public class ComponentPolicyBuilderImpl { if (resolved != null) { intents.add(resolved); } else { - warning(context.getMonitor(), "IntentNotFound", subject, i); + error(context.getMonitor(), "IntentNotFound", subject, i); // Intent cannot be resolved } } diff --git a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java index 0cbf4aa7c3..d35513a403 100644 --- a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java +++ b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java @@ -329,6 +329,7 @@ public class EndpointReferenceBuilderImpl { // resolved binding endpoint = createEndpoint(false); endpoint.setURI(uri); + endpoint.setBinding(binding); endpointRef.setStatus(EndpointReference.RESOLVED_BINDING); } |