1 files changed, 9 insertions, 10 deletions
diff --git a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringContextStub.java b/sca-java-2.x/trunk/modules/implementation-spring-stub/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/stub/SpringContextStub.java
index 2b5b5821c7..062da4b2d2 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringContextStub.java
+++ b/sca-java-2.x/trunk/modules/implementation-spring-stub/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/stub/SpringContextStub.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.implementation.spring.invocation;
+package org.apache.tuscany.sca.implementation.spring.provider.stub;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -37,6 +37,10 @@ import org.apache.tuscany.sca.runtime.RuntimeComponent;
  */
 public class SpringContextStub {
 
+    private static final String SPRING_IMPLEMENTATION_STUB =
+        "org.apache.tuscany.sca.implementation.spring.context.tie.SpringImplementationStub";
+    private static final String SPRING_CONTEXT_TIE =
+        "org.apache.tuscany.sca.implementation.spring.context.tie.SpringContextTie";
     private Object tie;
     private Method startMethod;
     private Method closeMethod;
@@ -62,18 +66,13 @@ public class SpringContextStub {
 
         try {
 
-            Class<?> stubClass =
-                Class.forName("org.apache.tuscany.sca.implementation.spring.runtime.context.SpringImplementationStub",
-                              true,
-                              cl);
+            Class<?> stubClass = Class.forName(SPRING_IMPLEMENTATION_STUB, true, cl);
             Constructor<?> stubConstructor = stubClass.getConstructor(new Class<?>[] {Object.class});
             Object stub =
-                stubConstructor.newInstance(new SpringImplementationTie(implementation, parentApplicationContext, component,
-                                                                        propertyValueObjectFactory));
+                stubConstructor.newInstance(new SpringImplementationTie(implementation, parentApplicationContext,
+                                                                        component, propertyValueObjectFactory));
 
-            Class<?> tieClass =
-                Class
-                    .forName("org.apache.tuscany.sca.implementation.spring.runtime.context.SpringContextTie", true, cl);
+            Class<?> tieClass = Class.forName(SPRING_CONTEXT_TIE, true, cl);
             Constructor<?> tieConstructor = tieClass.getConstructor(new Class<?>[] {stubClass, List.class});
             this.tie = tieConstructor.newInstance(stub, implementation.getResource());