From 9aa3f0b59abe60b66e8e9fea62a40cd4c2cbdc8e Mon Sep 17 00:00:00 2001 From: slaws Date: Wed, 22 Jul 2009 20:18:19 +0000 Subject: Make the not yet matched status sounds a little less terminal. Just because it isn't matched yet doesn't mean it won't work. The way the code has turned out we can probably work to get rid of this state altogether git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@796866 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tuscany/sca/assembly/xml/EndpointReferenceProcessor.java | 2 +- .../java/org/apache/tuscany/sca/assembly/EndpointReference.java | 2 +- .../impl/ComponentReferenceEndpointReferenceBuilderImpl.java | 6 +++--- .../org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java | 2 +- .../apache/tuscany/sca/core/context/impl/ComponentContextImpl.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'java/sca') diff --git a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointReferenceProcessor.java b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointReferenceProcessor.java index f0b203ce96..113dfc8c48 100644 --- a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointReferenceProcessor.java +++ b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointReferenceProcessor.java @@ -98,7 +98,7 @@ public class EndpointReferenceProcessor extends BaseAssemblyProcessor implements // the endpoint registry will be consulted endpoint.setUnresolved(true); endpoint.setURI(reference.getTargets().get(0).getName()); - endpointReference.setStatus(EndpointReference.WIRED_TARGET_FOUND_BUT_NOT_MATCHED); + endpointReference.setStatus(EndpointReference.WIRED_TARGET_FOUND_READY_FOR_MATCHING); endpointReference.setUnresolved(true); } else { endpoint.setUnresolved(false); diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java index 1bfd87e90e..7b547e70de 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java @@ -36,7 +36,7 @@ public interface EndpointReference extends Base, PolicySubject, Cloneable, Seria public static final int NOT_CONFIGURED = 0; public static final int RESOLVED_BINDING = 1; public static final int WIRED_TARGET_NOT_FOUND = 2; - public static final int WIRED_TARGET_FOUND_BUT_NOT_MATCHED = 3; + public static final int WIRED_TARGET_FOUND_READY_FOR_MATCHING = 3; public static final int WIRED_TARGET_FOUND_AND_MATCHED = 4; /** 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 bcc8821781..f74cde9abe 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 @@ -149,7 +149,7 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI // are matched and bindings are configured later EndpointReference endpointRef = createEndpointRef(component, reference, false); endpointRef.setTargetEndpoint(createEndpoint(targetComponent, targetComponentService, true)); - endpointRef.setStatus(EndpointReference.WIRED_TARGET_FOUND_BUT_NOT_MATCHED); + endpointRef.setStatus(EndpointReference.WIRED_TARGET_FOUND_READY_FOR_MATCHING); reference.getEndpointReferences().add(endpointRef); // Stop with the first match for 0..1 and 1..1 references @@ -191,7 +191,7 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI // are matched and bindings are configured later EndpointReference endpointRef = createEndpointRef(component, reference, false); endpointRef.setTargetEndpoint(createEndpoint(targetComponent, targetComponentService, true)); - endpointRef.setStatus(EndpointReference.WIRED_TARGET_FOUND_BUT_NOT_MATCHED); + endpointRef.setStatus(EndpointReference.WIRED_TARGET_FOUND_READY_FOR_MATCHING); reference.getEndpointReferences().add(endpointRef); } else { warning(monitor, @@ -274,7 +274,7 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI // are matched and bindings are configured later EndpointReference endpointRef = createEndpointRef(component, reference, binding, null, false); endpointRef.setTargetEndpoint(createEndpoint(targetComponent, targetComponentService, true)); - endpointRef.setStatus(EndpointReference.WIRED_TARGET_FOUND_BUT_NOT_MATCHED); + endpointRef.setStatus(EndpointReference.WIRED_TARGET_FOUND_READY_FOR_MATCHING); reference.getEndpointReferences().add(endpointRef); } else { warning(monitor, diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java index 2a99911772..f62aee1964 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java @@ -182,7 +182,7 @@ public class EndpointReferenceImpl implements EndpointReference { output += " WIRED_TARGET_NOT_FOUND "; break; case 3: - output += " WIRED_TARGET_FOUND_BUT_NOT_MATCHED "; + output += " WIRED_TARGET_FOUND_READY_FOR_MATCHING "; break; case 4: output += " WIRED_TARGET_FOUND_AND_MATCHED "; diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java index a6c8bbd29f..02bab99cb1 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java @@ -349,7 +349,7 @@ public class ComponentContextImpl implements ComponentContextExt { endpointReference.setComponent(component); endpointReference.setReference(componentReference); endpointReference.setUnresolved(false); - endpointReference.setStatus(EndpointReference.WIRED_TARGET_FOUND_BUT_NOT_MATCHED); + endpointReference.setStatus(EndpointReference.WIRED_TARGET_FOUND_READY_FOR_MATCHING); // create endpoint. Endpoint endpoint = assemblyFactory.createEndpoint(); -- cgit v1.2.3