TUSCANY-3091 rename Endpoint2 and EndpointReference2 to remove the 2 subscript now they are in use full time

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@783845 13f79535-47bb-0310-9956-ffa450edef68

7 files changed, 35 insertions, 35 deletions

diff --git a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
index bb7dbca046..c9ee00ff85 100644
--- a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
+++ b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
@@ -20,8 +20,8 @@ package org.apache.tuscany.sca.invocation;
 
 import java.util.List;
 
-import org.apache.tuscany.sca.assembly.Endpoint2;
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.Endpoint;
+import org.apache.tuscany.sca.assembly.EndpointReference;
 import org.apache.tuscany.sca.interfacedef.Operation;
 
 /**
@@ -47,25 +47,25 @@ public interface Message {
      * Get the end point reference of the source reference
      * @return The end point reference of the reference originating the message
      */
-    EndpointReference2 getFrom();
+    EndpointReference getFrom();
 
     /**
      * Set the end point reference of the reference originating the message
      * @param from The end point reference of the reference originating the message
      */
-    void setFrom(EndpointReference2 from);
+    void setFrom(EndpointReference from);
 
     /**
      * Get the end point reference of target service
      * @return The end point reference of the service that the message targets
      */
-    Endpoint2 getTo();
+    Endpoint getTo();
 
     /**
      * Set the end point reference of target service
      * @param to The end point reference of the service that the message targets
      */
-    void setTo(Endpoint2 to);
+    void setTo(Endpoint to);
     
     /**
      * Returns the id of the message
diff --git a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointListener.java b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointListener.java
index 7de213fbc5..4fa0fbd85f 100644
--- a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointListener.java
+++ b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointListener.java
@@ -21,7 +21,7 @@ package org.apache.tuscany.sca.runtime;
 

 import java.util.EventListener;

 

-import org.apache.tuscany.sca.assembly.Endpoint2;

+import org.apache.tuscany.sca.assembly.Endpoint;

 

 /**

  * A listener for endpoint events

@@ -31,16 +31,16 @@ public interface EndpointListener extends EventListener {
      * The method is invoked when a new endpoint is added to the registry

      * @param endpoint

      */

-    void endpointAdded(Endpoint2 endpoint);

+    void endpointAdded(Endpoint endpoint);

     /**

      * The method is invoked when an endpoint is removed the registry

      * @param endpoint

      */

-    void endpointRemoved(Endpoint2 endpoint);

+    void endpointRemoved(Endpoint endpoint);

     /**

      * The method is invoked when an endpoint is updated in the registry

      * @param oldEndpoint

      * @param newEndpoint

      */

-    void endpointUpdated(Endpoint2 oldEndpoint, Endpoint2 newEndpoint);

+    void endpointUpdated(Endpoint oldEndpoint, Endpoint newEndpoint);

 }

diff --git a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java
index a52ccaf7b7..f449fefa9c 100644
--- a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java
+++ b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java
@@ -21,25 +21,25 @@ package org.apache.tuscany.sca.runtime;
 

 import java.util.List;

 

-import org.apache.tuscany.sca.assembly.Endpoint2;

-import org.apache.tuscany.sca.assembly.EndpointReference2;

+import org.apache.tuscany.sca.assembly.Endpoint;

+import org.apache.tuscany.sca.assembly.EndpointReference;

 

 /**

  * The EndpointRegistry holds the active service endpoints for the SCA domain

  */

 public interface EndpointRegistry {

-    void addEndpoint(Endpoint2 endpoint);

-    void removeEndpoint(Endpoint2 endpoint);

-

-    Endpoint2 getEndpoint(String uri);

-    void updateEndpoint(String uri, Endpoint2 endpoint);

-    List<Endpoint2> findEndpoint(EndpointReference2 endpointReference);

-    List<Endpoint2> getEndpoints();

-

-    void addEndpointReference(EndpointReference2 endpointReference);

-    void removeEndpointReference(EndpointReference2 endpointReference);

-    List<EndpointReference2> findEndpointReference(Endpoint2 endpoint);

-    List<EndpointReference2> getEndpointRefereneces();

+    void addEndpoint(Endpoint endpoint);

+    void removeEndpoint(Endpoint endpoint);

+

+    Endpoint getEndpoint(String uri);

+    void updateEndpoint(String uri, Endpoint endpoint);

+    List<Endpoint> findEndpoint(EndpointReference endpointReference);

+    List<Endpoint> getEndpoints();

+

+    void addEndpointReference(EndpointReference endpointReference);

+    void removeEndpointReference(EndpointReference endpointReference);

+    List<EndpointReference> findEndpointReference(Endpoint endpoint);

+    List<EndpointReference> getEndpointRefereneces();

 

     void addListener(EndpointListener listener);

     void removeListener(EndpointListener listener);

diff --git a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
index 71768807c4..db78eae395 100644
--- a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
+++ b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
@@ -19,7 +19,7 @@
 
 package org.apache.tuscany.sca.runtime;
 
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.EndpointReference;
 
 /**
  * Parameters for the EndPointReference
@@ -63,9 +63,9 @@ public interface ReferenceParameters extends Cloneable {
      */
     void setCallbackObjectID(Object callbackObjectID);
 
-    EndpointReference2 getCallbackReference();
+    EndpointReference getCallbackReference();
 
-    void setCallbackReference(EndpointReference2 callback);
+    void setCallbackReference(EndpointReference callback);
 
     Object clone() throws CloneNotSupportedException;
 }
diff --git a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
index 6d95bbca1c..d87ba4e1b6 100644
--- a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
+++ b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
@@ -25,7 +25,7 @@ import java.io.Writer;
 
 import org.apache.tuscany.sca.assembly.Binding;
 import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.EndpointReference;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.oasisopen.sca.CallableReference;
 import org.oasisopen.sca.ComponentContext;
@@ -67,7 +67,7 @@ public interface RuntimeComponentContext extends ComponentContext {
      */
     <B> ServiceReference<B> getServiceReference(Class<B> businessInterface,
                                                 RuntimeComponentReference reference,
-                                                EndpointReference2 endpointReference);
+                                                EndpointReference endpointReference);
 
     /**
      * Bind the reference to a target component/componentService
diff --git a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
index a2a6f03b08..0105abd6e4 100644
--- a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
+++ b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
@@ -23,7 +23,7 @@ import java.util.List;
 
 import org.apache.tuscany.sca.assembly.Binding;
 import org.apache.tuscany.sca.assembly.ComponentReference;
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.EndpointReference;
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.provider.PolicyProvider;
@@ -57,7 +57,7 @@ public interface RuntimeComponentReference extends ComponentReference {
      * @param endpointReference The assembly model endpoint reference 
      * @return The runtime wire
      */
-    RuntimeWire getRuntimeWire(EndpointReference2 endpointReference);
+    RuntimeWire getRuntimeWire(EndpointReference endpointReference);
 
     /**
      * Returns the reference binding provider associated with this
diff --git a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
index fbd47fd0ea..bd8333ab70 100644
--- a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
+++ b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
@@ -22,8 +22,8 @@ package org.apache.tuscany.sca.runtime;
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
-import org.apache.tuscany.sca.assembly.Endpoint2;
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.Endpoint;
+import org.apache.tuscany.sca.assembly.EndpointReference;
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.invocation.InvocationChain;
 import org.apache.tuscany.sca.invocation.Message;
@@ -68,14 +68,14 @@ public interface RuntimeWire extends Cloneable {
      * 
      * @return the endpoint reference that configured this wire 
      */
-    EndpointReference2 getEndpointReference();
+    EndpointReference getEndpointReference();
     
     /**
      * return the endpoint that configured this wire
      * 
      * @return the endpoint  that configured this wire 
      */
-    Endpoint2 getEndpoint();    
+    Endpoint getEndpoint();    
     
     /**
      * Force the invocation chains to be rebuilt