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

2 files changed, 7 insertions, 7 deletions

diff --git a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
index 9040ef9e4a..0f8ce0a600 100644
--- a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
+++ b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
@@ -39,7 +39,7 @@ import org.apache.axis2.client.OperationClient;
 import org.apache.axis2.client.Options;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.transport.http.HTTPConstants;
-import org.apache.tuscany.sca.assembly.Endpoint2;
+import org.apache.tuscany.sca.assembly.Endpoint;
 import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
 import org.apache.tuscany.sca.binding.ws.axis2.policy.authentication.token.Axis2TokenAuthenticationPolicy;
 import org.apache.tuscany.sca.binding.ws.axis2.policy.configurator.Axis2BindingBasicAuthenticationConfigurator;
@@ -219,7 +219,7 @@ public class Axis2BindingInvoker implements Invoker, DataExchangeSemantics {
         final OperationClient operationClient = serviceClient.getServiceClient().createClient(wsdlOperationName);
         operationClient.setOptions(options);
 
-        Endpoint2 callbackEndpoint = msg.getFrom().getCallbackEndpoint();
+        Endpoint callbackEndpoint = msg.getFrom().getCallbackEndpoint();
 
 /* TODO - EPR - not required for OASIS
         // set callback endpoint and callback ID for WS-Addressing header
@@ -271,7 +271,7 @@ public class Axis2BindingInvoker implements Invoker, DataExchangeSemantics {
         // if target endpoint was not specified when this invoker was created, 
         // use dynamically specified target endpoint passed in on this call
         if (options.getTo() == null) {
-            Endpoint2 ep = msg.getTo();
+            Endpoint ep = msg.getTo();
             if (ep != null) {
                 requestMC.setTo(new EndpointReference(ep.getBinding().getURI()));
             } else {
diff --git a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
index 147150f75b..780c11a577 100644
--- a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
+++ b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
@@ -80,8 +80,8 @@ import org.apache.axis2.transport.jms.JMSUtils;
 import org.apache.tuscany.sca.assembly.AbstractContract;
 import org.apache.tuscany.sca.assembly.AssemblyFactory;
 import org.apache.tuscany.sca.assembly.Binding;
-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.binding.ws.WebServiceBinding;
 import org.apache.tuscany.sca.binding.ws.axis2.Axis2ServiceClient.URIResolverImpl;
 import org.apache.tuscany.sca.binding.ws.axis2.policy.authentication.token.Axis2TokenAuthenticationPolicy;
@@ -807,10 +807,10 @@ public class Axis2ServiceProvider {
         fillQoSContext(msg, inMC);
 
         // if reference parameters are needed, create a new "From" EPR to hold them
-        EndpointReference2 from = null;
+        EndpointReference from = null;
         if (callbackAddress != null ) {
             from = assemblyFactory.createEndpointReference();
-            Endpoint2 fromEndpoint = assemblyFactory.createEndpoint();
+            Endpoint fromEndpoint = assemblyFactory.createEndpoint();
             from.setTargetEndpoint(fromEndpoint);
             // TODO - EPR - need to set callback address
             msg.setFrom(from);