I have a few comments:
1) Should the flag on the Endpoint instead of EndpointReference?
2) For boolean properties, I prefer to not use "is" for the name, for
example,
void setRemote(boolean isRemote);
boolean isRemote();
3) Should we pass the Node URI onto the Endpoint so that we can test if the
Endpoint is published by the local node?
Thanks,
Raymond
--------------------------------------------------
From: <[email protected]>
Sent: Monday, June 15, 2009 5:56 AM
To: <[email protected]>
Subject: svn commit: r784761 - in
/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly:
EndpointReference.java
builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java
impl/EndpointReferenceImpl.java
Author: slaws
Date: Mon Jun 15 12:56:33 2009
New Revision: 784761
URL: http://svn.apache.org/viewvc?rev=784761&view=rev
Log:
TUSCANY-3092 - add a flag recording whether an endpoint reference refers
to a remote endpoint and set it accordingly. Not used for anything yet.
Modified:
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
Modified:
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java?rev=784761&r1=784760&r2=784761&view=diff
==============================================================================
---
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
(original)
+++
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
Mon Jun 15 12:56:33 2009
@@ -139,6 +139,22 @@
* @param callbackEndpoint the reference callback endpoint
*/
void setCallbackEndpoint(Endpoint callbackEndpoint);
+
+ /**
+ * Returns true if this endpoint reference refers to an endpoint that
+ * is not running in this endpoint reference
+ *
+ * @return true if the endpoint is remote
+ */
+ boolean getIsRemoteReference();
+
+ /**
+ * Set true if this endpoint reference refers to an endpoint that
+ * is not running in this endpoint reference
+ *
+ * @param isRemoteReference set to true if the endpoint is remote
+ */
+ void setIsRemoteReference(boolean isRemoteReference);
/**
* Set the extension point registry against the endpoint after it is
deserialized as
Modified:
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java?rev=784761&r1=784760&r2=784761&view=diff
==============================================================================
---
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java
(original)
+++
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java
Mon Jun 15 12:56:33 2009
@@ -210,6 +210,7 @@
// add an unresolved endpoint reference with an
unresolved endpoint to go with it
EndpointReference endpointRef = createEndpointRef(
component, reference, true );
endpointRef.setTargetEndpoint(createEndpoint(component, targetName));
+ endpointRef.setIsRemoteReference(true);
reference.getEndpointReferences().add(endpointRef);
warning(monitor, "ComponentReferenceTargetNotFound",
composite,
@@ -237,6 +238,7 @@
EndpointReference endpointRef = createEndpointRef(
component, reference,
binding, null, false );
endpointRef.setTargetEndpoint(createEndpoint(false));
+ endpointRef.setIsRemoteReference(true);
reference.getEndpointReferences().add(endpointRef);
continue;
} // end if
@@ -279,6 +281,7 @@
// to signify that this reference is pointing at some
unwired endpoint
EndpointReference endpointRef = createEndpointRef(
component, reference, binding, null, false );
endpointRef.setTargetEndpoint(createEndpoint(
false ));
+ endpointRef.setIsRemoteReference(true);
reference.getEndpointReferences().add(endpointRef);
} // end if
}
@@ -443,9 +446,10 @@
// are matched and bindings are configured later
// TODO
Endpoint endpoint = selectTargetEndpoint( reference,
targetComponentService );
- System.out.println("Selected Endpoint: component=" +
endpoint.getComponent().getName() +
- " service=" + endpoint.getService().getName() +
- " binding=" + endpoint.getBinding().toString());
+ // SL - Turn off for now
+ //System.out.println("Selected Endpoint: component=" +
endpoint.getComponent().getName() +
+ // " service=" + endpoint.getService().getName() +
+ // " binding=" + endpoint.getBinding().toString());
Endpoint endpoint2 = createEndpoint(targetComponent,
targetComponentService, true);
endpoint2.setBinding( endpoint.getBinding() );
endpoints.add( endpoint2 );
Modified:
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java?rev=784761&r1=784760&r2=784761&view=diff
==============================================================================
---
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
(original)
+++
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
Mon Jun 15 12:56:33 2009
@@ -49,6 +49,7 @@
protected List<PolicySet> policySets = new ArrayList<PolicySet>();
protected List<Intent> requiredIntents = new ArrayList<Intent>();
protected InterfaceContract interfaceContract;
+ protected boolean isRemoteReference = false;
// the target of the endpoint reference
protected Endpoint targetEndpoint;
@@ -199,6 +200,14 @@
public void setURI(String uri) {
this.uri = uri;
}
+
+ public boolean getIsRemoteReference() {
+ return isRemoteReference;
+ }
+
+ public void setIsRemoteReference(boolean isRemoteReference) {
+ this.isRemoteReference = isRemoteReference;
+ }
protected void resolve() {
}
