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

21 files changed, 118 insertions, 118 deletions

diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointSerializer.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointSerializer.java
index ff2c98cefb..4617901c5b 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointSerializer.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointSerializer.java
@@ -21,18 +21,18 @@ package org.apache.tuscany.sca.core.assembly;
 

 import java.io.IOException;

 

-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;

 

 /**

  * A utility to seralize/deserialize Endpoint/EndpointReference objects

  */

 public interface EndpointSerializer {

-    void read(Endpoint2 endpoint, String xml) throws IOException;

+    void read(Endpoint endpoint, String xml) throws IOException;

 

-    String write(Endpoint2 endpoint) throws IOException;

+    String write(Endpoint endpoint) throws IOException;

 

-    void read(EndpointReference2 endpointReference, String xml) throws IOException;

+    void read(EndpointReference endpointReference, String xml) throws IOException;

 

-    String write(EndpointReference2 endpointReference) throws IOException;

+    String write(EndpointReference endpointReference) throws IOException;

 }

diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
index 8b03ea7a02..73416f3a9f 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
@@ -25,8 +25,8 @@ import org.apache.tuscany.sca.assembly.Component;
 import org.apache.tuscany.sca.assembly.ComponentReference;
 import org.apache.tuscany.sca.assembly.ComponentService;
 import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-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.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.core.assembly.impl.RuntimeEndpointImpl;
 import org.apache.tuscany.sca.core.assembly.impl.RuntimeComponentImpl;
@@ -79,14 +79,14 @@ public class RuntimeAssemblyFactory extends DefaultAssemblyFactory implements As
     */
 
     @Override
-    public Endpoint2 createEndpoint() {
+    public Endpoint createEndpoint() {
         // Create an instance of EndpointImpl that can be serialized/deserialized using the Tuscany
         // runtime extension points and extensions
         return new RuntimeEndpointImpl(registry);
     }
 
     @Override
-    public EndpointReference2 createEndpointReference() {
+    public EndpointReference createEndpointReference() {
         return super.createEndpointReference();
     }
 
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
index 7e2c508069..27fad24b1f 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
@@ -31,8 +31,8 @@ import org.apache.tuscany.sca.assembly.Component;
 import org.apache.tuscany.sca.assembly.ComponentReference;
 import org.apache.tuscany.sca.assembly.ComponentService;
 import org.apache.tuscany.sca.assembly.Composite;
-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.assembly.Implementation;
 import org.apache.tuscany.sca.assembly.Reference;
 import org.apache.tuscany.sca.assembly.Service;
@@ -297,7 +297,7 @@ public class CompositeActivatorImpl implements CompositeActivator {
             logger.fine("Activating component service: " + component.getURI() + "#" + service.getName());
         }
 
-        for (Endpoint2 endpoint : service.getEndpoints()) {
+        for (Endpoint endpoint : service.getEndpoints()) {
             addServiceBindingProvider(component, service, endpoint.getBinding());
         }
         addServiceWires(component, service);
@@ -362,11 +362,11 @@ public class CompositeActivatorImpl implements CompositeActivator {
         RuntimeComponentService runtimeService = (RuntimeComponentService)service;
 
         // Add a wire for each service Endpoint
-        for ( Endpoint2 endpoint : runtimeService.getEndpoints()){
+        for ( Endpoint endpoint : runtimeService.getEndpoints()){
 
             // fluff up a fake endpoint reference as we are on the service side
             // so we need to represent the reference that will call us
-            EndpointReference2 endpointReference = assemblyFactory.createEndpointReference();
+            EndpointReference endpointReference = assemblyFactory.createEndpointReference();
             endpointReference.setBinding(endpoint.getBinding());
             endpointReference.setTargetEndpoint(endpoint);
 
@@ -436,7 +436,7 @@ public class CompositeActivatorImpl implements CompositeActivator {
             logger.fine("Deactivating component reference: " + component.getURI() + "#" + reference.getName());
         }
         removeReferenceWires(reference);
-        for (EndpointReference2 endpointReference : reference.getEndpointReferences()) {
+        for (EndpointReference endpointReference : reference.getEndpointReferences()) {
             if (endpointReference.getBinding() != null){
                 removeReferenceBindingProvider(component, reference, endpointReference.getBinding());
             }
@@ -542,7 +542,7 @@ public class CompositeActivatorImpl implements CompositeActivator {
                 logger.fine("Starting component service: " + component.getURI() + "#" + service.getName());
             }
             RuntimeComponentService runtimeService = (RuntimeComponentService)service;
-            for (Endpoint2 endpoint : service.getEndpoints()) {
+            for (Endpoint endpoint : service.getEndpoints()) {
                 endpointRegistry.addEndpoint(endpoint);
                 final ServiceBindingProvider bindingProvider = runtimeService.getBindingProvider(endpoint.getBinding());
                 if (bindingProvider != null) {
@@ -589,7 +589,7 @@ public class CompositeActivatorImpl implements CompositeActivator {
             if (logger.isLoggable(Level.FINE)) {
                 logger.fine("Stopping component service: " + component.getURI() + "#" + service.getName());
             }
-            for (Endpoint2 endpoint : service.getEndpoints()) {
+            for (Endpoint endpoint : service.getEndpoints()) {
                 endpointRegistry.removeEndpoint(endpoint);
                 final ServiceBindingProvider bindingProvider = ((RuntimeComponentService)service).getBindingProvider(endpoint.getBinding());
                 if (bindingProvider != null) {
@@ -609,7 +609,7 @@ public class CompositeActivatorImpl implements CompositeActivator {
             }
             RuntimeComponentReference runtimeRef = ((RuntimeComponentReference)reference);
 
-            for (EndpointReference2 endpointReference : reference.getEndpointReferences()) {
+            for (EndpointReference endpointReference : reference.getEndpointReferences()) {
                 final ReferenceBindingProvider bindingProvider = runtimeRef.getBindingProvider(endpointReference.getBinding());
                 if (bindingProvider != null) {
                     // Allow bindings to read properties. Requires PropertyPermission read in security policy.
@@ -716,7 +716,7 @@ public class CompositeActivatorImpl implements CompositeActivator {
             // be resolved (the service to which it points may not be present in the
             // current composite). Endpoint reference resolution takes place when the wire
             // is first used (when the chains are created)
-            for (EndpointReference2 endpointReference : componentReference.getEndpointReferences()){
+            for (EndpointReference endpointReference : componentReference.getEndpointReferences()){
                 addReferenceWire(component, componentReference, endpointReference);
                 endpointRegistry.addEndpointReference(endpointReference);
             }
@@ -729,7 +729,7 @@ public class CompositeActivatorImpl implements CompositeActivator {
             logger.fine("Stopping component reference: " + component.getURI() + "#" + reference.getName());
         }
         RuntimeComponentReference runtimeRef = ((RuntimeComponentReference)reference);
-        for ( EndpointReference2 endpointReference : runtimeRef.getEndpointReferences()){
+        for ( EndpointReference endpointReference : runtimeRef.getEndpointReferences()){
             endpointRegistry.removeEndpointReference(endpointReference);
             ReferenceBindingProvider bindingProvider = runtimeRef.getBindingProvider(endpointReference.getBinding());
             if (bindingProvider != null) {
@@ -738,7 +738,7 @@ public class CompositeActivatorImpl implements CompositeActivator {
         }
     }
 
-    private void addReferenceWire(Component component, ComponentReference reference, EndpointReference2 endpointReference) {
+    private void addReferenceWire(Component component, ComponentReference reference, EndpointReference endpointReference) {
         RuntimeComponentReference runtimeRef = (RuntimeComponentReference)reference;
 
         // Use the interface contract of the reference on the component type and if there
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java
index 1cef109553..cd86fd21aa 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java
@@ -28,8 +28,8 @@ import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamReader;

 import javax.xml.stream.XMLStreamWriter;

 

-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.contribution.processor.StAXArtifactProcessor;

 import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;

 import org.apache.tuscany.sca.core.ExtensionPointRegistry;

@@ -39,8 +39,8 @@ import org.apache.tuscany.sca.core.assembly.EndpointSerializer;
 public class EndpointSerializerImpl implements EndpointSerializer {

     private XMLInputFactory inputFactory;

     private XMLOutputFactory outputFactory;

-    private StAXArtifactProcessor<Endpoint2> processor;

-    private StAXArtifactProcessor<EndpointReference2> refProcessor;

+    private StAXArtifactProcessor<Endpoint> processor;

+    private StAXArtifactProcessor<EndpointReference> refProcessor;

 

     public EndpointSerializerImpl(ExtensionPointRegistry registry) {

         FactoryExtensionPoint factories = registry.getExtensionPoint(FactoryExtensionPoint.class);

@@ -48,14 +48,14 @@ public class EndpointSerializerImpl implements EndpointSerializer {
         outputFactory = factories.getFactory(XMLOutputFactory.class);

         StAXArtifactProcessorExtensionPoint processors =

             registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);

-        processor = processors.getProcessor(Endpoint2.class);

-        refProcessor = processors.getProcessor(EndpointReference2.class);

+        processor = processors.getProcessor(Endpoint.class);

+        refProcessor = processors.getProcessor(EndpointReference.class);

     }

 

-    public void read(Endpoint2 endpoint, String xml) throws IOException {

+    public void read(Endpoint endpoint, String xml) throws IOException {

         try {

             XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(xml));

-            Endpoint2 result = processor.read(reader);

+            Endpoint result = processor.read(reader);

             endpoint.setComponent(result.getComponent());

             endpoint.setService(result.getService());

             endpoint.setBinding(result.getBinding());

@@ -66,7 +66,7 @@ public class EndpointSerializerImpl implements EndpointSerializer {
 

     }

 

-    public String write(Endpoint2 endpoint) throws IOException {

+    public String write(Endpoint endpoint) throws IOException {

         StringWriter sw = new StringWriter();

         try {

             XMLStreamWriter writer = outputFactory.createXMLStreamWriter(sw);

@@ -79,10 +79,10 @@ public class EndpointSerializerImpl implements EndpointSerializer {
         }

     }

 

-    public void read(EndpointReference2 endpointReference, String xml) throws IOException {

+    public void read(EndpointReference endpointReference, String xml) throws IOException {

         try {

             XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(xml));

-            EndpointReference2 result = refProcessor.read(reader);

+            EndpointReference result = refProcessor.read(reader);

             reader.close();

             endpointReference.setComponent(result.getComponent());

             endpointReference.setReference(result.getReference());

@@ -93,7 +93,7 @@ public class EndpointSerializerImpl implements EndpointSerializer {
         }

     }

 

-    public String write(EndpointReference2 endpointReference) throws IOException {

+    public String write(EndpointReference endpointReference) throws IOException {

         StringWriter sw = new StringWriter();

         try {

             XMLStreamWriter writer = outputFactory.createXMLStreamWriter(sw);

diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java
index 4413bae39c..b2b8c86919 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java
@@ -19,7 +19,7 @@
 
 package org.apache.tuscany.sca.core.assembly.impl;
 
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.EndpointReference;
 import org.apache.tuscany.sca.runtime.ReferenceParameters;
 
 /**
@@ -28,7 +28,7 @@ import org.apache.tuscany.sca.runtime.ReferenceParameters;
 public class ReferenceParametersImpl implements ReferenceParameters {
     private Object callbackID;
     private Object conversationID;
-    private EndpointReference2 callbackReference;
+    private EndpointReference callbackReference;
     private Object callbackObjectID;
     
     /**
@@ -59,13 +59,13 @@ public class ReferenceParametersImpl implements ReferenceParameters {
     /**
      * @see org.apache.tuscany.sca.runtime.ReferenceParameters#getCallbackReference()
      */
-    public EndpointReference2 getCallbackReference() {
+    public EndpointReference getCallbackReference() {
         return callbackReference;
     }
     /**
      * @see org.apache.tuscany.sca.runtime.ReferenceParameters#setCallback(java.lang.Object)
      */
-    public void setCallbackReference(EndpointReference2 callback) {
+    public void setCallbackReference(EndpointReference callback) {
         this.callbackReference = callback;
     }
     
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java
index 2026754f57..c0a9f616f6 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java
@@ -24,7 +24,7 @@ import java.util.HashMap;
 import java.util.List;
 
 import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.EndpointReference;
 import org.apache.tuscany.sca.assembly.impl.ComponentReferenceImpl;
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.invocation.InvocationChain;
@@ -71,7 +71,7 @@ public class RuntimeComponentReferenceImpl extends ComponentReferenceImpl implem
         return null;
     }
     
-    public RuntimeWire getRuntimeWire(EndpointReference2 endpointReference) {
+    public RuntimeWire getRuntimeWire(EndpointReference endpointReference) {
         for (RuntimeWire wire : getRuntimeWires()) {
             if (wire.getEndpointReference() == endpointReference) {
                 return wire;
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
index da21e9f8ba..770d94f211 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
@@ -24,14 +24,14 @@ import java.io.IOException;
 import java.io.ObjectInput;

 import java.io.ObjectOutput;

 

-import org.apache.tuscany.sca.assembly.impl.Endpoint2Impl;

+import org.apache.tuscany.sca.assembly.impl.EndpointImpl;

 import org.apache.tuscany.sca.core.ExtensionPointRegistry;

 import org.apache.tuscany.sca.core.assembly.EndpointSerializer;

 

 /**

  * Runtime model for Endpoint that supports java serialization

  */

-public class RuntimeEndpointImpl extends Endpoint2Impl implements Externalizable {

+public class RuntimeEndpointImpl extends EndpointImpl implements Externalizable {

     /**

      * FIXME: What's the best way to get the extension point registry upon deserialization?

      * We can expose a method to receive the extension point registry

diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java
index 1f5e7f0d42..498d6b7db6 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java
@@ -32,8 +32,8 @@ import org.apache.tuscany.sca.assembly.ComponentService;
 import org.apache.tuscany.sca.assembly.CompositeReference;
 import org.apache.tuscany.sca.assembly.CompositeService;
 import org.apache.tuscany.sca.assembly.Contract;
-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.assembly.builder.EndpointReferenceBuilder;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.core.UtilityExtensionPoint;
@@ -76,8 +76,8 @@ public class RuntimeWireImpl implements RuntimeWire {
     ExtensionPointRegistry extensionPoints;
 
     private Boolean isReferenceWire = false;
-    private EndpointReference2 endpointReference;
-    private Endpoint2 endpoint;
+    private EndpointReference endpointReference;
+    private Endpoint endpoint;
 
     private transient RuntimeWireProcessor wireProcessor;
     private transient InterfaceContractMapper interfaceContractMapper;
@@ -88,7 +88,7 @@ public class RuntimeWireImpl implements RuntimeWire {
 
     // the following is a very simple cache that avoids re-cloning a wire
     // when consecutive callbacks to the same endpoint are made
-    private Endpoint2 lastCallback;
+    private Endpoint lastCallback;
     private RuntimeWire cachedWire;
     private boolean wireReserved;
     private RuntimeWireImpl clonedFrom;
@@ -110,8 +110,8 @@ public class RuntimeWireImpl implements RuntimeWire {
      */
     public RuntimeWireImpl(ExtensionPointRegistry extensionPoints,
                             boolean isReferenceWire,
-                            EndpointReference2 endpointReference,
-                            Endpoint2 endpoint,
+                            EndpointReference endpointReference,
+                            Endpoint endpoint,
                             InterfaceContractMapper interfaceContractMapper,
                             WorkScheduler workScheduler,
                             RuntimeWireProcessor wireProcessor,
@@ -210,7 +210,7 @@ public class RuntimeWireImpl implements RuntimeWire {
         return current;
     }
 
-    private InterfaceContract getLeafInterfaceContract(EndpointReference2 epr) {
+    private InterfaceContract getLeafInterfaceContract(EndpointReference epr) {
         ComponentReference reference = epr.getReference();
         if (reference == null) {
             return epr.getInterfaceContract();
@@ -222,7 +222,7 @@ public class RuntimeWireImpl implements RuntimeWire {
         return interfaceContract;
     }
 
-    private InterfaceContract getLeafInterfaceContract(Endpoint2 ep) {
+    private InterfaceContract getLeafInterfaceContract(Endpoint ep) {
         ComponentService service = ep.getService();
         if (service == null) {
             return ep.getInterfaceContract();
@@ -329,7 +329,7 @@ public class RuntimeWireImpl implements RuntimeWire {
         }
 
         InterfaceContract bindingContract = getInterfaceContract(endpointReference.getReference(), endpointReference.getBinding());
-        Endpoint2 endpoint = endpointReference.getTargetEndpoint();
+        Endpoint endpoint = endpointReference.getTargetEndpoint();
         endpoint.setInterfaceContract(bindingContract);
     }
 
@@ -497,11 +497,11 @@ public class RuntimeWireImpl implements RuntimeWire {
         //endpointReference.setInterfaceContract(epr.getInterfaceContract());
     }
 
-    public EndpointReference2 getEndpointReference() {
+    public EndpointReference getEndpointReference() {
         return endpointReference;
     }
     
-    public Endpoint2 getEndpoint() {
+    public Endpoint getEndpoint() {
         return endpoint;
     }
 
@@ -626,7 +626,7 @@ public class RuntimeWireImpl implements RuntimeWire {
     @Override
     public Object clone() throws CloneNotSupportedException {
         RuntimeWireImpl copy = (RuntimeWireImpl)super.clone();
-        copy.endpointReference = (EndpointReference2)endpointReference.clone();
+        copy.endpointReference = (EndpointReference)endpointReference.clone();
         copy.endpoint = copy.endpointReference.getTargetEndpoint();
         copy.invoker = new RuntimeWireInvoker(copy.messageFactory, copy.conversationManager, copy);
         copy.cachedWire = null; // TUSCANY-2630
@@ -640,7 +640,7 @@ public class RuntimeWireImpl implements RuntimeWire {
         return conversationManager;
     }
 
-    public synchronized RuntimeWire lookupCache(Endpoint2 callback) {
+    public synchronized RuntimeWire lookupCache(Endpoint callback) {
         if (lastCallback != null && 
             callback.getURI().equals(lastCallback.getURI()) &&
             !wireReserved) {
@@ -651,7 +651,7 @@ public class RuntimeWireImpl implements RuntimeWire {
         }
     }
 
-    public synchronized void addToCache(Endpoint2 callback, RuntimeWire clonedWire) {
+    public synchronized void addToCache(Endpoint callback, RuntimeWire clonedWire) {
         ((RuntimeWireImpl)clonedWire).setClonedFrom(this);
         lastCallback = callback;
         cachedWire = clonedWire;
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceExt.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceExt.java
index c0464cc153..6762896652 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceExt.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceExt.java
@@ -24,7 +24,7 @@ import java.io.IOException;
 
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.EndpointReference;
 import org.apache.tuscany.sca.core.conversation.ConversationExt;
 import org.apache.tuscany.sca.runtime.RuntimeWire;
 import org.oasisopen.sca.CallableReference;
@@ -58,7 +58,7 @@ public interface CallableReferenceExt<B> extends CallableReference<B>, Externali
     /**
      * @return
      */
-    EndpointReference2 getEndpointReference();
+    EndpointReference getEndpointReference();
 
     /**
      * @return
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CompositeContext.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CompositeContext.java
index e67872567c..5d26670f3b 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CompositeContext.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CompositeContext.java
@@ -30,7 +30,7 @@ import javax.xml.stream.XMLStreamReader;
 import org.apache.tuscany.sca.assembly.Component;
 import org.apache.tuscany.sca.assembly.ComponentReference;
 import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.Endpoint2;
+import org.apache.tuscany.sca.assembly.Endpoint;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.core.assembly.CompositeActivator;
 import org.apache.tuscany.sca.core.conversation.ConversationManager;
@@ -146,7 +146,7 @@ public abstract class CompositeContext {
     public static RuntimeComponent getCurrentComponent() {
         Message message = ThreadMessageContext.getMessageContext();
         if (message != null) {
-            Endpoint2 to = message.getTo();
+            Endpoint to = message.getTo();
             if (to == null) {
                 return null;
             }
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallableReferenceImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallableReferenceImpl.java
index d2a222d91e..af42b4a76a 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallableReferenceImpl.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallableReferenceImpl.java
@@ -32,8 +32,8 @@ import org.apache.tuscany.sca.assembly.Binding;
 import org.apache.tuscany.sca.assembly.Component;
 import org.apache.tuscany.sca.assembly.ComponentService;
 import org.apache.tuscany.sca.assembly.CompositeService;
-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.assembly.OptimizableBinding;
 import org.apache.tuscany.sca.assembly.Reference;
 import org.apache.tuscany.sca.assembly.SCABinding;
@@ -84,7 +84,7 @@ public class CallableReferenceImpl<B> implements CallableReferenceExt<B> {
 
     protected transient RuntimeComponent component;
     protected transient RuntimeComponentReference reference;
-    protected transient EndpointReference2 endpointReference;
+    protected transient EndpointReference endpointReference;
 
     protected String scdl;
 
@@ -113,7 +113,7 @@ public class CallableReferenceImpl<B> implements CallableReferenceExt<B> {
     protected CallableReferenceImpl(Class<B> businessInterface,
                                     RuntimeComponent component,
                                     RuntimeComponentReference reference,
-                                    EndpointReference2 endpointReference,
+                                    EndpointReference endpointReference,
                                     ProxyFactory proxyFactory,
                                     CompositeActivator compositeActivator) {
         this.proxyFactory = proxyFactory;
@@ -519,7 +519,7 @@ public class CallableReferenceImpl<B> implements CallableReferenceExt<B> {
     }
 
     // TODO - EPR - needs sorting out for new endpoint references
-    public EndpointReference2 getEndpointReference() {
+    public EndpointReference getEndpointReference() {
         try {
             resolve();
 
@@ -529,13 +529,13 @@ public class CallableReferenceImpl<B> implements CallableReferenceExt<B> {
                 componentTypeRef == null ? reference.getInterfaceContract() : componentTypeRef.getInterfaceContract();
             sourceContract = sourceContract.makeUnidirectional(false);
             
-            EndpointReference2 epr = assemblyFactory.createEndpointReference();
+            EndpointReference epr = assemblyFactory.createEndpointReference();
             epr.setComponent(component);
             epr.setReference(reference);
             //epr.setBinding(binding);
             epr.setInterfaceContract(sourceContract);
             
-            Endpoint2 endpoint = assemblyFactory.createEndpoint();
+            Endpoint endpoint = assemblyFactory.createEndpoint();
             epr.setTargetEndpoint(endpoint);
             
             return epr;
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 d1bbf4b475..1b248f65c7 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
@@ -30,8 +30,8 @@ import org.apache.tuscany.sca.assembly.Component;
 import org.apache.tuscany.sca.assembly.ComponentProperty;
 import org.apache.tuscany.sca.assembly.ComponentReference;
 import org.apache.tuscany.sca.assembly.ComponentService;
-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.assembly.Multiplicity;
 import org.apache.tuscany.sca.assembly.OptimizableBinding;
 import org.apache.tuscany.sca.assembly.Reference;
@@ -215,7 +215,7 @@ public class ComponentContextImpl implements ComponentContextExt {
      */
     public <B> ServiceReference<B> getServiceReference(Class<B> businessInterface,
                                                        RuntimeComponentReference reference,
-                                                       EndpointReference2 endpointReference) {
+                                                       EndpointReference endpointReference) {
         try {
             RuntimeComponentReference ref = (RuntimeComponentReference)reference;
             InterfaceContract interfaceContract = reference.getInterfaceContract();
@@ -345,14 +345,14 @@ public class ComponentContextImpl implements ComponentContextExt {
         // component.getReferences().add(componentReference);
         
         // create endpoint reference
-        EndpointReference2 endpointReference = assemblyFactory
+        EndpointReference endpointReference = assemblyFactory
                 .createEndpointReference();
         endpointReference.setComponent(component);
         endpointReference.setReference(componentReference);
          endpointReference.setUnresolved(false);
 
         // create endpoint. 
-        Endpoint2 endpoint = assemblyFactory.createEndpoint();
+        Endpoint endpoint = assemblyFactory.createEndpoint();
         endpoint.setComponent(component);
         endpoint.setService(service);
         endpoint.setUnresolved(true);
@@ -452,7 +452,7 @@ public class ComponentContextImpl implements ComponentContextExt {
             for (ComponentReference ref : component.getReferences()) {
                 if (referenceName.equals(ref.getName())) {
                     ArrayList<ServiceReference<B>> serviceRefs = new ArrayList<ServiceReference<B>>();
-                    for (EndpointReference2 endpointReference : ref.getEndpointReferences()) {
+                    for (EndpointReference endpointReference : ref.getEndpointReferences()) {
                         serviceRefs
                             .add(getServiceReference(businessInterface, (RuntimeComponentReference)ref, endpointReference));
                     }
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CompositeContextImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CompositeContextImpl.java
index de0ea04fad..2fe223c523 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CompositeContextImpl.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CompositeContextImpl.java
@@ -39,8 +39,8 @@ import org.apache.tuscany.sca.assembly.Component;
 import org.apache.tuscany.sca.assembly.ComponentReference;
 import org.apache.tuscany.sca.assembly.ComponentService;
 import org.apache.tuscany.sca.assembly.Composite;
-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.assembly.Multiplicity;
 import org.apache.tuscany.sca.assembly.OptimizableBinding;
 import org.apache.tuscany.sca.assembly.Reference;
@@ -275,7 +275,7 @@ public class CompositeContextImpl extends CompositeContext {
     public static RuntimeComponent getCurrentComponent() {
         Message message = ThreadMessageContext.getMessageContext();
         if (message != null) {
-            Endpoint2 to = message.getTo();
+            Endpoint to = message.getTo();
             if (to == null) {
                 return null;
             }
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java
index a701bd50b4..9daf430ad5 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 import javax.security.auth.Subject;
 
-import org.apache.tuscany.sca.assembly.Endpoint2;
+import org.apache.tuscany.sca.assembly.Endpoint;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.core.context.CallableReferenceExt;
 import org.apache.tuscany.sca.core.invocation.ExtensibleProxyFactory;
@@ -71,7 +71,7 @@ public class RequestContextImpl implements RequestContext {
     public <B> CallableReference<B> getServiceReference() {
         Message msgContext = ThreadMessageContext.getMessageContext();
         // FIXME: [rfeng] Is this the service reference matching the caller side?
-        Endpoint2 to = msgContext.getTo();
+        Endpoint to = msgContext.getTo();
         RuntimeComponentService service = (RuntimeComponentService) to.getService();
         RuntimeComponent component = (RuntimeComponent) to.getComponent();
         
@@ -96,7 +96,7 @@ public class RequestContextImpl implements RequestContext {
     @SuppressWarnings("unchecked")
     public <CB> CallableReference<CB> getCallbackReference() {
         Message msgContext = ThreadMessageContext.getMessageContext();
-        Endpoint2 to = msgContext.getTo();
+        Endpoint to = msgContext.getTo();
         RuntimeComponentService service = (RuntimeComponentService) to.getService();
         RuntimeComponentReference callbackReference = (RuntimeComponentReference)service.getCallbackReference();
         if (callbackReference == null) {
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java
index 265b08ed12..086c32ee24 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java
@@ -21,7 +21,7 @@ package org.apache.tuscany.sca.core.context.impl;
 import javax.xml.stream.XMLStreamReader;
 
 import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.EndpointReference;
 import org.apache.tuscany.sca.core.assembly.CompositeActivator;
 import org.apache.tuscany.sca.core.context.CallableReferenceExt;
 import org.apache.tuscany.sca.core.context.ServiceReferenceExt;
@@ -79,7 +79,7 @@ public class ServiceReferenceImpl<B> extends CallableReferenceImpl<B> implements
     public ServiceReferenceImpl(Class<B> businessInterface,
                                 RuntimeComponent component,
                                 RuntimeComponentReference reference,
-                                EndpointReference2 endpointReference,
+                                EndpointReference endpointReference,
                                 ProxyFactory proxyFactory,
                                 CompositeActivator compositeActivator) {
         super(businessInterface, component, reference, endpointReference, proxyFactory, compositeActivator);
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
index 3f4d03ee92..8b0b55f77f 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
@@ -19,7 +19,7 @@
 package org.apache.tuscany.sca.core.invocation;
 
 import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.EndpointReference;
 import org.apache.tuscany.sca.core.factory.ObjectCreationException;
 import org.apache.tuscany.sca.core.factory.ObjectFactory;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
@@ -35,7 +35,7 @@ public class CallableReferenceObjectFactory implements ObjectFactory<CallableRef
     private Class<?> businessInterface;
     private RuntimeComponent component;
     private RuntimeComponentReference reference;
-    private EndpointReference2 endpointReference;
+    private EndpointReference endpointReference;
 
     /**
      * Constructor.
@@ -50,7 +50,7 @@ public class CallableReferenceObjectFactory implements ObjectFactory<CallableRef
     public CallableReferenceObjectFactory(Class<?> businessInterface,
                                           RuntimeComponent component,
                                           RuntimeComponentReference reference,
-                                          EndpointReference2 endpointReference) {
+                                          EndpointReference endpointReference) {
         this.businessInterface = businessInterface;
         this.component = component;
         this.reference = reference;
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
index 0af48a9add..747a5ba032 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
@@ -24,8 +24,8 @@ import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-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.Interceptor;
 import org.apache.tuscany.sca.invocation.Invoker;
@@ -152,19 +152,19 @@ public class NonBlockingInterceptor implements Interceptor {
             throw new UnsupportedOperationException();
         }
 
-        public EndpointReference2 getFrom() {
+        public EndpointReference getFrom() {
             return null;
         }
 
-        public Endpoint2 getTo() {
+        public Endpoint getTo() {
             return null;
         }
 
-        public void setFrom(EndpointReference2 from) {
+        public void setFrom(EndpointReference from) {
             throw new UnsupportedOperationException();
         }
 
-        public void setTo(Endpoint2 to) {
+        public void setTo(Endpoint to) {
             throw new UnsupportedOperationException();
         }
 
@@ -179,7 +179,7 @@ public class NonBlockingInterceptor implements Interceptor {
         /**
          * @see org.apache.tuscany.sca.invocation.Message#getReplyTo()
          */
-        public EndpointReference2 getReplyTo() {
+        public EndpointReference getReplyTo() {
             return null;
         }
 
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
index 649942f923..ed84de2dd5 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
@@ -21,7 +21,7 @@ package org.apache.tuscany.sca.core.invocation;
 
 import java.lang.reflect.InvocationTargetException;
 
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.EndpointReference;
 import org.apache.tuscany.sca.core.conversation.ConversationExt;
 import org.apache.tuscany.sca.core.conversation.ConversationManager;
 import org.apache.tuscany.sca.core.conversation.ConversationState;
@@ -108,8 +108,8 @@ public class RuntimeWireInvoker implements Invoker{
     }
 
     protected Object invoke(InvocationChain chain, Message msg, RuntimeWire wire) throws InvocationTargetException {
-        EndpointReference2 from = msg.getFrom();
-        EndpointReference2 epFrom = wire.getEndpointReference();
+        EndpointReference from = msg.getFrom();
+        EndpointReference epFrom = wire.getEndpointReference();
         if (from != null) {
             from.setComponent(epFrom.getComponent());
             from.setReference(epFrom.getReference());
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/CallbackReferenceImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/CallbackReferenceImpl.java
index 2cd23ef337..b132464a5c 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/CallbackReferenceImpl.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/CallbackReferenceImpl.java
@@ -27,8 +27,8 @@ import org.apache.tuscany.sca.assembly.Binding;
 import org.apache.tuscany.sca.assembly.Component;

 import org.apache.tuscany.sca.assembly.ComponentService;

 import org.apache.tuscany.sca.assembly.Contract;

-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.assembly.OptimizableBinding;

 import org.apache.tuscany.sca.core.assembly.impl.RuntimeComponentReferenceImpl;

 import org.apache.tuscany.sca.core.assembly.impl.RuntimeWireImpl;

@@ -52,7 +52,7 @@ import org.apache.tuscany.sca.runtime.RuntimeWire;
 public class CallbackReferenceImpl<B> extends CallableReferenceImpl<B> {

     private RuntimeWire wire;

     private List<RuntimeWire> wires;

-    private Endpoint2 resolvedEndpoint;

+    private Endpoint resolvedEndpoint;

 	private Object convID;

 

     public static CallbackReferenceImpl newInstance(Class interfaze,

@@ -110,13 +110,13 @@ public class CallbackReferenceImpl<B> extends CallableReferenceImpl<B> {
 	    return convID;

 	}

 

-    protected Endpoint2 getResolvedEndpoint() {

+    protected Endpoint getResolvedEndpoint() {

 	    return resolvedEndpoint;

 	}

 

     private RuntimeWire selectCallbackWire(Message msgContext) {

         // look for callback binding with same name as service binding

-        Endpoint2 to = msgContext.getTo();

+        Endpoint to = msgContext.getTo();

         if (to == null) {

             //FIXME: need better exception

             throw new RuntimeException("Destination for forward call is not available");

@@ -209,7 +209,7 @@ public class CallbackReferenceImpl<B> extends CallableReferenceImpl<B> {
 

     // TODO - EPR - why static & convert to ne endpoint reference

     private static RuntimeComponentReference bind(RuntimeComponentReference reference,

-                                                  Endpoint2 resolvedEndpoint) throws CloneNotSupportedException {

+                                                  Endpoint resolvedEndpoint) throws CloneNotSupportedException {

         RuntimeComponent component = (RuntimeComponent)resolvedEndpoint.getComponent();

         RuntimeComponentService service = (RuntimeComponentService)resolvedEndpoint.getService();

         

@@ -233,8 +233,8 @@ public class CallbackReferenceImpl<B> extends CallableReferenceImpl<B> {
         

         ref.getEndpointReferences().clear();

         

-        for(EndpointReference2 endpointReference : reference.getEndpointReferences()){

-            EndpointReference2 clone = (EndpointReference2)endpointReference.clone();

+        for(EndpointReference endpointReference : reference.getEndpointReferences()){

+            EndpointReference clone = (EndpointReference)endpointReference.clone();

             

             clone.setReference(ref);

             clone.getBinding().setURI(resolvedEndpoint.getBinding().getURI());

@@ -315,7 +315,7 @@ public class CallbackReferenceImpl<B> extends CallableReferenceImpl<B> {
         final RuntimeComponentReference ref = new RuntimeComponentReferenceImpl();

         ref.setComponent((RuntimeComponent) targetComponent);

         ref.setInterfaceContract(targetServiceIfaceContract);

-        ((EndpointReference2) this.wire.getEndpointReference()).setReference(ref);

+        ((EndpointReference) this.wire.getEndpointReference()).setReference(ref);

     }

 

     /**

diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java
index 1c51e365d3..49b9d87096 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java
@@ -28,8 +28,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-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.core.assembly.impl.RuntimeWireImpl;
 import org.apache.tuscany.sca.core.context.CallableReferenceExt;
 import org.apache.tuscany.sca.core.context.impl.CallableReferenceImpl;
@@ -70,8 +70,8 @@ public class JDKInvocationHandler implements InvocationHandler, Serializable {
     protected boolean conversational;
     protected ConversationExt conversation;
     protected MessageFactory messageFactory;
-    protected EndpointReference2 source;
-    protected Endpoint2 target;
+    protected EndpointReference source;
+    protected Endpoint target;
     protected RuntimeWire wire;
     protected CallableReference<?> callableReference;
     protected Class<?> businessInterface;
@@ -270,11 +270,11 @@ public class JDKInvocationHandler implements InvocationHandler, Serializable {
         return found;
     }
 
-    protected void setEndpoint(Endpoint2 endpoint) {
+    protected void setEndpoint(Endpoint endpoint) {
         this.target = endpoint;
     }
 
-    protected Object invoke(InvocationChain chain, Object[] args, RuntimeWire wire, EndpointReference2 source)
+    protected Object invoke(InvocationChain chain, Object[] args, RuntimeWire wire, EndpointReference source)
                          throws Throwable {
         Message msg = messageFactory.createMessage();
         msg.setFrom(source);
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java
index bd7b9dcb8f..d24da46b3f 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java
@@ -21,8 +21,8 @@ package org.apache.tuscany.sca.core.invocation.impl;
 import java.util.ArrayList;
 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.Message;
 
@@ -38,8 +38,8 @@ public class MessageImpl implements Message {
     private boolean isFault;
     private Operation operation;
 
-    private EndpointReference2 from;
-    private Endpoint2 to;
+    private EndpointReference from;
+    private Endpoint to;
 
     public MessageImpl() {
         // TODO - EPR - What to do by default?
@@ -76,19 +76,19 @@ public class MessageImpl implements Message {
         this.body = fault;
     }
 
-    public EndpointReference2 getFrom() {
+    public EndpointReference getFrom() {
         return from;
     }
 
-    public void setFrom(EndpointReference2 from) {
+    public void setFrom(EndpointReference from) {
         this.from = from;
     }
 
-    public Endpoint2 getTo() {
+    public Endpoint getTo() {
         return to;
     }
 
-    public void setTo(Endpoint2 to) {
+    public void setTo(Endpoint to) {
         this.to = to;
     }