diff options
| author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-07-31 07:36:42 +0000 |
|---|---|---|
| committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-07-31 07:36:42 +0000 |
| commit | f037e3e249300a2d6490c4ea66aaa355361caa4a (patch) | |
| tree | 3e1965987663491a2dcf19a28605693b8a852524 | |
| parent | 60085afd992888b260161504993ab39ff8392fab (diff) | |
Change warning to error when reference with target also has binding, to match spec
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@799532 13f79535-47bb-0310-9956-ffa450edef68
2 files changed, 1 insertions, 2 deletions
diff --git a/java/sca/itest/references/src/main/resources/ManualWiredReferencesTest.composite b/java/sca/itest/references/src/main/resources/ManualWiredReferencesTest.composite index d5596e3da4..52d6fe48c1 100644 --- a/java/sca/itest/references/src/main/resources/ManualWiredReferencesTest.composite +++ b/java/sca/itest/references/src/main/resources/ManualWiredReferencesTest.composite @@ -24,7 +24,6 @@ <reference name="bReference" target="BComponent" /> <reference name="cReference" target="CComponent/CComponentImpl"> <!-- reference name="cReference" target="CComponent"--> - <binding.sca uri="DComponent"/> </reference> <reference name="dReference1" > <binding.sca uri="DComponent"/> diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java index f74cde9abe..9d2065c2cf 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java @@ -170,7 +170,7 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI // Check that the component reference does not mix the use of endpoint references // specified via the target attribute with the presence of binding elements if (bindingsIdentifyTargets(reference)) { - warning(monitor, "ReferenceEndPointMixWithTarget", composite, composite.getName().toString(), component + error(monitor, "ReferenceEndPointMixWithTarget", composite, composite.getName().toString(), component .getName(), reference.getName()); } |