You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2009/03/20 18:57:25 UTC
svn commit: r756692 - in /tuscany/java/sca:
itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/
modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/
modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/
m...
Author: slaws
Date: Fri Mar 20 17:57:24 2009
New Revision: 756692
URL: http://svn.apache.org/viewvc?rev=756692&view=rev
Log:
Remove the target name attribute from EndpointReference2 as it already holds a TargetEndpoint reference which in turns references the component from which the name can be retrieved
Modified:
tuscany/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference2.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/EndpointReference2Impl.java
Modified: tuscany/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java?rev=756692&r1=756691&r2=756692&view=diff
==============================================================================
--- tuscany/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java (original)
+++ tuscany/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java Fri Mar 20 17:57:24 2009
@@ -256,9 +256,9 @@
buffer += indent + " EndpointReference - Component: " + endpointReference.getComponent().getName() +"\n";
buffer += indent + " Reference: " + endpointReference.getReference().getName() +"\n";
- if (endpointReference.getTargetName() != null){
+ if (endpointReference.getTargetEndpoint() != null){
buffer += indent + " Wired: " +"\n";
- buffer += indent + " Target: " + endpointReference.getTargetName()+"\n";
+ buffer += indent + " Target: " + endpointReference.getTargetEndpoint().getComponent().getName()+"\n";
if (endpointReference.getTargetEndpoint() != null &&
endpointReference.getTargetEndpoint().isUnresolved() == false){
buffer += indent + " Binding: " + endpointReference.getBinding().getName() +"\n";
Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference2.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference2.java?rev=756692&r1=756691&r2=756692&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference2.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference2.java Fri Mar 20 17:57:24 2009
@@ -78,21 +78,7 @@
*
* @param binding the resolved reference binding
*/
- void setBinding(Binding binding);
-
- /**
- * Get the name of the target service that this endpoint reference refers to
- *
- * @return target service name
- */
- String getTargetName();
-
- /**
- * Set the name of the target service that this endpoint reference refers to
- *
- * @param targetName
- */
- void setTargetName(String targetName);
+ void setBinding(Binding binding);
/**
* Get the target endpoint
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=756692&r1=756691&r2=756692&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 Fri Mar 20 17:57:24 2009
@@ -146,7 +146,6 @@
EndpointReference2 endpointRef = assemblyFactory.createEndpointReference();
endpointRef.setComponent(component);
endpointRef.setReference(reference);
- endpointRef.setTargetName(targetComponentService.getName());
endpointRef.setUnresolved(false);
// create dummy endpoint. This will be replaced when policies
@@ -214,7 +213,6 @@
EndpointReference2 endpointRef = assemblyFactory.createEndpointReference();
endpointRef.setComponent(component);
endpointRef.setReference(reference);
- endpointRef.setTargetName(targetComponentService.getName());
endpointRef.setUnresolved(false);
// create dummy endpoint. This will be replaced when policies
@@ -239,7 +237,6 @@
EndpointReference2 endpointRef = assemblyFactory.createEndpointReference();
endpointRef.setComponent(component);
endpointRef.setReference(reference);
- endpointRef.setTargetName(targetName);
endpointRef.setUnresolved(true);
// create an unresolved endpoint to go with it
@@ -284,7 +281,6 @@
EndpointReference2 endpointRef = assemblyFactory.createEndpointReference();
endpointRef.setComponent(component);
endpointRef.setReference(reference);
- endpointRef.setTargetName(targetComponentService.getName());
endpointRef.setUnresolved(false);
// create dummy endpoint. This will be replaced when policies
@@ -309,7 +305,6 @@
EndpointReference2 endpointRef = assemblyFactory.createEndpointReference();
endpointRef.setComponent(component);
endpointRef.setReference(reference);
- endpointRef.setTargetName(targetName);
endpointRef.setUnresolved(true);
// create an unresolved endpoint to go with it
@@ -341,7 +336,6 @@
endpointRef.setComponent(component);
endpointRef.setReference(reference);
endpointRef.setBinding(binding);
- endpointRef.setTargetName(null);
endpointRef.setTargetEndpoint(null);
endpointRef.setUnresolved(false);
@@ -394,7 +388,6 @@
endpointRef.setComponent(component);
endpointRef.setReference(reference);
endpointRef.setBinding(binding);
- endpointRef.setTargetName(targetComponentService.getName());
endpointRef.setUnresolved(false);
// create dummy endpoint. This will be replaced when policies
@@ -420,7 +413,6 @@
endpointRef.setComponent(component);
endpointRef.setReference(reference);
endpointRef.setBinding(binding);
- endpointRef.setTargetName(null);
endpointRef.setTargetEndpoint(null);
endpointRef.setUnresolved(false);
Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReference2Impl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReference2Impl.java?rev=756692&r1=756691&r2=756692&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReference2Impl.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReference2Impl.java Fri Mar 20 17:57:24 2009
@@ -46,14 +46,13 @@
private Binding binding;
private List<PolicySet> policySets = new ArrayList<PolicySet>();
private List<Intent> requiredIntents = new ArrayList<Intent>();
+ private InterfaceContract interfaceContract;
// the target of the endpoint reference
- private String targetName;
private Endpoint2 targetEndpoint;
- private InterfaceContract interfaceContract;
// private String uri;
- // callback that messages across this reference
+ // callback endpoint that messages across this reference
// will be directed toward
private Endpoint2 callbackEndpoint;
@@ -102,25 +101,7 @@
public void setBinding(Binding binding) {
this.binding = binding;
}
-
-/*
- public Binding getCallbackBinding() {
- return callbackBinding;
- }
-
- public void setCallbackBinding(Binding callbackBinding) {
- this.callbackBinding = callbackBinding;
- }
-*/
-
- public String getTargetName() {
- return targetName;
- }
-
- public void setTargetName(String targetName) {
- this.targetName = targetName;
- }
-
+
public Endpoint2 getTargetEndpoint() {
return targetEndpoint;
}