TUSCANY-3091 remove 2 subscripts from composite activator and runtime wire class names now they are in use full time

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

7 files changed, 23 insertions, 23 deletions

diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl2.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
index d1087c1faf..7e2c508069 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl2.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
@@ -80,8 +80,8 @@ import org.apache.tuscany.sca.work.WorkScheduler;
 /**
  * @version $Rev$ $Date$
  */
-public class CompositeActivatorImpl2 implements CompositeActivator {
-    private static final Logger logger = Logger.getLogger(CompositeActivatorImpl2.class.getName());
+public class CompositeActivatorImpl implements CompositeActivator {
+    final Logger logger = Logger.getLogger(CompositeActivatorImpl.class.getName());
 
     private final ExtensionPointRegistry extensionPoints;
     private final AssemblyFactory assemblyFactory;
@@ -105,7 +105,7 @@ public class CompositeActivatorImpl2 implements CompositeActivator {
 
     private Composite domainComposite;
 
-    public CompositeActivatorImpl2(ExtensionPointRegistry extensionPoints) {
+    public CompositeActivatorImpl(ExtensionPointRegistry extensionPoints) {
         this.extensionPoints = extensionPoints;
         this.compositeContext = new CompositeContextImpl(extensionPoints);
         FactoryExtensionPoint factories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
@@ -381,7 +381,7 @@ public class CompositeActivatorImpl2 implements CompositeActivator {
             endpointReference.setInterfaceContract(getServiceBindingInterfaceContract(service, endpoint.getBinding()));
 
             // create the wire
-            RuntimeWire wire = new RuntimeWireImpl2(extensionPoints,
+            RuntimeWire wire = new RuntimeWireImpl(extensionPoints,
                                                     false,
                                                     endpointReference,
                                                     endpoint,
@@ -804,7 +804,7 @@ public class CompositeActivatorImpl2 implements CompositeActivator {
         // create the wire
         // null endpoint passed in here as the endpoint reference may
         // not be resolved yet
-        RuntimeWire wire = new RuntimeWireImpl2(extensionPoints,
+        RuntimeWire wire = new RuntimeWireImpl(extensionPoints,
                                                 true,
                                                 endpointReference,
                                                 null,
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl2.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java
index 6f521686f2..1f5e7f0d42 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl2.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java
@@ -71,9 +71,9 @@ import org.oasisopen.sca.ServiceRuntimeException;
 /**
  * @version $Rev$ $Date$
  */
-public class RuntimeWireImpl2 implements RuntimeWire {
+public class RuntimeWireImpl implements RuntimeWire {
 
-    private ExtensionPointRegistry extensionPoints;
+    ExtensionPointRegistry extensionPoints;
 
     private Boolean isReferenceWire = false;
     private EndpointReference2 endpointReference;
@@ -91,7 +91,7 @@ public class RuntimeWireImpl2 implements RuntimeWire {
     private Endpoint2 lastCallback;
     private RuntimeWire cachedWire;
     private boolean wireReserved;
-    private RuntimeWireImpl2 clonedFrom;
+    private RuntimeWireImpl clonedFrom;
 
     private List<InvocationChain> chains;
     private InvocationChain bindingInvocationChain;
@@ -108,7 +108,7 @@ public class RuntimeWireImpl2 implements RuntimeWire {
      * @param messageFactory
      * @param conversationManager
      */
-    public RuntimeWireImpl2(ExtensionPointRegistry extensionPoints,
+    public RuntimeWireImpl(ExtensionPointRegistry extensionPoints,
                             boolean isReferenceWire,
                             EndpointReference2 endpointReference,
                             Endpoint2 endpoint,
@@ -625,7 +625,7 @@ public class RuntimeWireImpl2 implements RuntimeWire {
      */
     @Override
     public Object clone() throws CloneNotSupportedException {
-        RuntimeWireImpl2 copy = (RuntimeWireImpl2)super.clone();
+        RuntimeWireImpl copy = (RuntimeWireImpl)super.clone();
         copy.endpointReference = (EndpointReference2)endpointReference.clone();
         copy.endpoint = copy.endpointReference.getTargetEndpoint();
         copy.invoker = new RuntimeWireInvoker(copy.messageFactory, copy.conversationManager, copy);
@@ -652,7 +652,7 @@ public class RuntimeWireImpl2 implements RuntimeWire {
     }
 
     public synchronized void addToCache(Endpoint2 callback, RuntimeWire clonedWire) {
-        ((RuntimeWireImpl2)clonedWire).setClonedFrom(this);
+        ((RuntimeWireImpl)clonedWire).setClonedFrom(this);
         lastCallback = callback;
         cachedWire = clonedWire;
         wireReserved = true;
@@ -668,7 +668,7 @@ public class RuntimeWireImpl2 implements RuntimeWire {
         clonedFrom.releaseClonedWire(this);
     }
 
-    private void setClonedFrom(RuntimeWireImpl2 wire) {
+    private void setClonedFrom(RuntimeWireImpl wire) {
         clonedFrom = wire;
     }
 }
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 b39cbe6d17..d2a222d91e 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
@@ -43,7 +43,7 @@ import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 import org.apache.tuscany.sca.core.assembly.CompositeActivator;
 import org.apache.tuscany.sca.core.assembly.RuntimeAssemblyFactory;
-import org.apache.tuscany.sca.core.assembly.impl.CompositeActivatorImpl2;
+import org.apache.tuscany.sca.core.assembly.impl.CompositeActivatorImpl;
 import org.apache.tuscany.sca.core.assembly.impl.ReferenceParametersImpl;
 import org.apache.tuscany.sca.core.context.CallableReferenceExt;
 import org.apache.tuscany.sca.core.context.ComponentContextExt;
@@ -470,7 +470,7 @@ public class CallableReferenceImpl<B> implements CallableReferenceExt<B> {
             if (conversation != null) {
                 refParams.setConversationID(conversation.getConversationID());
             }
-            return ((CompositeActivatorImpl2)compositeActivator).getCompositeContext().toXML(component, clonedRef);
+            return ((CompositeActivatorImpl)compositeActivator).getCompositeContext().toXML(component, clonedRef);
         } else {
             return scdl;
         }
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 fea1f4216b..2cd23ef337 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
@@ -31,7 +31,7 @@ import org.apache.tuscany.sca.assembly.Endpoint2;
 import org.apache.tuscany.sca.assembly.EndpointReference2;

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

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

-import org.apache.tuscany.sca.core.assembly.impl.RuntimeWireImpl2;

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

 import org.apache.tuscany.sca.core.context.CompositeContext;

 import org.apache.tuscany.sca.core.context.impl.CallableReferenceImpl;

 import org.apache.tuscany.sca.core.invocation.ProxyFactory;

@@ -141,7 +141,7 @@ public class CallbackReferenceImpl<B> extends CallableReferenceImpl<B> {
     private RuntimeWire cloneAndBind(RuntimeWire wire) {

         RuntimeWire boundWire = null;

         if (resolvedEndpoint != null) {

-            boundWire = ((RuntimeWireImpl2)wire).lookupCache(resolvedEndpoint);

+            boundWire = ((RuntimeWireImpl)wire).lookupCache(resolvedEndpoint);

             if (boundWire != null) {

                 return boundWire;

             }

@@ -199,7 +199,7 @@ public class CallbackReferenceImpl<B> extends CallableReferenceImpl<B> {
                 configureWire(boundWire);

 */

                 

-                ((RuntimeWireImpl2)wire).addToCache(resolvedEndpoint, boundWire);

+                ((RuntimeWireImpl)wire).addToCache(resolvedEndpoint, boundWire);

             } catch (CloneNotSupportedException e) {

                 // will not happen

             }

@@ -305,7 +305,7 @@ public class CallbackReferenceImpl<B> extends CallableReferenceImpl<B> {
         // FIXME: Is this the best way to do this?

         final RuntimeWire cbWire = ((RuntimeComponentService) targetService).getRuntimeWires().get(0);

         try {

-            this.wire = (RuntimeWireImpl2) cbWire.clone();

+            this.wire = (RuntimeWireImpl) cbWire.clone();

         } catch (CloneNotSupportedException e) {

             throw new IOException(e.toString());

         }

diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java
index 460df7b007..b0e108dd93 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java
@@ -21,7 +21,7 @@ package org.apache.tuscany.sca.core.invocation.impl;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import org.apache.tuscany.sca.core.assembly.impl.RuntimeWireImpl2;
+import org.apache.tuscany.sca.core.assembly.impl.RuntimeWireImpl;
 import org.apache.tuscany.sca.core.context.impl.CallableReferenceImpl;
 import org.apache.tuscany.sca.core.conversation.ConversationState;
 import org.apache.tuscany.sca.invocation.InvocationChain;
@@ -79,7 +79,7 @@ public class JDKCallbackInvocationHandler extends JDKInvocationHandler {
             if (convID == null) {
                 convID = ((CallbackReferenceImpl)callableReference).getConvID();
                 if (convID != null) {
-                    conversation = ((RuntimeWireImpl2)wire).getConversationManager().getConversation(convID);
+                    conversation = ((RuntimeWireImpl)wire).getConversationManager().getConversation(convID);
                     if (callableReference != null) {
                         ((CallableReferenceImpl)callableReference).attachConversation(conversation);
                     }
@@ -104,7 +104,7 @@ public class JDKCallbackInvocationHandler extends JDKInvocationHandler {
             throw e;
         } finally {
             // allow the cloned wire to be reused by subsequent callbacks
-            ((RuntimeWireImpl2)wire).releaseWire();
+            ((RuntimeWireImpl)wire).releaseWire();
         }
     }
 
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 06d9d7aa77..1c51e365d3 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
@@ -30,7 +30,7 @@ import java.util.UUID;
 
 import org.apache.tuscany.sca.assembly.Endpoint2;
 import org.apache.tuscany.sca.assembly.EndpointReference2;
-import org.apache.tuscany.sca.core.assembly.impl.RuntimeWireImpl2;
+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;
 import org.apache.tuscany.sca.core.conversation.ConversationExt;
diff --git a/java/sca/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.assembly.CompositeActivator b/java/sca/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.assembly.CompositeActivator
index 67f5bede89..d5e13292d2 100644
--- a/java/sca/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.assembly.CompositeActivator
+++ b/java/sca/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.assembly.CompositeActivator
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations

 # under the License.

 

-org.apache.tuscany.sca.core.assembly.impl.CompositeActivatorImpl2

+org.apache.tuscany.sca.core.assembly.impl.CompositeActivatorImpl