Refactor implementation-spring into 4 modules

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

21 files changed, 175 insertions, 1894 deletions

diff --git a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanElement.java b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanElement.java
index fd6aed893c..64b36a0a44 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanElement.java
+++ b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanElement.java
@@ -41,6 +41,9 @@ public class SpringBeanElement {
     private List<SpringPropertyElement> properties = new ArrayList<SpringPropertyElement>();
     private List<SpringConstructorArgElement> constructorargs = new ArrayList<SpringConstructorArgElement>();
 
+    public SpringBeanElement() {
+    }
+    
     public SpringBeanElement(String id, String className) {
         this.id = id;
         this.className = className;
@@ -114,4 +117,16 @@ public class SpringBeanElement {
         this.factoryMethodAttribute = factoryMethodAttribute;
     }
 
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("SpringBeanElement [id=").append(id).append(", className=").append(className)
+            .append(", innerBean=").append(innerBean).append(", abstractBean=").append(abstractBean)
+            .append(", parentAttribute=").append(parentAttribute).append(", factoryBeanAttribute=")
+            .append(factoryBeanAttribute).append(", factoryMethodAttribute=").append(factoryMethodAttribute)
+            .append(", properties=").append(properties).append(", constructorargs=").append(constructorargs)
+            .append("]");
+        return builder.toString();
+    }
+
 } // end class SpringBeanElement
diff --git a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringConstructorArgElement.java b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringConstructorArgElement.java
index 5674c26ba3..1de0595d60 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringConstructorArgElement.java
+++ b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringConstructorArgElement.java
@@ -35,6 +35,10 @@ public class SpringConstructorArgElement {
     private List<String> refs = new ArrayList<String>();
     private List<String> values = new ArrayList<String>();
 
+    public SpringConstructorArgElement() {
+        
+    }
+    
     public SpringConstructorArgElement(String type) {
         this.type = type;
     }
@@ -74,4 +78,13 @@ public class SpringConstructorArgElement {
     public void addValue(String value) {
         this.values.add(value);
     }
+
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("SpringConstructorArgElement [type=").append(type).append(", autoIndex=").append(autoIndex)
+            .append(", index=").append(index).append(", refs=").append(refs).append(", values=").append(values)
+            .append("]");
+        return builder.toString();
+    }
 }
diff --git a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
index 6cefaae73f..a5d4adb1bb 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
+++ b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
@@ -19,8 +19,9 @@
 package org.apache.tuscany.sca.implementation.spring;
 
 import java.net.URL;
-import java.util.Hashtable;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.xml.namespace.QName;
 
@@ -33,7 +34,6 @@ import org.apache.tuscany.sca.assembly.Reference;
 import org.apache.tuscany.sca.assembly.Service;
 import org.apache.tuscany.sca.assembly.impl.ImplementationImpl;
 import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
 
 /**
  * Represents a Spring implementation.
@@ -48,11 +48,11 @@ public class SpringImplementation extends ImplementationImpl implements Implemen
     private List<URL> resource;
     private ComponentType componentType;
     // Mapping of Services to Beans
-    private Hashtable<String, SpringBeanElement> serviceMap;
+    private Map<String, SpringBeanElement> serviceMap;
     // Mapping of property names to Java class
-    private Hashtable<String, Class<?>> propertyMap;
+    private Map<String, Class<?>> propertyMap;
     // List of unresolved bean property references
-    private Hashtable<String, Reference> unresolvedBeanRef;
+    private Map<String, Reference> unresolvedBeanRef;
     private ClassLoader classLoader;
 
     public SpringImplementation() {
@@ -60,9 +60,9 @@ public class SpringImplementation extends ImplementationImpl implements Implemen
         this.location = null;
         this.resource = null;
         setUnresolved(true);
-        serviceMap = new Hashtable<String, SpringBeanElement>();
-        propertyMap = new Hashtable<String, Class<?>>();
-        unresolvedBeanRef = new Hashtable<String, Reference>();
+        serviceMap = new HashMap<String, SpringBeanElement>();
+        propertyMap = new HashMap<String, Class<?>>();
+        unresolvedBeanRef = new HashMap<String, Reference>();
     } // end method SpringImplementation
 
     /* Returns the location attribute for this Spring implementation */
@@ -171,12 +171,8 @@ public class SpringImplementation extends ImplementationImpl implements Implemen
      * Use preProcess to validate and map the references and properties dynamically
      */
     public void build(Component component) {
-        if (!(component instanceof RuntimeComponent))
-            return;
-
-        RuntimeComponent rtc = (RuntimeComponent)component;
 
-        for (Reference reference : rtc.getReferences()) {
+        for (Reference reference : component.getReferences()) {
             if (unresolvedBeanRef.containsKey(reference.getName())) {
                 Reference ref = unresolvedBeanRef.get(reference.getName());
                 componentType.getReferences().add(createReference(reference, ref.getInterfaceContract()));
@@ -184,7 +180,7 @@ public class SpringImplementation extends ImplementationImpl implements Implemen
             }
         }
 
-        for (Property property : rtc.getProperties()) {
+        for (Property property : component.getProperties()) {
             if (unresolvedBeanRef.containsKey(property.getName())) {
                 componentType.getProperties().add(createProperty(property));
                 this.setPropertyClass(property.getName(), property.getClass());
@@ -252,4 +248,12 @@ public class SpringImplementation extends ImplementationImpl implements Implemen
         }
         return true;
     }
+
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("SpringImplementation [location=").append(location).append(", resource=").append(resource)
+            .append("]");
+        return builder.toString();
+    }
 }
diff --git a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyElement.java b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyElement.java
index 030364d9a0..8de3a4cbe1 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyElement.java
+++ b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyElement.java
@@ -33,6 +33,9 @@ public class SpringPropertyElement {
     private List<String> refs = new ArrayList<String>();
     private List<String> values = new ArrayList<String>();
 
+    public SpringPropertyElement() {
+    }
+
     public SpringPropertyElement(String name) {
         this.name = name;
     }
@@ -57,4 +60,12 @@ public class SpringPropertyElement {
         this.values.add(value);
     }
 
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("SpringPropertyElement [name=").append(name).append(", refs=").append(refs).append(", values=")
+            .append(values).append("]");
+        return builder.toString();
+    }
+
 } // end class SpringPropertyElement
diff --git a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAPropertyElement.java b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAPropertyElement.java
index 5b17d2f7d0..f27506f28b 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAPropertyElement.java
+++ b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAPropertyElement.java
@@ -28,6 +28,10 @@ public class SpringSCAPropertyElement {
     private String name;
     private String type;
 
+    public SpringSCAPropertyElement() {
+        super();
+    }
+
     public SpringSCAPropertyElement(String name, String type) {
         this.name = name;
         this.type = type;
@@ -49,4 +53,11 @@ public class SpringSCAPropertyElement {
         return type;
     }
 
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("SpringSCAPropertyElement [name=").append(name).append(", type=").append(type).append("]");
+        return builder.toString();
+    }
+
 } // end class SpringPropertyElement
diff --git a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAReferenceElement.java b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAReferenceElement.java
index a18758a1fa..74cd3f4290 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAReferenceElement.java
+++ b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAReferenceElement.java
@@ -39,6 +39,10 @@ public class SpringSCAReferenceElement {
     private List<Intent> intents = new ArrayList<Intent>();
     private List<PolicySet> policySets = new ArrayList<PolicySet>();
 
+    public SpringSCAReferenceElement() {
+
+    }
+
     public SpringSCAReferenceElement(String name, String type) {
         this.name = name;
         this.type = type;
@@ -76,4 +80,13 @@ public class SpringSCAReferenceElement {
         return policySets;
     }
 
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("SpringSCAReferenceElement [name=").append(name).append(", type=").append(type)
+            .append(", defaultBean=").append(defaultBean).append(", intents=").append(intents).append(", policySets=")
+            .append(policySets).append("]");
+        return builder.toString();
+    }
+
 } // end class SpringSCAReferenceElement
diff --git a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAServiceElement.java b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAServiceElement.java
index ef4bd3bfdf..181bd7a787 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAServiceElement.java
+++ b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAServiceElement.java
@@ -39,6 +39,10 @@ public class SpringSCAServiceElement {
     private List<Intent> intents = new ArrayList<Intent>();
     private List<PolicySet> policySets = new ArrayList<PolicySet>();
 
+    public SpringSCAServiceElement() {
+
+    }
+
     public SpringSCAServiceElement(String name, String target) {
         this.name = name;
         this.target = target;
@@ -76,4 +80,13 @@ public class SpringSCAServiceElement {
         return policySets;
     }
 
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("SpringSCAServiceElement [name=").append(name).append(", type=").append(type)
+            .append(", target=").append(target).append(", intents=").append(intents).append(", policySets=")
+            .append(policySets).append("]");
+        return builder.toString();
+    }
+
 } // end class SpringSCAServiceElement
diff --git a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanIntrospector.java b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanIntrospector.java
index f163a75581..5eaf27ab81 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanIntrospector.java
+++ b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanIntrospector.java
@@ -88,12 +88,6 @@ public class SpringBeanIntrospector {
             throw new ContributionResolveException(e);
         } // end try
 
-        /* List<Service> services = javaImplementation.getServices();
-        for (Service service : services) {
-            String name = service.getName();
-            System.out.println("Spring Bean: found service with name: " + name);
-        } // end for */
-
         return javaImplementation;
 
     } // end method introspectBean
diff --git a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanPojoProcessor.java b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanPojoProcessor.java
deleted file mode 100644
index 985b127adf..0000000000
--- a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanPojoProcessor.java
+++ /dev/null
@@ -1,664 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.implementation.spring.introspect;
-
-import static org.apache.tuscany.sca.implementation.java.introspect.JavaIntrospectionHelper.getAllInterfaces;
-import static org.apache.tuscany.sca.implementation.java.introspect.JavaIntrospectionHelper.getAllPublicAndProtectedFields;
-import static org.apache.tuscany.sca.implementation.java.introspect.JavaIntrospectionHelper.getAllUniquePublicProtectedMethods;
-import static org.apache.tuscany.sca.implementation.java.introspect.JavaIntrospectionHelper.getPrivateFields;
-import static org.apache.tuscany.sca.implementation.java.introspect.JavaIntrospectionHelper.toPropertyName;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Member;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Type;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.jws.WebService;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Contract;
-import org.apache.tuscany.sca.assembly.Multiplicity;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-import org.apache.tuscany.sca.implementation.java.JavaConstructorImpl;
-import org.apache.tuscany.sca.implementation.java.JavaElementImpl;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.implementation.java.JavaParameterImpl;
-import org.apache.tuscany.sca.implementation.java.introspect.BaseJavaClassVisitor;
-import org.apache.tuscany.sca.implementation.java.introspect.JavaIntrospectionHelper;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.AmbiguousConstructorException;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.InvalidServiceTypeException;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.NoConstructorException;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.Resource;
-import org.apache.tuscany.sca.implementation.spring.SpringConstructorArgElement;
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.interfacedef.util.JavaXMLMapper;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Heuristically evaluates an un-annotated Java implementation type to determine
- * services, references, and properties according to the algorithm described in
- * the SCA Java Client and Implementation Model Specification <p/> TODO
- * Implement: <p/> When no service interface is annotated, need to calculate a
- * single service comprising all public methods that are not reference or
- * property injection sites. If that service can be exactly mapped to an
- * interface implemented by the class then the service interface will be defined
- * in terms of that interface.
- * 
- * @version $Rev$ $Date$
- */
-public class SpringBeanPojoProcessor extends BaseJavaClassVisitor {
-    private List<SpringConstructorArgElement> conArgs;
-
-    public SpringBeanPojoProcessor(AssemblyFactory assemblyFactory,
-                                   JavaInterfaceFactory javaFactory,
-                                   List<SpringConstructorArgElement> conArgs) {
-        super(assemblyFactory);
-        this.javaInterfaceFactory = javaFactory;
-        this.conArgs = conArgs;
-    }
-
-    public SpringBeanPojoProcessor(ExtensionPointRegistry registry) {
-        super(registry);
-    }
-
-    @Override
-    public <T> void visitEnd(Class<T> clazz, JavaImplementation type) throws IntrospectionException {
-        List<org.apache.tuscany.sca.assembly.Service> services = type.getServices();
-        if (services.isEmpty()) {
-            // heuristically determine the service
-            /**
-             * The following is quoted from Java Specification 1.2.1.3. Introspecting services offered by a Java implementation
-             * In the cases described below, the services offered by a Java implementation class may be determined
-             * through introspection, eliding the need to specify them using @Service. The following algorithm is used 
-             * to determine how services are introspected from an implementation class:
-             * 
-             * If the interfaces of the SCA services are not specified with the @Service annotation on the 
-             * implementation class, it is assumed that all implemented interfaces that have been annotated 
-             * as @Remotable are the service interfaces provided by the component. If none of the implemented 
-             * interfaces is remotable, then by default the implementation offers a single service whose type 
-             * is the implementation class.
-             */
-            Set<Class<?>> interfaces = getAllInterfaces(clazz);
-            for (Class<?> i : interfaces) {
-                if (i.isAnnotationPresent(Remotable.class) || i.isAnnotationPresent(WebService.class)) {
-                    addService(type, i);
-                }
-            }
-            if (services.isEmpty()) {
-                // class is the interface
-                addService(type, clazz);
-            }
-        }
-        Set<Method> methods = getAllUniquePublicProtectedMethods(clazz, false);
-        if (!type.getReferenceMembers().isEmpty() || !type.getPropertyMembers().isEmpty()) {
-            // references and properties have been explicitly defined
-            //            if (type.getServices().isEmpty()) {
-            //                calculateServiceInterface(clazz, type, methods);
-            //                if (type.getServices().isEmpty()) {
-            //                    throw new ServiceTypeNotFoundException(clazz.getName());
-            //                }
-            //            }
-            evaluateConstructor(type, clazz);
-            return;
-        }
-        calcPropRefs(methods, services, type, clazz);
-        evaluateConstructor(type, clazz);
-    }
-
-    private void addService(JavaImplementation type, Class<?> clazz) throws IntrospectionException {
-        try {
-            org.apache.tuscany.sca.assembly.Service service = createService(clazz);
-            type.getServices().add(service);
-        } catch (InvalidInterfaceException e) {
-            throw new IntrospectionException(e);
-        }
-    }
-
-    private boolean isPublicSetter(Method method) {
-        return method.getParameterTypes().length == 1 && Modifier.isPublic(method.getModifiers())
-            && method.getName().startsWith("set")
-            && method.getReturnType() == void.class;
-    }
-
-    private boolean isProtectedSetter(Method method) {
-        return method.getParameterTypes().length == 1 && Modifier.isProtected(method.getModifiers())
-            && method.getName().startsWith("set")
-            && method.getReturnType() == void.class;
-    }
-
-    private <T> void calcPropRefs(Set<Method> methods,
-                                  List<org.apache.tuscany.sca.assembly.Service> services,
-                                  JavaImplementation type,
-                                  Class<T> clazz) throws IntrospectionException {
-        // heuristically determine the properties references
-        // make a first pass through all public methods with one param
-        Set<String> setters = new HashSet<String>();
-        Set<String> others = new HashSet<String>();
-        for (Method method : methods) {
-            if (!isPublicSetter(method)) {
-                continue;
-            }
-            if (method.isAnnotationPresent(Callback.class) || method.isAnnotationPresent(Context.class)) {
-                // Add the property name as others
-                others.add(toPropertyName(method.getName()));
-                continue;
-            }
-            if (!isInServiceInterface(method, services)) {
-                // Not part of the service interface
-                String name = toPropertyName(method.getName());
-                setters.add(name);
-                // avoid duplicate property or ref names
-                if (!type.getPropertyMembers().containsKey(name) && !type.getReferenceMembers().containsKey(name)) {
-                    Class<?> param = method.getParameterTypes()[0];
-                    Type genericType = method.getGenericParameterTypes()[0];
-                    if (isReferenceType(param, genericType)) {
-                        type.getReferences().add(createReference(name, param));
-                        type.getReferenceMembers().put(name, new JavaElementImpl(method, 0));
-                    } else {
-                        type.getProperties().add(createProperty(name, param));
-                        type.getPropertyMembers().put(name, new JavaElementImpl(method, 0));
-                    }
-                }
-            }
-        }
-        // second pass for protected methods with one param
-        for (Method method : methods) {
-            if (!isProtectedSetter(method)) {
-                continue;
-            }
-            if (method.isAnnotationPresent(Callback.class) || method.isAnnotationPresent(Context.class)) {
-                // Add the property name as others
-                others.add(toPropertyName(method.getName()));
-                continue;
-            }
-            Class<?> param = method.getParameterTypes()[0];
-            String name = toPropertyName(method.getName());
-            setters.add(name);
-            // avoid duplicate property or ref names
-            if (isReferenceType(param, method.getGenericParameterTypes()[0])) {
-                if (!type.getReferenceMembers().containsKey(name)) {
-                    type.getReferences().add(createReference(name, param));
-                    type.getReferenceMembers().put(name, new JavaElementImpl(method, 0));
-                }
-            } else {
-                if (!type.getPropertyMembers().containsKey(name)) {
-                    type.getProperties().add(createProperty(name, param));
-                    type.getPropertyMembers().put(name, new JavaElementImpl(method, 0));
-                }
-            }
-        }
-
-        // Public or protected fields unless there is a public or protected
-        // setter method
-        // for the same name
-        Set<Field> fields = getAllPublicAndProtectedFields(clazz, false);
-        for (Field field : fields) {
-            if (field.isAnnotationPresent(Callback.class) || field.isAnnotationPresent(Context.class)) {
-                continue;
-            }
-            if (setters.contains(field.getName()) || others.contains(field.getName())) {
-                continue;
-            }
-            String name = field.getName();
-            Class<?> paramType = field.getType();
-            if (isReferenceType(paramType, field.getGenericType())) {
-                if (!type.getReferenceMembers().containsKey(name)) {
-                    type.getReferences().add(createReference(name, paramType));
-                    type.getReferenceMembers().put(name, new JavaElementImpl(field));
-                }
-            } else {
-                if (!type.getPropertyMembers().containsKey(name)) {
-                    type.getProperties().add(createProperty(name, paramType));
-                    type.getPropertyMembers().put(name, new JavaElementImpl(field));
-                }
-            }
-        }
-
-        // Private fields unless there is a public or protected
-        // setter method for the same name
-        Set<Field> privateFields = getPrivateFields(clazz);
-        for (Field field : privateFields) {
-            if (field.isAnnotationPresent(Callback.class) || field.isAnnotationPresent(Context.class)) {
-                continue;
-            }
-            if (setters.contains(field.getName()) || others.contains(field.getName())) {
-                continue;
-            }
-            String name = field.getName();
-            Class<?> paramType = field.getType();
-            if (isReferenceType(paramType, field.getGenericType())) {
-                if (!type.getReferenceMembers().containsKey(name)) {
-                    type.getReferences().add(createReference(name, paramType));
-                    type.getReferenceMembers().put(name, new JavaElementImpl(field));
-                }
-            } else {
-                if (!type.getPropertyMembers().containsKey(name)) {
-                    type.getProperties().add(createProperty(name, paramType));
-                    type.getPropertyMembers().put(name, new JavaElementImpl(field));
-                }
-            }
-        }
-    }
-
-    /**
-     * Determines the constructor to use based on the component type's
-     * references and properties
-     * 
-     * @param type the component type
-     * @param clazz the implementation class corresponding to the component type
-     * @throws NoConstructorException if no suitable constructor is found
-     * @throws AmbiguousConstructorException if the parameters of a constructor
-     *             cannot be unambiguously mapped to references and properties
-     */
-    @SuppressWarnings("unchecked")
-    private <T> void evaluateConstructor(JavaImplementation type, Class<T> clazz) throws IntrospectionException {
-        // determine constructor if one is not annotated
-        JavaConstructorImpl<?> definition = type.getConstructor();
-        Map<String, JavaElementImpl> props = type.getPropertyMembers();
-        Map<String, JavaElementImpl> refs = type.getReferenceMembers();
-        Constructor constructor;
-        boolean explict = false;
-        if (definition != null && definition.getConstructor()
-            .isAnnotationPresent(org.oasisopen.sca.annotation.Constructor.class)) {
-            // the constructor was already defined explicitly
-            return;
-        } else if (definition != null) {
-            explict = true;
-            constructor = definition.getConstructor();
-        } else {
-            // no definition, heuristically determine constructor
-            Constructor[] constructors = clazz.getConstructors();
-            if (constructors.length == 0) {
-                throw new NoConstructorException("No public constructor for class");
-            } else if (constructors.length == 1) {
-                // Only one constructor, take it
-                constructor = constructors[0];
-            } else {
-                // multiple constructors scenario
-                Constructor<T> selected = null;
-                for (Constructor<T> ctor : constructors) {
-                    if (ctor.getParameterTypes().length == 0) {
-                        selected = ctor;
-                    } else if (ctor.getParameterTypes().length == conArgs.size()) {
-                        // we will find a constructor which has atleast one
-                        // reference or property as its parameter types.
-                        Class<?>[] parametersTypes = ctor.getParameterTypes();
-                        for (Class<?> pType : parametersTypes) {
-                            for (JavaElementImpl property : props.values()) {
-                                if (pType.equals(property.getType()))
-                                    selected = ctor;
-                            }
-                            for (JavaElementImpl reference : refs.values()) {
-                                if (pType.equals(reference.getType()))
-                                    selected = ctor;
-                            }
-                        }
-                    }
-                }
-                if (selected == null) {
-                    throw new NoConstructorException();
-                }
-                constructor = selected;
-            }
-            definition = type.getConstructors().get(constructor);
-            type.setConstructor(definition);
-        }
-
-        JavaParameterImpl[] parameters = definition.getParameters();
-        if (parameters.length == 0) {
-            return;
-        }
-
-        Annotation[][] annotations = constructor.getParameterAnnotations();
-        if (!explict) {
-            // the constructor wasn't defined by an annotation, so check to see
-            // if any of the params have an annotation
-            // which we can impute as explicitly defining the constructor, e.g.
-            // @Property, @Reference, or @Autowire
-            explict = injectionAnnotationsPresent(annotations);
-        }
-        if (explict) {
-            for (int i = 0; i < parameters.length; i++) {
-                if (isAnnotated(parameters[i])) {
-                    continue;
-                } else if (!findReferenceOrProperty(parameters[i], props, refs)) {
-                    throw new AmbiguousConstructorException(parameters[i].toString());
-                }
-            }
-        } else {
-            if (!areUnique(parameters)) {
-                throw new AmbiguousConstructorException("Cannot resolve non-unique parameter types, use @Constructor");
-            }
-            if (!calcPropRefUniqueness(props.values(), refs.values())) {
-                throw new AmbiguousConstructorException("Cannot resolve non-unique parameter types, use @Constructor");
-            }
-            if (!(props.isEmpty() && refs.isEmpty())) {
-                calcParamNames(parameters, props, refs);
-            } else {
-                heuristicParamNames(type, parameters);
-
-            }
-        }
-    }
-
-    private void calcParamNames(JavaParameterImpl[] parameters,
-                                Map<String, JavaElementImpl> props,
-                                Map<String, JavaElementImpl> refs) throws AmbiguousConstructorException {
-        // the constructor param types must unambiguously match defined
-        // reference or property types
-        for (JavaParameterImpl param : parameters) {
-            if (!findReferenceOrProperty(param, props, refs)) {
-                throw new AmbiguousConstructorException(param.getName());
-            }
-        }
-    }
-
-    private void heuristicParamNames(JavaImplementation type, JavaParameterImpl[] parameters)
-        throws IntrospectionException {
-        // heuristically determine refs and props from the parameter types
-        for (JavaParameterImpl p : parameters) {
-            String name = p.getType().getSimpleName().toLowerCase();
-            if (isReferenceType(p.getType(), p.getGenericType())) {
-                type.getReferences().add(createReference(name, p.getType()));
-                p.setClassifer(Reference.class);
-                type.getReferenceMembers().put(name, p);
-            } else {
-                type.getProperties().add(createProperty(name, p.getType()));
-                p.setClassifer(Property.class);
-                type.getPropertyMembers().put(name, p);
-            }
-            p.setName(name);
-        }
-    }
-
-    private static boolean areUnique(Class[] collection) {
-        Set<Class> set = new HashSet<Class>(Arrays.asList(collection));
-        return set.size() == collection.length;
-    }
-
-    /**
-     * Returns true if the union of the given collections of properties and
-     * references have unique Java types
-     */
-    private boolean calcPropRefUniqueness(Collection<JavaElementImpl> props, Collection<JavaElementImpl> refs) {
-
-        Class[] classes = new Class[props.size() + refs.size()];
-        int i = 0;
-        for (JavaElementImpl property : props) {
-            classes[i] = property.getType();
-            i++;
-        }
-        for (JavaElementImpl reference : refs) {
-            classes[i] = reference.getType();
-            i++;
-        }
-        return areUnique(classes);
-    }
-
-    /**
-     * Unambiguously finds the reference or property associated with the given
-     * type
-     * 
-     * @return the name of the reference or property if found, null if not
-     * @throws AmbiguousConstructorException if the constructor parameter cannot
-     *             be resolved to a property or reference
-     */
-    private boolean findReferenceOrProperty(JavaParameterImpl parameter,
-                                            Map<String, JavaElementImpl> props,
-                                            Map<String, JavaElementImpl> refs) throws AmbiguousConstructorException {
-
-        boolean found = false;
-        if (!"".equals(parameter.getName())) {
-            // Match by name
-            JavaElementImpl prop = props.get(parameter.getName());
-            if (prop != null && prop.getType() == parameter.getType()) {
-                parameter.setClassifer(Property.class);
-                return true;
-            }
-            JavaElementImpl ref = refs.get(parameter.getName());
-            if (ref != null && ref.getType() == parameter.getType()) {
-                parameter.setClassifer(Reference.class);
-                return true;
-            }
-        }
-        for (JavaElementImpl property : props.values()) {
-            if (property.getType() == parameter.getType()) {
-                if (found) {
-                    throw new AmbiguousConstructorException("Ambiguous property or reference for constructor type",
-                                                            (Member)parameter.getAnchor());
-                }
-                parameter.setClassifer(Property.class);
-                parameter.setName(property.getName());
-                found = true;
-                // do not break since ambiguities must be checked, i.e. more
-                // than one prop or ref of the same type
-            }
-        }
-        for (JavaElementImpl reference : refs.values()) {
-            if (reference.getType() == parameter.getType()) {
-                if (found) {
-                    throw new AmbiguousConstructorException("Ambiguous property or reference for constructor type",
-                                                            (Member)parameter.getAnchor());
-                }
-                parameter.setClassifer(Reference.class);
-                parameter.setName(reference.getName());
-                found = true;
-                // do not break since ambiguities must be checked, i.e. more
-                // than one prop or ref of the same type
-            }
-        }
-        return found;
-    }
-
-    /**
-     * Returns true if a given type is reference according to the SCA
-     * specification rules for determining reference types The following rules
-     * are used to determine whether an unannotated field or setter method is a
-     * property or reference:
-     * <ol>
-     * <li>If its type is simple, then it is a property.
-     * <li>If its type is complex, then if the type is an interface marked by
-     * 
-     * @Remotable, then it is a reference; otherwise, it is a property.
-     *             <li>Otherwise, if the type associated with the member is an
-     *             array or a java.util.Collection, the basetype is the element
-     *             type of the array or the parameterized type of the
-     *             Collection; otherwise the basetype is the member type. If the
-     *             basetype is an interface with an
-     * @Remotable or
-     * @Service annotation then the member is defined as a reference. Otherwise,
-     *          it is defined as a property.
-     *          </ol>
-     *          <p>
-     *          The name of the reference or of the property is derived from the
-     *          name found on the setter method or on the field.
-     */
-    private boolean isReferenceType(Class<?> cls, Type genericType) {
-        Class<?> baseType = JavaIntrospectionHelper.getBaseType(cls, genericType);
-        return baseType.isInterface() && baseType.isAnnotationPresent(Remotable.class);
-    }
-
-    /**
-     * Returns true if the given operation is defined in the collection of
-     * service interfaces
-     */
-    private boolean isInServiceInterface(Method operation, List<org.apache.tuscany.sca.assembly.Service> services) {
-        for (org.apache.tuscany.sca.assembly.Service service : services) {
-            Interface interface1 = service.getInterfaceContract().getInterface();
-            if (interface1 instanceof JavaInterface) {
-                Class<?> clazz = ((JavaInterface)interface1).getJavaClass();
-                if (isMethodMatched(clazz, operation)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Test if the class declares a method which matches the signature of the
-     * given method
-     * 
-     * @param clazz
-     * @param method
-     * @return
-     */
-    private boolean isMethodMatched(Class<?> clazz, Method method) {
-        if (method.getDeclaringClass() == clazz) {
-            return true;
-        }
-        Method[] methods = clazz.getMethods();
-        for (Method m : methods) {
-            if (JavaIntrospectionHelper.exactMethodMatch(method, m)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Creates a mapped property.
-     * 
-     * @param name the property name
-     * @param paramType the property type
-     */
-    private org.apache.tuscany.sca.assembly.Property createProperty(String name, Class<?> paramType) {
-        org.apache.tuscany.sca.assembly.Property property = assemblyFactory.createProperty();
-        property.setName(name);
-        property.setXSDType(JavaXMLMapper.getXMLType(paramType));
-        return property;
-    }
-
-    private boolean isAnnotated(JavaParameterImpl parameter) {
-        for (Annotation annotation : parameter.getAnnotations()) {
-            Class<? extends Annotation> annotType = annotation.annotationType();
-            if (annotType.equals(Property.class) || annotType.equals(Reference.class)
-                || annotType.equals(Resource.class)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public boolean areUnique(JavaParameterImpl[] parameters) {
-        Set<Class> set = new HashSet<Class>(parameters.length);
-        for (JavaParameterImpl p : parameters) {
-            if (!set.add(p.getType())) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    public org.apache.tuscany.sca.assembly.Reference createReference(String name, Class<?> paramType)
-        throws IntrospectionException {
-        org.apache.tuscany.sca.assembly.Reference reference = assemblyFactory.createReference();
-        reference.setName(name);
-        JavaInterfaceContract interfaceContract = javaInterfaceFactory.createJavaInterfaceContract();
-        reference.setInterfaceContract(interfaceContract);
-        try {
-            JavaInterface callInterface = javaInterfaceFactory.createJavaInterface(paramType);
-            reference.getInterfaceContract().setInterface(callInterface);
-            if (callInterface.getCallbackClass() != null) {
-                JavaInterface callbackInterface =
-                    javaInterfaceFactory.createJavaInterface(callInterface.getCallbackClass());
-                reference.getInterfaceContract().setCallbackInterface(callbackInterface);
-            }
-            reference.setMultiplicity(Multiplicity.ZERO_ONE);
-        } catch (InvalidInterfaceException e1) {
-            throw new IntrospectionException(e1);
-        }
-
-        // FIXME:  This part seems to have already been taken care above!!
-        try {
-            processCallback(paramType, reference);
-        } catch (InvalidServiceTypeException e) {
-            throw new IntrospectionException(e);
-        }
-        return reference;
-    }
-
-    public org.apache.tuscany.sca.assembly.Service createService(Class<?> interfaze) throws InvalidInterfaceException {
-        org.apache.tuscany.sca.assembly.Service service = assemblyFactory.createService();
-        service.setName(interfaze.getSimpleName());
-
-        JavaInterfaceContract interfaceContract = javaInterfaceFactory.createJavaInterfaceContract();
-        service.setInterfaceContract(interfaceContract);
-
-        JavaInterface callInterface = javaInterfaceFactory.createJavaInterface(interfaze);
-        service.getInterfaceContract().setInterface(callInterface);
-        if (callInterface.getCallbackClass() != null) {
-            JavaInterface callbackInterface =
-                javaInterfaceFactory.createJavaInterface(callInterface.getCallbackClass());
-            service.getInterfaceContract().setCallbackInterface(callbackInterface);
-        }
-
-        Interface javaInterface = service.getInterfaceContract().getInterface();
-        javaInterface.setRemotable(interfaze.getAnnotation(Remotable.class) != null);
-        service.getInterfaceContract().setInterface(javaInterface);
-        return service;
-    }
-
-    public void processCallback(Class<?> interfaze, Contract contract) throws InvalidServiceTypeException {
-        Callback callback = interfaze.getAnnotation(Callback.class);
-        if (callback != null && !Void.class.equals(callback.value())) {
-            Class<?> callbackClass = callback.value();
-            JavaInterface javaInterface;
-            try {
-                javaInterface = javaInterfaceFactory.createJavaInterface(callbackClass);
-                contract.getInterfaceContract().setCallbackInterface(javaInterface);
-            } catch (InvalidInterfaceException e) {
-                throw new InvalidServiceTypeException("Invalid callback interface " + callbackClass, interfaze);
-            }
-        } else if (callback != null && Void.class.equals(callback.value())) {
-            throw new InvalidServiceTypeException("No callback interface specified on annotation", interfaze);
-        }
-    }
-
-    public boolean injectionAnnotationsPresent(Annotation[][] annots) {
-        for (Annotation[] annotations : annots) {
-            for (Annotation annotation : annotations) {
-                Class<? extends Annotation> annotType = annotation.annotationType();
-                if (annotType.equals(Property.class) || annotType.equals(Reference.class)
-                    || annotType.equals(Resource.class)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-}
diff --git a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
index d25b0a9aea..2730ee3146 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
+++ b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
@@ -18,22 +18,6 @@
  */
 package org.apache.tuscany.sca.implementation.spring.introspect;
 
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-import static org.apache.tuscany.sca.implementation.spring.SpringImplementationConstants.BEAN_ELEMENT;
-import static org.apache.tuscany.sca.implementation.spring.SpringImplementationConstants.CONSTRUCTORARG_ELEMENT;
-import static org.apache.tuscany.sca.implementation.spring.SpringImplementationConstants.ENTRY_ELEMENT;
-import static org.apache.tuscany.sca.implementation.spring.SpringImplementationConstants.IMPORT_ELEMENT;
-import static org.apache.tuscany.sca.implementation.spring.SpringImplementationConstants.LIST_ELEMENT;
-import static org.apache.tuscany.sca.implementation.spring.SpringImplementationConstants.MAP_ELEMENT;
-import static org.apache.tuscany.sca.implementation.spring.SpringImplementationConstants.PROPERTY_ELEMENT;
-import static org.apache.tuscany.sca.implementation.spring.SpringImplementationConstants.REF_ELEMENT;
-import static org.apache.tuscany.sca.implementation.spring.SpringImplementationConstants.SCA_PROPERTY_ELEMENT;
-import static org.apache.tuscany.sca.implementation.spring.SpringImplementationConstants.SCA_REFERENCE_ELEMENT;
-import static org.apache.tuscany.sca.implementation.spring.SpringImplementationConstants.SCA_SERVICE_ELEMENT;
-import static org.apache.tuscany.sca.implementation.spring.SpringImplementationConstants.SET_ELEMENT;
-import static org.apache.tuscany.sca.implementation.spring.SpringImplementationConstants.VALUE_ELEMENT;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -57,18 +41,12 @@ import java.util.jar.Manifest;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
 import org.apache.tuscany.sca.assembly.AssemblyFactory;
 import org.apache.tuscany.sca.assembly.ComponentType;
 import org.apache.tuscany.sca.assembly.Multiplicity;
 import org.apache.tuscany.sca.assembly.Property;
 import org.apache.tuscany.sca.assembly.Reference;
 import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.assembly.xml.PolicySubjectProcessor;
 import org.apache.tuscany.sca.contribution.Artifact;
 import org.apache.tuscany.sca.contribution.ContributionFactory;
 import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
@@ -77,6 +55,7 @@ import org.apache.tuscany.sca.contribution.resolver.ClassReference;
 import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.core.FactoryExtensionPoint;
+import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.implementation.java.JavaConstructorImpl;
 import org.apache.tuscany.sca.implementation.java.JavaElementImpl;
 import org.apache.tuscany.sca.implementation.java.JavaImplementation;
@@ -88,6 +67,7 @@ import org.apache.tuscany.sca.implementation.spring.SpringPropertyElement;
 import org.apache.tuscany.sca.implementation.spring.SpringSCAPropertyElement;
 import org.apache.tuscany.sca.implementation.spring.SpringSCAReferenceElement;
 import org.apache.tuscany.sca.implementation.spring.SpringSCAServiceElement;
+import org.apache.tuscany.sca.implementation.spring.xml.SpringXMLBeanDefinitionLoader;
 import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
@@ -96,7 +76,6 @@ import org.apache.tuscany.sca.interfacedef.util.JavaXMLMapper;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
 import org.apache.tuscany.sca.monitor.Problem.Severity;
-import org.apache.tuscany.sca.policy.PolicyFactory;
 
 /**
  * Introspects a Spring XML application-context configuration file to create <implementation-spring../>
@@ -108,24 +87,22 @@ public class SpringXMLComponentTypeLoader {
     private final static Logger log = Logger.getLogger(SpringXMLComponentTypeLoader.class.getName());
 
     private ExtensionPointRegistry registry;
-    private XMLInputFactory xmlInputFactory;
     private ContributionFactory contributionFactory;
     private AssemblyFactory assemblyFactory;
     private JavaInterfaceFactory javaFactory;
-    private PolicyFactory policyFactory;
-    private PolicySubjectProcessor policyProcessor;
     private SpringBeanIntrospector beanIntrospector;
 
+    private SpringXMLBeanDefinitionLoader xmlBeanDefinitionLoader;
+
     public SpringXMLComponentTypeLoader(ExtensionPointRegistry registry) {
         super();
         this.registry = registry;
         FactoryExtensionPoint factories = registry.getExtensionPoint(FactoryExtensionPoint.class);
         this.assemblyFactory = factories.getFactory(AssemblyFactory.class);
         this.javaFactory = factories.getFactory(JavaInterfaceFactory.class);
-        this.policyFactory = factories.getFactory(PolicyFactory.class);
-        this.policyProcessor = new PolicySubjectProcessor(policyFactory);
         this.contributionFactory = factories.getFactory(ContributionFactory.class);
-        this.xmlInputFactory = factories.getFactory(XMLInputFactory.class);
+        this.xmlBeanDefinitionLoader =
+            registry.getExtensionPoint(UtilityExtensionPoint.class).getUtility(SpringXMLBeanDefinitionLoader.class);
     }
 
     /**
@@ -194,7 +171,6 @@ public class SpringXMLComponentTypeLoader {
      */
     private void loadFromXML(SpringImplementation implementation, ModelResolver resolver, ProcessorContext context)
         throws ContributionReadException {
-        XMLStreamReader reader;
         List<SpringBeanElement> beans = new ArrayList<SpringBeanElement>();
         List<SpringSCAServiceElement> services = new ArrayList<SpringSCAServiceElement>();
         List<SpringSCAReferenceElement> references = new ArrayList<SpringSCAReferenceElement>();
@@ -213,35 +189,27 @@ public class SpringXMLComponentTypeLoader {
             // The URI is used to uniquely identify the Implementation
             implementation.setURI(resource.toString());
 
-            for (URL contextResource : contextResources) {
-                List<SpringBeanElement> appCxtBeans = new ArrayList<SpringBeanElement>();
-                List<SpringSCAServiceElement> appCxtServices = new ArrayList<SpringSCAServiceElement>();
-                List<SpringSCAReferenceElement> appCxtReferences = new ArrayList<SpringSCAReferenceElement>();
-                List<SpringSCAPropertyElement> appCxtProperties = new ArrayList<SpringSCAPropertyElement>();
-                reader = xmlInputFactory.createXMLStreamReader(contextResource.openStream());
-                // Read the beans, services, references and properties for individual application context
-                Set<String> visited = new HashSet<String>();
-                readContextDefinition(resolver,
-                                      reader,
-                                      contextPath,
-                                      visited,
-                                      appCxtBeans,
-                                      appCxtServices,
-                                      appCxtReferences,
-                                      appCxtProperties,
-                                      context);
-                // Validate the beans from individual application context for uniqueness
-                validateBeans(appCxtBeans, appCxtServices, appCxtReferences, appCxtProperties, context.getMonitor());
-                // Add all the validated beans to the generic list
-                beans.addAll(appCxtBeans);
-                services.addAll(appCxtServices);
-                references.addAll(appCxtReferences);
-                scaproperties.addAll(appCxtProperties);
-                reader.close();
+            List<SpringBeanElement> appCxtBeans = new ArrayList<SpringBeanElement>();
+            List<SpringSCAServiceElement> appCxtServices = new ArrayList<SpringSCAServiceElement>();
+            List<SpringSCAReferenceElement> appCxtReferences = new ArrayList<SpringSCAReferenceElement>();
+            List<SpringSCAPropertyElement> appCxtProperties = new ArrayList<SpringSCAPropertyElement>();
+
+            if (xmlBeanDefinitionLoader != null) {
+                xmlBeanDefinitionLoader.load(contextResources,
+                                                   appCxtServices,
+                                                   appCxtReferences,
+                                                   appCxtProperties,
+                                                   appCxtBeans,
+                                                   context);
             }
-        } catch (IOException e) {
-            throw new ContributionReadException(e);
-        } catch (XMLStreamException e) {
+            // Validate the beans from individual application context for uniqueness
+            validateBeans(appCxtBeans, appCxtServices, appCxtReferences, appCxtProperties, context.getMonitor());
+            // Add all the validated beans to the generic list
+            beans.addAll(appCxtBeans);
+            services.addAll(appCxtServices);
+            references.addAll(appCxtReferences);
+            scaproperties.addAll(appCxtProperties);
+        } catch (Throwable e) {
             throw new ContributionReadException(e);
         }
 
@@ -283,319 +251,6 @@ public class SpringXMLComponentTypeLoader {
     }
 
     /**
-     * Method which returns the XMLStreamReader for the Spring application-context.xml file
-     * specified in the location attribute
-     */
-    private XMLStreamReader getApplicationContextReader(ModelResolver resolver,
-                                                        String location,
-                                                        ProcessorContext context) throws ContributionReadException {
-
-        try {
-            URL resource = getApplicationContextResource(resolveLocation(resolver, location, context)).get(0);
-            XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(resource.openStream());
-            return reader;
-        } catch (IOException e) {
-            throw new ContributionReadException(e);
-        } catch (XMLStreamException e) {
-            throw new ContributionReadException(e);
-        }
-    }
-    
-    /**
-     * Spring 2.0 bean xml definitions use DTD and there is no namespace for the elements 
-     * @param expected
-     * @param actual
-     * @return
-     */
-    private static boolean matches(QName expected, QName actual) {
-        return expected.equals(actual) || ("".equals(actual.getNamespaceURI()) && expected.getLocalPart().equals(actual.getLocalPart()));
-    }
-
-    /**
-     * Method which reads the spring context definitions from Spring application-context.xml
-     * file and identifies the defined beans, properties, services and references
-     * @param context 
-     */
-    private void readContextDefinition(ModelResolver resolver,
-                                       XMLStreamReader reader,
-                                       String contextPath,
-                                       Set<String> visited,
-                                       List<SpringBeanElement> beans,
-                                       List<SpringSCAServiceElement> services,
-                                       List<SpringSCAReferenceElement> references,
-                                       List<SpringSCAPropertyElement> scaproperties,
-                                       ProcessorContext context) throws ContributionReadException {
-
-        if (visited.contains(contextPath)) {
-            log.warning("Duplicate Spring bean definition file is skipped: " + contextPath);
-            return;
-        }
-        visited.add(contextPath);
-        SpringBeanElement bean = null;
-
-        try {
-            int level = 0;
-            while (level >= 0) {
-                switch (reader.next()) {
-                    case START_ELEMENT:
-                        level++;
-                        QName qname = reader.getName();
-                        //System.out.println("Spring TypeLoader - found element with name: " + qname.toString());
-                        if (matches(IMPORT_ELEMENT, qname)) {
-                            //FIXME - put the sequence of code below which gets the ireader into a subsidiary method
-                            String location = reader.getAttributeValue(null, "resource");
-                            if (location != null) {
-                                // FIXME - need to find a right way of generating this path
-                                String resourcePath =
-                                    contextPath.substring(0, contextPath.lastIndexOf("/") + 1) + location;
-                                XMLStreamReader ireader = getApplicationContextReader(resolver, resourcePath, context);
-                                // Read the context definition for the identified imported resource
-                                readContextDefinition(resolver, ireader, resourcePath, // The new context path
-                                                      visited,
-                                                      beans,
-                                                      services,
-                                                      references,
-                                                      scaproperties,
-                                                      context);
-                            }
-                        } else if (SCA_SERVICE_ELEMENT.equals(qname)) {
-                            // The value of the @name attribute of an <sca:service/> subelement of a <beans/> 
-                            // element MUST be unique amongst the <sca:service/> subelements of the <beans/> element.
-                            if (!services.isEmpty() && (services.contains(reader.getAttributeValue(null, "name"))))
-                                error(context.getMonitor(), "ScaServiceNameNotUnique", resolver);
-
-                            SpringSCAServiceElement service =
-                                new SpringSCAServiceElement(reader.getAttributeValue(null, "name"),
-                                                            reader.getAttributeValue(null, "target"));
-                            if (reader.getAttributeValue(null, "type") != null)
-                                service.setType(reader.getAttributeValue(null, "type"));
-                            policyProcessor.readPolicies(service, reader);
-                            services.add(service);
-                        } else if (SCA_REFERENCE_ELEMENT.equals(qname)) {
-                            // The value of the @name attribute of an <sca:reference/> subelement of a <beans/> 
-                            // element MUST be unique amongst the @name attributes of the <sca:reference/> subelements, 
-                            // of the <beans/> element.
-                            if (!references.isEmpty() && (references.contains(reader.getAttributeValue(null, "name"))))
-                                error(context.getMonitor(), "ScaReferenceNameNotUnique", resolver);
-
-                            SpringSCAReferenceElement reference =
-                                new SpringSCAReferenceElement(reader.getAttributeValue(null, "name"),
-                                                              reader.getAttributeValue(null, "type"));
-                            if (reader.getAttributeValue(null, "default") != null)
-                                reference.setDefaultBean(reader.getAttributeValue(null, "default"));
-                            policyProcessor.readPolicies(reference, reader);
-                            references.add(reference);
-                        } else if (SCA_PROPERTY_ELEMENT.equals(qname)) {
-                            // The value of the @name attribute of an <sca:property/> subelement of a <beans/> 
-                            // element MUST be unique amongst the @name attributes of the <sca:property/> subelements, 
-                            // of the <beans/> element.
-                            if (!scaproperties.isEmpty() && (scaproperties.contains(reader.getAttributeValue(null,
-                                                                                                             "name"))))
-                                error(context.getMonitor(), "ScaPropertyNameNotUnique", resolver);
-
-                            SpringSCAPropertyElement scaproperty =
-                                new SpringSCAPropertyElement(reader.getAttributeValue(null, "name"),
-                                                             reader.getAttributeValue(null, "type"));
-                            scaproperties.add(scaproperty);
-                        } else if (matches(BEAN_ELEMENT, qname)) {
-                            bean =
-                                new SpringBeanElement(reader.getAttributeValue(null, "id"),
-                                                      reader.getAttributeValue(null, "class"));
-                            if (reader.getAttributeValue(null, "abstract") != null)
-                                if (reader.getAttributeValue(null, "abstract").equals("true"))
-                                    bean.setAbstractBean(true);
-                            if (reader.getAttributeValue(null, "parent") != null)
-                                if (!reader.getAttributeValue(null, "parent").equals(""))
-                                    bean.setParentAttribute(true);
-                            if (reader.getAttributeValue(null, "factory-bean") != null)
-                                if (!reader.getAttributeValue(null, "factory-bean").equals(""))
-                                    bean.setFactoryBeanAttribute(true);
-                            if (reader.getAttributeValue(null, "factory-method") != null)
-                                if (!reader.getAttributeValue(null, "factory-method").equals(""))
-                                    bean.setFactoryMethodAttribute(true);
-                            // Set the first name as bean name, when the @id attribute is absent.
-                            if (reader.getAttributeValue(null, "id") == null) {
-                                if (reader.getAttributeValue(null, "name") != null) {
-                                    String[] names = (reader.getAttributeValue(null, "name")).split(",");
-                                    bean.setId(names[0]);
-                                }
-                            }
-                            beans.add(bean);
-                            if (log.isLoggable(Level.FINE)) {
-                                log.log(Level.FINE, "Adding Spring bean ..." + bean.getId() + " from " + contextPath);
-                            }
-                            // Read the <bean> element and its child elements
-                            readBeanDefinition(reader, bean, beans);
-                        } // end if
-                        
-                        // [rfeng] If it reaches end-element, proceed to the case END_ELEMENT test
-                        if (reader.getEventType() != END_ELEMENT) {
-                            break;
-                        }
-                    case END_ELEMENT:
-                        level--;
-                        if (level == 0) {
-                            // Now we are back the root element
-                            return;
-                        }
-                        break;
-                } // end switch
-            } // end while
-        } catch (XMLStreamException e) {
-            throw new ContributionReadException(e);
-        }
-    }
-
-    /**
-     * Method which reads the bean definitions from Spring application-context.xml file and identifies
-     * the defined beans, properties, services and references
-     */
-    private void readBeanDefinition(XMLStreamReader reader, SpringBeanElement bean, List<SpringBeanElement> beans)
-        throws ContributionReadException {
-
-        SpringBeanElement innerbean = null;
-        SpringPropertyElement property = null;
-        SpringConstructorArgElement constructorArg = null;
-
-        try {
-            int level = 0;
-            while (level >= 0) {
-                switch (reader.next()) {
-                    case START_ELEMENT:
-                        level++;
-                        QName qname = reader.getName();
-                        if (matches(BEAN_ELEMENT, qname)) {
-                            innerbean =
-                                new SpringBeanElement(reader.getAttributeValue(null, "id"),
-                                                      reader.getAttributeValue(null, "class"));
-                            // Set the first name as bean name, when the @id attribute is absent.
-                            if (reader.getAttributeValue(null, "id") == null) {
-                                if (reader.getAttributeValue(null, "name") != null) {
-                                    String[] names = (reader.getAttributeValue(null, "name")).split(",");
-                                    innerbean.setId(names[0]);
-                                }
-                            }
-                            innerbean.setInnerBean(true);
-                            beans.add(innerbean);
-                            readBeanDefinition(reader, innerbean, beans);
-                        } else if (matches(PROPERTY_ELEMENT, qname)) {
-                            property = new SpringPropertyElement(reader.getAttributeValue(null, "name"));
-                            if (reader.getAttributeValue(null, "ref") != null)
-                                property.addRef(reader.getAttributeValue(null, "ref"));
-                            bean.addProperty(property);
-                        } else if (matches(CONSTRUCTORARG_ELEMENT, qname)) {
-                            constructorArg = new SpringConstructorArgElement(reader.getAttributeValue(null, "type"));
-                            if (reader.getAttributeValue(null, "ref") != null)
-                                constructorArg.addRef(reader.getAttributeValue(null, "ref"));
-                            if (reader.getAttributeValue(null, "index") != null)
-                                constructorArg.setIndex((new Integer(reader.getAttributeValue(null, "index")))
-                                    .intValue());
-                            if (reader.getAttributeValue(null, "value") != null)
-                                constructorArg.addValue(reader.getAttributeValue(null, "value"));
-                            bean.addCustructorArgs(constructorArg);
-                        } else if (matches(REF_ELEMENT, qname)) {
-                            String ref = reader.getAttributeValue(null, "bean");
-                            // Check if the parent element is a property
-                            if (property != null)
-                                property.addRef(ref);
-                            // Check if the parent element is a constructor-arg
-                            if (constructorArg != null)
-                                constructorArg.addRef(ref);
-                        } else if (matches(VALUE_ELEMENT, qname)) {
-                            String value = reader.getElementText();
-                            // Check if the parent element is a constructor-arg
-                            if (constructorArg != null)
-                                constructorArg.addValue(value);
-                        } else if (matches(LIST_ELEMENT, qname) || matches(SET_ELEMENT, qname) || matches(MAP_ELEMENT, qname)) {
-                            if (property != null)
-                                readCollections(reader, bean, beans, property, null);
-                            if (constructorArg != null)
-                                readCollections(reader, bean, beans, null, constructorArg);
-                        } // end if
-                        // [rfeng] If it reaches end-element, proceed to the case END_ELEMENT test
-                        if (reader.getEventType() != END_ELEMENT) {
-                            break;
-                        }
-                    case END_ELEMENT:
-                        level--;
-                        break;
-                } // end switch
-            } // end while
-        } catch (XMLStreamException e) {
-            throw new ContributionReadException(e);
-        }
-    }
-
-    /**
-     * Method which reads the collection elements from Spring application-context.xml file and identifies
-     * the defined beans, list, maps and sets
-     */
-    private void readCollections(XMLStreamReader reader,
-                                 SpringBeanElement bean,
-                                 List<SpringBeanElement> beans,
-                                 SpringPropertyElement property,
-                                 SpringConstructorArgElement constructorArg) throws ContributionReadException {
-
-        SpringBeanElement innerbean = null;
-
-        try {
-            int level = 0;
-            while (level >= 0) {
-                switch (reader.next()) {
-                    case START_ELEMENT:
-                        level++;
-                        QName qname = reader.getName();
-                        if (matches(BEAN_ELEMENT, qname)) {
-                            innerbean =
-                                new SpringBeanElement(reader.getAttributeValue(null, "id"),
-                                                      reader.getAttributeValue(null, "class"));
-                            // Set the first name as bean name, when the @id attribute is absent.
-                            if (reader.getAttributeValue(null, "id") == null)
-                                if (reader.getAttributeValue(null, "name") != null) {
-                                    String[] names = (reader.getAttributeValue(null, "name")).split(",");
-                                    innerbean.setId(names[0]);
-                                }
-                            innerbean.setInnerBean(true);
-                            beans.add(innerbean);
-                            readBeanDefinition(reader, innerbean, beans);
-                        } else if (matches(REF_ELEMENT, qname)) {
-                            String ref = reader.getAttributeValue(null, "bean");
-                            if (property != null)
-                                property.addRef(ref);
-                            if (constructorArg != null)
-                                constructorArg.addRef(ref);
-                        } else if (matches(LIST_ELEMENT, qname) || matches(SET_ELEMENT, qname) || matches(MAP_ELEMENT, qname)) {
-                            if (property != null)
-                                readCollections(reader, innerbean, beans, property, null);
-                            if (constructorArg != null)
-                                readCollections(reader, innerbean, beans, null, constructorArg);
-                        } else if (matches(ENTRY_ELEMENT, qname)) {
-                            String keyRef = reader.getAttributeValue(null, "key-ref");
-                            String valueRef = reader.getAttributeValue(null, "value-ref");
-                            if (property != null) {
-                                property.addRef(keyRef);
-                                property.addRef(valueRef);
-                            }
-                            if (constructorArg != null) {
-                                constructorArg.addRef(keyRef);
-                                constructorArg.addRef(valueRef);
-                            }
-                        } // end if
-                        // [rfeng] If it reaches end-element, proceed to the case END_ELEMENT test
-                        if (reader.getEventType() != END_ELEMENT) {
-                            break;
-                        }
-                    case END_ELEMENT:
-                        level--;
-                        break;
-                } // end switch
-            } // end while
-        } catch (XMLStreamException e) {
-            throw new ContributionReadException(e);
-        }
-    }
-
-    /**
      * Generates the Spring implementation component type from the configuration contained in the
      * lists of beans, services, references and scaproperties derived from the application context
      */
@@ -643,7 +298,7 @@ public class SpringXMLComponentTypeLoader {
                 String beanName = serviceElement.getTarget();
                 for (SpringBeanElement beanElement : beans) {
                     if (beanName.equals(beanElement.getId())) {
-                        if (isvalidBeanForService(beanElement)) {
+                        if (isValidBeanForService(beanElement)) {
                             // add the required intents and policySets for the service
                             theService.getRequiredIntents().addAll(serviceElement.getRequiredIntents());
                             theService.getPolicySets().addAll(serviceElement.getPolicySets());
@@ -713,7 +368,7 @@ public class SpringXMLComponentTypeLoader {
                     SpringBeanElement beanElement = itb.next();
 
                     // If its not a valid bean for service, ignore it
-                    if (!isvalidBeanForService(beanElement)) {
+                    if (!isValidBeanForService(beanElement)) {
                         continue;
                     }
                     try {
@@ -746,9 +401,9 @@ public class SpringXMLComponentTypeLoader {
             itb = beans.iterator();
             while (itb.hasNext()) {
                 SpringBeanElement beanElement = itb.next();
-                
+
                 // If its not a valid bean for service, ignore it
-                if (!isvalidBeanForService(beanElement)) {
+                if (!isValidBeanForService(beanElement)) {
                     continue;
                 }
                 // Ignore if the bean has no properties and constructor arguments
@@ -794,7 +449,6 @@ public class SpringXMLComponentTypeLoader {
                                     break;
                                 } // end if
                             } // end for
-                            
 
                             // Store the unresolved references as unresolvedBeanRef in the Spring Implementation type
                             for (Property scaproperty : beanProperties) {
@@ -1015,7 +669,7 @@ public class SpringXMLComponentTypeLoader {
     /**
      * Validates whether a bean definition is valid for exposing as service.
      */
-    private boolean isvalidBeanForService(SpringBeanElement beanElement) {
+    private boolean isValidBeanForService(SpringBeanElement beanElement) {
 
         if (beanElement.isInnerBean())
             return false;
diff --git a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLLoaderStub.java b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLLoaderStub.java
deleted file mode 100644
index 01208aba19..0000000000
--- a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLLoaderStub.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.implementation.spring.introspect;
-
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.tuscany.sca.implementation.spring.SpringBeanElement;
-import org.apache.tuscany.sca.implementation.spring.SpringSCAPropertyElement;
-import org.apache.tuscany.sca.implementation.spring.SpringSCAReferenceElement;
-import org.apache.tuscany.sca.implementation.spring.SpringSCAServiceElement;
-
-/**
- * This is the Tuscany side stub for the corresponding runtime tie class.
- * It enables the Tuscany code to invoke methods on a Spring context without
- * needing to know about any Spring classes. See the SpringContextTie class
- * in the implementation-spring-runtime module for what the tie does. 
- */
-public class SpringXMLLoaderStub {
-    private final static String TIE = "org.apache.tuscany.sca.implementation.spring.processor.SpringXMLLoaderTie";
-
-    private static Method createApplicationContext;
-
-    public SpringXMLLoaderStub() throws Exception {
-        synchronized (SpringXMLLoaderStub.class) {
-            if (createApplicationContext == null) {
-                Class<?> tieClass = Class.forName(TIE, false, Thread.currentThread().getContextClassLoader());
-                createApplicationContext =
-                    tieClass.getMethod("createApplicationContext", Object.class, ClassLoader.class, List.class);
-            }
-        }
-    }
-
-    public Object createApplicationContext(Object scaParentContext, ClassLoader classLoader, List<URL> resources)
-        throws Exception {
-        return createApplicationContext.invoke(null, scaParentContext, classLoader, resources);
-    }
-
-    public void introspect(List<URL> resources,
-                           List<SpringSCAServiceElement> serviceElements,
-                           List<SpringSCAReferenceElement> referenceElements,
-                           List<SpringSCAPropertyElement> propertyElements,
-                           List<SpringBeanElement> beanElements) throws Exception {
-        Object appContext = createApplicationContext(null, Thread.currentThread().getContextClassLoader(), resources);
-        Class<?> cls = appContext.getClass();
-        Method method = cls.getMethod("getElements", Class.class);
-        SpringSCAServiceElement[] serviceArray =
-            (SpringSCAServiceElement[])method.invoke(appContext, SpringSCAServiceElement.class);
-        serviceElements.addAll(Arrays.asList(serviceArray));
-
-        SpringSCAReferenceElement[] referenceArray =
-            (SpringSCAReferenceElement[])method.invoke(appContext, SpringSCAReferenceElement.class);
-        referenceElements.addAll(Arrays.asList(referenceArray));
-
-        SpringSCAPropertyElement[] propertyArray =
-            (SpringSCAPropertyElement[])method.invoke(appContext, SpringSCAPropertyElement.class);
-        propertyElements.addAll(Arrays.asList(propertyArray));
-
-        SpringBeanElement[] beanArray = (SpringBeanElement[])method.invoke(appContext, SpringBeanElement.class);
-        beanElements.addAll(Arrays.asList(beanArray));
-    }
-}
diff --git a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ComponentTie.java b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ComponentTie.java
deleted file mode 100644
index 63e88f15a5..0000000000
--- a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ComponentTie.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.implementation.spring.invocation;
-
-/**
- * This is the Tuscany side tie for the corresponding Spring runtime side stub class.
- * It enables the Tuscany code to invoke methods on a Spring context without
- * needing to know about any Spring classes. See the ComponentStub class
- * in the implementation-spring-runtime module for what the stub does. 
- */
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-public class ComponentTie {
-
-    private RuntimeComponent component;
-
-    public ComponentTie(RuntimeComponent component) {
-        this.component = component;
-    }
-
-    public Object getService(Class<?> type, String name) {
-        return component.getComponentContext().getService(type, name);
-    }
-}
diff --git a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/PropertyValueTie.java b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/PropertyValueTie.java
deleted file mode 100644
index 2a1df9bcb5..0000000000
--- a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/PropertyValueTie.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.implementation.spring.invocation;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.ComponentProperty;
-import org.apache.tuscany.sca.context.PropertyValueFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * This is the Tuscany side tie for the corresponding Spring runtime side stub class.
- * It enables the Tuscany code to invoke methods on a Spring context without
- * needing to know about any Spring classes. See the PropertyValueStub class
- * in the implementation-spring-runtime module for what the stub does. 
- */
-public class PropertyValueTie {
-
-    private RuntimeComponent component;
-    private PropertyValueFactory propertyFactory;
-
-    public PropertyValueTie(RuntimeComponent component, PropertyValueFactory propertyFactory) {
-        this.component = component;
-        this.propertyFactory = propertyFactory;
-    }
-
-    public Object getPropertyObj(Class<?> type, String name) {
-        List<ComponentProperty> props = component.getProperties();
-        for (ComponentProperty prop : props) {
-            if (prop.getName().equals(name)) {
-                return propertyFactory.createPropertyValue(prop, type);
-            }
-        }
-        return null; // property name not found
-    }
-}
diff --git a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringApplicationContextAccessor.java b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringApplicationContextAccessor.java
deleted file mode 100644
index 3cdeb332b2..0000000000
--- a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringApplicationContextAccessor.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.implementation.spring.invocation;
-
-/**
- * A utility to receive the parent Spring application context 
- */
-public interface SpringApplicationContextAccessor {
-    /**
-     * Get the parent Spring application context for the hosting environment. This will be used as the parent 
-     * application context for implementation.spring components
-     * @return The parent application context
-     */
-    Object getParentApplicationContext();
-
-    /**
-     * Set the root Spring application context. This is particually useful for Spring web integration where Spring
-     * creates WebApplicationContext and keeps it in the ServletContext
-     * @param parentApplicationContext The parent application context
-     */
-    void setParentApplicationContext(Object parentApplicationContext);
-}
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/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringContextStub.java
deleted file mode 100644
index 2b5b5821c7..0000000000
--- a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringContextStub.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.implementation.spring.invocation;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.List;
-
-import org.apache.tuscany.sca.context.PropertyValueFactory;
-import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-import org.apache.tuscany.sca.implementation.spring.SpringImplementation;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * This is the Tuscany side stub for the corresponding runtime tie class.
- * It enables the Tuscany code to invoke methods on a Spring context without
- * needing to know about any Spring classes. See the SpringContextTie class
- * in the implementation-spring-runtime module for what the tie does. 
- */
-public class SpringContextStub {
-
-    private Object tie;
-    private Method startMethod;
-    private Method closeMethod;
-    private Method getBeanMethod;
-
-    public SpringContextStub(RuntimeComponent component,
-                             SpringImplementation implementation,
-                             Object parentApplicationContext,
-                             ProxyFactory proxyService,
-                             PropertyValueFactory propertyValueObjectFactory) {
-
-        initTie(component, implementation, parentApplicationContext, propertyValueObjectFactory);
-
-    }
-
-    private void initTie(RuntimeComponent component,
-                         SpringImplementation implementation,
-                         Object parentApplicationContext,
-                         PropertyValueFactory propertyValueObjectFactory) {
-
-        // TODO: what class loader to use?
-        ClassLoader cl = Thread.currentThread().getContextClassLoader();
-
-        try {
-
-            Class<?> stubClass =
-                Class.forName("org.apache.tuscany.sca.implementation.spring.runtime.context.SpringImplementationStub",
-                              true,
-                              cl);
-            Constructor<?> stubConstructor = stubClass.getConstructor(new Class<?>[] {Object.class});
-            Object stub =
-                stubConstructor.newInstance(new SpringImplementationTie(implementation, parentApplicationContext, component,
-                                                                        propertyValueObjectFactory));
-
-            Class<?> tieClass =
-                Class
-                    .forName("org.apache.tuscany.sca.implementation.spring.runtime.context.SpringContextTie", true, cl);
-            Constructor<?> tieConstructor = tieClass.getConstructor(new Class<?>[] {stubClass, List.class});
-            this.tie = tieConstructor.newInstance(stub, implementation.getResource());
-
-            this.startMethod = tieClass.getMethod("start");
-            this.closeMethod = tieClass.getMethod("close");
-            this.getBeanMethod = tieClass.getMethod("getBean", String.class);
-
-        } catch (ClassNotFoundException e) {
-            throw new RuntimeException(e);
-        } catch (SecurityException e) {
-            throw new RuntimeException(e);
-        } catch (NoSuchMethodException e) {
-            throw new RuntimeException(e);
-        } catch (IllegalArgumentException e) {
-            throw new RuntimeException(e);
-        } catch (InstantiationException e) {
-            throw new RuntimeException(e);
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
-        } catch (InvocationTargetException e) {
-            e.printStackTrace();
-            throw new RuntimeException(e);
-        }
-    }
-
-    public void start() {
-        try {
-            startMethod.invoke(tie);
-        } catch (IllegalArgumentException e) {
-            throw new RuntimeException(e);
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
-        } catch (InvocationTargetException e) {
-            e.printStackTrace();
-            throw new RuntimeException(e);
-        }
-    }
-
-    public void close() {
-        try {
-            closeMethod.invoke(tie);
-        } catch (IllegalArgumentException e) {
-            throw new RuntimeException(e);
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
-        } catch (InvocationTargetException e) {
-            e.printStackTrace();
-            throw new RuntimeException(e);
-        }
-    }
-
-    public Object getBean(String id) throws SpringInvocationException {
-        try {
-
-            return getBeanMethod.invoke(tie, id);
-
-        } catch (IllegalArgumentException e) {
-            throw new RuntimeException(e);
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
-        } catch (InvocationTargetException e) {
-            e.printStackTrace();
-            throw new RuntimeException(e);
-        }
-    }
-
-}
diff --git a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProvider.java b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProvider.java
deleted file mode 100644
index 1d71514721..0000000000
--- a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProvider.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.implementation.spring.invocation;
-
-import org.apache.tuscany.sca.context.PropertyValueFactory;
-import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-import org.apache.tuscany.sca.implementation.spring.SpringImplementation;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * A provider class for runtime Spring implementation instances
- * @version $Rev$ $Date$ 
- */
-public class SpringImplementationProvider implements ImplementationProvider {
-    private RuntimeComponent component;
-
-    // A Spring application context object
-    private SpringContextStub springContext;
-
-    /**
-     * Constructor for the provider - takes a component definition and a Spring implementation
-     * description
-     * @param component - the component in the assembly
-     * @param implementation - the implementation
-     */
-    public SpringImplementationProvider(RuntimeComponent component,
-                                        SpringImplementation implementation,
-                                        Object parentApplicationContext,
-                                        ProxyFactory proxyService,
-                                        PropertyValueFactory propertyValueObjectFactory) {
-        super();
-        this.component = component;
-
-        springContext = new SpringContextStub(component, implementation, parentApplicationContext, proxyService, propertyValueObjectFactory);
-
-    } // end constructor
-
-    public Invoker createInvoker(RuntimeComponentService service, Operation operation) {
-        return new SpringInvoker(component, springContext, service, operation);
-    }
-
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-    /**
-     * Start this Spring implementation instance
-     */
-    public void start() {
-        springContext.start();
-    }
-
-    /**
-     * Stop this implementation instance
-     */
-    public void stop() {
-        springContext.close();
-    }
-
-} // end class SpringImplementationProvider
diff --git a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProviderFactory.java b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProviderFactory.java
deleted file mode 100644
index 24533368ff..0000000000
--- a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProviderFactory.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.implementation.spring.invocation;
-
-import org.apache.tuscany.sca.context.PropertyValueFactory;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.core.invocation.ExtensibleProxyFactory;
-import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-import org.apache.tuscany.sca.implementation.spring.SpringImplementation;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.provider.ImplementationProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * ImplementationProviderFactory for Spring implementation type
- * @version $Rev$ $Date$ 
- *
- */
-public class SpringImplementationProviderFactory implements ImplementationProviderFactory<SpringImplementation> {
-    private ProxyFactory proxyFactory;
-    private PropertyValueFactory propertyFactory;
-    private SpringApplicationContextAccessor contextAccessor;
-
-    /**
-     * Simple constructor
-     *
-     */
-    public SpringImplementationProviderFactory(ExtensionPointRegistry registry) {
-        super();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        contextAccessor = utilities.getUtility(SpringApplicationContextAccessor.class);
-        proxyFactory = ExtensibleProxyFactory.getInstance(registry);
-        propertyFactory = utilities.getUtility(PropertyValueFactory.class);
-    }
-
-    /**
-     * Returns a SpringImplementationProvider for a given component and Spring implementation
-     * @param component the component for which implementation instances are required
-     * @param implementation the Spring implementation with details of the component
-     * implementation
-     * @return the SpringImplementationProvider for the specified component
-     */
-    public ImplementationProvider createImplementationProvider(RuntimeComponent component,
-                                                               SpringImplementation implementation) {
-        Object parentApplicationContext =
-            (contextAccessor != null) ? contextAccessor.getParentApplicationContext() : null;
-        return new SpringImplementationProvider(component, implementation, parentApplicationContext, proxyFactory,
-                                                propertyFactory);
-    }
-
-    /**
-     * Returns the class of the Spring implementation
-     */
-    public Class<SpringImplementation> getModelType() {
-        return SpringImplementation.class;
-    }
-
-} // end class SpringImplementationProviderFactory
diff --git a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java
deleted file mode 100644
index d8b7d0c285..0000000000
--- a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.implementation.spring.invocation;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.ComponentProperty;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.context.PropertyValueFactory;
-import org.apache.tuscany.sca.implementation.spring.SpringImplementation;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * This is the Tuscany side tie for the corresponding runtime stub class.
- * It enables the Sping code in the runtime module to invoke methods on a
- * Tuscany SpringImplementation without the Spring runtime module
- * needing to know about any Tuscany classes. See the SpringImplementationStub class
- * in the implementation-spring-runtime module for what the stub does. 
- */
-public class SpringImplementationTie {
-
-    private SpringImplementation implementation;
-    private Object parentApplicationContext;
-    private RuntimeComponent component;
-    private PropertyValueFactory propertyFactory;
-
-    public SpringImplementationTie(SpringImplementation implementation,
-                                   Object parentApplicationContext,
-                                   RuntimeComponent component,
-                                   PropertyValueFactory propertyFactory) {
-        this.implementation = implementation;
-        this.component = component;
-        this.propertyFactory = propertyFactory;
-        this.parentApplicationContext = parentApplicationContext;
-    }
-
-    public String getURI() {
-        return implementation.getURI();
-    }
-
-    public String getComponentName() {
-        return component.getName();
-    }
-
-    /**
-     * Method to create a Java Bean for a Property value
-     * @param <B> the class type of the Bean
-     * @param requiredType - a Class object for the required type
-     * @param name - the Property name
-     * @return - a Bean of the specified property, with value set
-     */
-    private <B> B getPropertyBean(Class<?> requiredType, String name) {
-        B propertyObject = null;
-        // Get the component's list of properties
-        List<ComponentProperty> props = component.getProperties();
-        for (ComponentProperty prop : props) {
-            if (prop.getName().equals(name)) {
-                // On finding the property, create a factory for it and create a Bean using
-                // the factory
-                propertyObject = (B) propertyFactory.createPropertyValue(prop, requiredType);
-            } // end if
-        } // end for
-
-        return propertyObject;
-    }
-
-    /**
-     * Creates a proxy Bean for a reference
-     * @param <B> the Business interface type for the reference
-     * @param businessInterface - the business interface as a Class
-     * @param referenceName - the name of the Reference
-     * @return an Bean of the type defined by <B>
-     */
-    private <B> B getService(Class<B> businessInterface, String referenceName) {
-        return component.getComponentContext().getService(businessInterface, referenceName);
-    }
-
-    /**
-     * Get a Bean for a reference or for a property.
-     *
-     * @param name - the name of the Bean required
-     * @param requiredType - the required type of the Bean (either a Java class or a Java interface)
-     * @return Object - a Bean which matches the requested bean
-     */
-    public Object getBean(String name, Class<?> requiredType) {
-        // The expectation is that the requested Bean is either a reference or a property
-        // from the Spring context
-        for (Reference reference : implementation.getReferences()) {
-            if (reference.getName().equals(name)) {
-                // Extract the Java interface for the reference (it can't be any other interface type
-                // for a Spring application context)
-                if (requiredType == null) {
-                    JavaInterface javaInterface = (JavaInterface)reference.getInterfaceContract().getInterface();
-                    requiredType = javaInterface.getJavaClass();
-                }
-                // Create and return the proxy for the reference
-                return getService(requiredType, reference.getName());
-            } // end if
-        } // end for
-
-        // For a property, get the name and the required Java type and create a Bean
-        // of that type with the value inserted.
-        for (Property property : implementation.getProperties()) {
-            if (property.getName().equals(name)) {
-                if (requiredType == null) {
-                    // The following code only deals with a subset of types and was superceded
-                    // by the information from the implementation (which uses Classes as found
-                    // in the Spring implementation itself.
-                    //requiredType = JavaXMLMapper.getJavaType( property.getXSDType() );
-                    requiredType = implementation.getPropertyClass(name);
-                }
-                return getPropertyBean(requiredType, property.getName());
-            } // end if
-        } // end for
-          // TODO: NoSuchBeanException
-        // throw new RuntimeException("Unable to find Bean with name " + name);
-        return null;
-
-    } // end method getBean( String, Class )
-
-    public Object getComponentTie() {
-        return new ComponentTie(component);
-    }
-
-    public Object getPropertyValueTie() {
-        return new PropertyValueTie(component, propertyFactory);
-    }
-
-    public ClassLoader getClassLoader() {
-        return implementation.getClassLoader();
-    }
-    
-    public Object getParentApplicationContext() {
-        return parentApplicationContext;
-    }
-
-}
diff --git a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvocationException.java b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvocationException.java
deleted file mode 100644
index dbc6f6f687..0000000000
--- a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvocationException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.implementation.spring.invocation;
-
-/**
- * @version $Rev$ $Date$
- */
-public class SpringInvocationException extends Exception {
-
-    private static final long serialVersionUID = -1157790036638157513L;
-
-    public SpringInvocationException(String msg) {
-        super(msg);
-    }
-
-    public SpringInvocationException(Throwable e) {
-        super(e);
-    }
-
-    public SpringInvocationException(String msg, Throwable e) {
-        super(msg, e);
-    }
-
-}
diff --git a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvoker.java b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvoker.java
deleted file mode 100644
index fc0642cdb1..0000000000
--- a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvoker.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.implementation.spring.invocation;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.sca.implementation.spring.SpringBeanElement;
-import org.apache.tuscany.sca.implementation.spring.SpringImplementation;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceUtil;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * Initial implementation of a Spring bean invoker
- * @version $Rev$ $Date$ 
- */
-public class SpringInvoker implements Invoker {
-
-    private Method theMethod = null;
-    private Object bean;
-    private SpringBeanElement beanElement;
-    private boolean badInvoker = false;
-
-    private SpringContextStub springContext;
-    private Operation operation;
-
-    /**
-     * SpringInvoker constructor
-     * @param component - the Spring component to invoke
-     * @param service - the service to invoke
-     * @param operation - the operation to invoke
-     */
-    public SpringInvoker(RuntimeComponent component,
-                         SpringContextStub springContext,
-                         RuntimeComponentService service,
-                         Operation operation) {
-
-        this.springContext = springContext;
-        this.operation = operation;
-
-        // From the component and the service, identify the Spring Bean which is the target
-        SpringImplementation theImplementation = (SpringImplementation)component.getImplementation();
-        beanElement = theImplementation.getBeanFromService(service.getService());
-
-        if (beanElement == null) {
-            badInvoker = true;
-            return;
-        }
-
-    } // end constructor SpringInvoker
-
-    // Lazy-load the method to avoid timing problems with the Spring Context
-    private void setupMethod() throws SpringInvocationException {
-        try {
-            bean = springContext.getBean(beanElement.getId());
-            Class<?> beanClass = bean.getClass();
-            theMethod = JavaInterfaceUtil.findMethod(beanClass, operation);
-            //System.out.println("SpringInvoker - found method " + theMethod.getName() );
-        } catch (NoSuchMethodException e) {
-            throw new SpringInvocationException(e);
-        }
-    }
-
-    private Object doInvoke(Object payload) throws SpringInvocationException {
-        if (theMethod == null)
-            setupMethod();
-
-        if (badInvoker)
-            throw new SpringInvocationException("Spring invoker incorrectly configured");
-        // Invoke the method on the Spring bean using the payload, returning the results
-        try {
-            Object ret;
-
-            if (payload != null && !payload.getClass().isArray()) {
-                ret = theMethod.invoke(bean, payload);
-            } else {
-                ret = theMethod.invoke(bean, (Object[])payload);
-            }
-            return ret;
-        } catch (InvocationTargetException e) {
-            throw new SpringInvocationException("Spring invoker invoke method '" + theMethod.getName() + "' error.",
-                                                e.getCause());
-        } catch (Exception e) {
-            throw new SpringInvocationException("Spring invoker invoke method '" + theMethod.getName() + "' error.", e);
-        }
-
-    } // end method doInvoke
-
-    /**
-     * @param msg the message to invoke on the target bean
-     */
-    public Message invoke(Message msg) {
-        try {
-            Object resp = doInvoke(msg.getBody());
-            msg.setBody(resp);
-        } catch (SpringInvocationException e) {
-            msg.setFaultBody(e.getCause());
-        } catch (Throwable e) {
-            msg.setFaultBody(e);
-        }
-        //System.out.println("Spring Invoker - invoke called");
-        return msg;
-    } // end method invoke
-
-} // end class SpringInvoker
diff --git a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLBeanDefinitionLoader.java b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLBeanDefinitionLoader.java
new file mode 100644
index 0000000000..a3dc353ffc
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLBeanDefinitionLoader.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.implementation.spring.xml;
+
+import java.net.URL;
+import java.util.List;
+
+import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
+import org.apache.tuscany.sca.implementation.spring.SpringBeanElement;
+import org.apache.tuscany.sca.implementation.spring.SpringSCAPropertyElement;
+import org.apache.tuscany.sca.implementation.spring.SpringSCAReferenceElement;
+import org.apache.tuscany.sca.implementation.spring.SpringSCAServiceElement;
+
+/**
+ * The utility interface to load Spring XML bean definitions into an application context 
+ */
+public interface SpringXMLBeanDefinitionLoader {
+    /**
+     * @param resources
+     * @param serviceElements
+     * @param referenceElements
+     * @param propertyElements
+     * @param beanElements
+     * @param context
+     * @return
+     */
+    Object load(List<URL> resources,
+                List<SpringSCAServiceElement> serviceElements,
+                List<SpringSCAReferenceElement> referenceElements,
+                List<SpringSCAPropertyElement> propertyElements,
+                List<SpringBeanElement> beanElements,
+                ProcessorContext context);
+}