Refactoring Spring module

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

38 files changed, 2145 insertions, 3614 deletions

diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java
deleted file mode 100644
index b550fc3229..0000000000
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.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;
-
-import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.core.io.Resource;
-
-/**
- * An <code>ApplicationContext</code> specialization that registers namespace
- * handlers for SCA elements - in particular the <service/>, <reference/> and
- * <property/> elements which are provided as SCA extensions to the Spring
- * application context schema
- * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $
- */
-public class SCAApplicationContext extends AbstractXmlApplicationContext {
-    public static final String APP_CONTEXT_PROP = "org.springframework.sca.application.context";
-    private Resource appXml;
-
-    public SCAApplicationContext(ApplicationContext parent, Resource appXml) {
-        super(parent);
-        this.appXml = appXml;
-        //refresh();
-    }
-
-    @Override
-    protected void initBeanDefinitionReader(XmlBeanDefinitionReader beanDefinitionReader) {
-        ClassLoader cl = getClassLoader();
-        beanDefinitionReader.setNamespaceHandlerResolver(new SCANamespaceHandlerResolver(cl));
-    }
-
-    @Override
-    protected Resource[] getConfigResources() {
-        return new Resource[] {appXml};
-    }
-}
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java
deleted file mode 100644
index 32f575fe46..0000000000
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.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;
-
-import org.springframework.beans.factory.xml.DefaultNamespaceHandlerResolver;
-import org.springframework.beans.factory.xml.NamespaceHandler;
-
-/**
- * Overrides the default Spring namespace resolver to automatically register
- * {@link ScaNamespaceHandler} instead of requiring a value to be supplied in a
- * Spring configuration
- * 
- * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $
- */
-public class SCANamespaceHandlerResolver extends DefaultNamespaceHandlerResolver {
-    private static final String SCA_NAMESPACE = "http://www.springframework.org/schema/sca";
-
-    private ScaNamespaceHandler handler;
-
-    public SCANamespaceHandlerResolver(ClassLoader classLoader) {
-        super(classLoader);
-        handler = new ScaNamespaceHandler(/*componentType*/);
-    }
-
-    public SCANamespaceHandlerResolver(String handlerMappingsLocation, ClassLoader classLoader) {
-        super(classLoader, handlerMappingsLocation);
-        handler = new ScaNamespaceHandler(/*componentType*/);
-    }
-
-    @Override
-    public NamespaceHandler resolve(String namespaceUri) {
-        if (SCA_NAMESPACE.equals(namespaceUri)) {
-            return handler;
-        }
-        return super.resolve(namespaceUri);
-    }
-}
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java
deleted file mode 100644
index d419d6db68..0000000000
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java
+++ /dev/null
@@ -1,271 +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;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-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.core.factory.ObjectFactory;
-import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationEvent;
-import org.springframework.context.MessageSourceResolvable;
-import org.springframework.context.NoSuchMessageException;
-import org.springframework.core.io.Resource;
-
-/**
- * A Spring ParentApplicationContext for a given Spring Implementation
- *
- * The Parent application context is responsible for handling those entities within a Spring
- * application context that actually belong to SCA rather than to Spring.  The principal things
- * are Properties and References.  These may be present either through explicit <sca:property/>
- * and <sca:reference/> elements in the application context or they may be implicit through
- * unresolved Spring bean <property.../> elements.  In either case, it is the Parent application
- * context that must provide Spring beans that correspond to the property or reference, as derived
- * from the SCA composite in which the Spring application context is an implementation.
- *
- * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $
- */
-class SCAParentApplicationContext implements ApplicationContext {
-
-    // The Spring implementation for which this is the parent application context
-    private SpringImplementation implementation;
-    private RuntimeComponent component;
-    private JavaPropertyValueObjectFactory propertyFactory;
-
-    private static final String[] EMPTY_ARRAY = new String[0];
-
-    public SCAParentApplicationContext(RuntimeComponent component,
-                                       SpringImplementation implementation,
-                                       ProxyFactory proxyService,
-                                       JavaPropertyValueObjectFactory propertyValueObjectFactory) {
-        this.implementation = implementation;
-        this.component = component;
-        this.propertyFactory = propertyValueObjectFactory;
-    } // end constructor
-
-    public Object getBean(String name) throws BeansException {
-        return getBean(name, (Class) null);
-    }
-
-    /**
-     * 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) throws BeansException {
-        System.out.println("Spring parent context - getBean called for name: " + name);
-        // 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
-        throw new NoSuchBeanDefinitionException("Unable to find Bean with name " + name);
-
-    } // end method getBean( String, Class )
-
-    public Object getBean(String name, Object[] args) throws BeansException {
-         return getBean(name, ((Class)null));
-    }
-
-    /**
-     * 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);
-    }
-
-    /**
-     * 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
-                ObjectFactory factory = propertyFactory.createValueFactory(prop, prop.getValue(), requiredType);
-                propertyObject = (B)factory.getInstance();
-            } // end if
-        } // end for
-
-        return propertyObject;
-    }
-
-    public boolean containsBean(String name) {
-        // TODO
-        System.out.println("Spring parent context - containsBean called for name: " + name);
-        return false;
-    }
-
-    public boolean isSingleton(String name) throws NoSuchBeanDefinitionException {
-        // TODO
-        return false;
-    }
-
-    public boolean isTypeMatch(String name, Class targetType) throws NoSuchBeanDefinitionException {
-        throw new UnsupportedOperationException();
-    }
-
-    public Class getType(String name) throws NoSuchBeanDefinitionException {
-        return null;
-    }
-
-    public String[] getAliases(String name) throws NoSuchBeanDefinitionException {
-        return EMPTY_ARRAY;
-    }
-
-    public ApplicationContext getParent() {
-        return null;
-    }
-
-    public AutowireCapableBeanFactory getAutowireCapableBeanFactory() throws IllegalStateException {
-        return null;
-    }
-
-    public String getId() {
-          return this.toString();
-    }
-
-    public String getDisplayName() {
-        return implementation.getURI();
-    }
-
-    public long getStartupDate() {
-        return 0;
-    }
-
-    public boolean containsBeanDefinition(String beanName) {
-        return false;
-    }
-
-    public int getBeanDefinitionCount() {
-        return 0;
-    }
-
-    public String[] getBeanDefinitionNames() {
-        return new String[0];
-    }
-
-    public String[] getBeanNamesForType(Class type) {
-        return new String[0];
-    }
-
-    public String[] getBeanNamesForType(Class type, boolean includePrototypes, boolean includeFactoryBeans) {
-        return new String[0];
-    }
-
-    public Map getBeansOfType(Class type) throws BeansException {
-        return null;
-    }
-
-    public Map getBeansOfType(Class type, boolean includePrototypes, boolean includeFactoryBeans) throws BeansException {
-        return null;
-    }
-
-    public boolean isPrototype(String theString) {
-        return false;
-    }
-
-    public BeanFactory getParentBeanFactory() {
-        return null;
-    }
-
-    public boolean containsLocalBean(String name) {
-        return false;
-    }
-
-    public String getMessage(String code, Object[] args, String defaultMessage, Locale locale) {
-        return null;
-    }
-
-    public String getMessage(String code, Object[] args, Locale locale) throws NoSuchMessageException {
-        return null;
-    }
-
-    public String getMessage(MessageSourceResolvable resolvable, Locale locale) throws NoSuchMessageException {
-        return null;
-    }
-
-    public void publishEvent(ApplicationEvent event) {
-
-    }
-
-    public Resource[] getResources(String locationPattern) throws IOException {
-        return new Resource[0];
-    }
-
-    public Resource getResource(String location) {
-        return null;
-    }
-
-    public ClassLoader getClassLoader() {
-        // REVIEW: this is almost certainly flawed, but it's not clear how the SCA runtime's
-        // resource loading mechanism is exposed right now.
-        return this.getClass().getClassLoader();
-    }
-}
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java
deleted file mode 100644
index 45f00ce1af..0000000000
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2002-2006 the original author or authors.
- *
- * Licensed 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;
-
-import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
-
-/**
- * Handler for the &lt;sca:&gt; namespace in an application context
- * 
- * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $
- */
-public class ScaNamespaceHandler extends NamespaceHandlerSupport {
-
-    public ScaNamespaceHandler() {
-        init();
-    }
-
-    public final void init() {
-        registerBeanDefinitionParser("reference", new ScaReferenceBeanDefinitionParser());
-        registerBeanDefinitionParser("service", new ScaServiceBeanDefinitionParser());
-        registerBeanDefinitionParser("property", new ScaPropertyBeanDefinitionParser());
-    }
-
-}
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java
deleted file mode 100644
index dc532ce20d..0000000000
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2002-2006 the original author or authors.
- * 
- * Licensed 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;
-
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.xml.BeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Parser for the &lt;sca:reference&gt; element
- * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $
- */
-public class ScaPropertyBeanDefinitionParser implements BeanDefinitionParser {
-
-    public BeanDefinition parse(Element element, ParserContext parserContext) {
-        // do nothing, this is handled by Tuscany
-        return null;
-    }
-
-}
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java
deleted file mode 100644
index 1dd44cd752..0000000000
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2002-2006 the original author or authors.
- * 
- * Licensed 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;
-
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.xml.BeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Parser for the &lt;sca:reference&gt; element
- *
- * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $
- */
-public class ScaReferenceBeanDefinitionParser implements BeanDefinitionParser {
-
-    public BeanDefinition parse(Element element, ParserContext parserContext) {
-        // do nothing, this is handled by Tuscany
-        return null;
-    }
-
-}
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java
deleted file mode 100644
index 9dadcd2f49..0000000000
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2002-2006 the original author or authors.
- * 
- * Licensed 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;
-
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.xml.BeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Parser for the &lt;sca:service/&gt; element
- *
- * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $
- */
-public class ScaServiceBeanDefinitionParser implements BeanDefinitionParser {
-
-    public BeanDefinition parse(Element element, ParserContext parserContext) {
-        // do nothing, handled by Tuscany
-        return null;
-    }
-
-}
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanElement.java
index 629a72e22d..86902e5104 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java
+++ b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanElement.java
@@ -1,76 +1,76 @@
-/*
- * 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.util.ArrayList;
-import java.util.List;
-
-/**
- * Represents a <bean> element in a Spring application-context
- * - this has id and className attributes
- * - plus zero or more property elements as children
- *
- * @version $Rev: 512919 $ $Date: 2007-02-28 19:32:56 +0000 (Wed, 28 Feb 2007) $
- */
-public class SpringBeanElement {
-
-    private String id;
-    private String className;
-    private boolean innerBean = false;
-    private List<SpringPropertyElement> properties = new ArrayList<SpringPropertyElement>();
-    private List<SpringConstructorArgElement> constructorargs = new ArrayList<SpringConstructorArgElement>();
-
-    public SpringBeanElement(String id, String className) {
-        this.id = id;
-        this.className = className;
-    }
-
-    public String getClassName() {
-        return className;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public List<SpringPropertyElement> getProperties() {
-        return properties;
-    }
-
-    public void addProperty(SpringPropertyElement property) {
-        properties.add(property);
-    }
-    
-    public List<SpringConstructorArgElement> getCustructorArgs() {
-        return constructorargs;
-    }
-
-    public void addCustructorArgs(SpringConstructorArgElement args) {
-        constructorargs.add(args);
-    }
-    
-    public boolean isInnerBean() {
-        return innerBean;
-    }
-    
-    public void setInnerBean(boolean innerBean) {
-        this.innerBean = innerBean;
-    }
-
-} // end class SpringBeanElement
+/*

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

+

+import java.util.ArrayList;

+import java.util.List;

+

+/**

+ * Represents a <bean> element in a Spring application-context

+ * - this has id and className attributes

+ * - plus zero or more property elements as children

+ *

+ * @version $Rev: 512919 $ $Date: 2007-02-28 19:32:56 +0000 (Wed, 28 Feb 2007) $

+ */

+public class SpringBeanElement {

+

+    private String id;

+    private String className;

+    private boolean innerBean = false;

+    private List<SpringPropertyElement> properties = new ArrayList<SpringPropertyElement>();

+    private List<SpringConstructorArgElement> constructorargs = new ArrayList<SpringConstructorArgElement>();

+

+    public SpringBeanElement(String id, String className) {

+        this.id = id;

+        this.className = className;

+    }

+

+    public String getClassName() {

+        return className;

+    }

+

+    public String getId() {

+        return id;

+    }

+

+    public List<SpringPropertyElement> getProperties() {

+        return properties;

+    }

+

+    public void addProperty(SpringPropertyElement property) {

+        properties.add(property);

+    }

+    

+    public List<SpringConstructorArgElement> getCustructorArgs() {

+        return constructorargs;

+    }

+

+    public void addCustructorArgs(SpringConstructorArgElement args) {

+        constructorargs.add(args);

+    }

+    

+    public boolean isInnerBean() {

+        return innerBean;

+    }

+    

+    public void setInnerBean(boolean innerBean) {

+        this.innerBean = innerBean;

+    }

+

+} // end class SpringBeanElement

diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java
deleted file mode 100644
index 35df76fabc..0000000000
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.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;
-
-/**
- * @version $Rev$ $Date$
- */
-public class SpringBeanNotFoundException extends Exception {
-
-    private static final long serialVersionUID = -1157790036638157553L;
-
-    public SpringBeanNotFoundException(String msg) {
-        super(msg);
-    }
-    
-    public SpringBeanNotFoundException(Throwable e) {
-        super(e);
-    }
-    
-    public SpringBeanNotFoundException(String msg, Throwable e) {
-        super(msg,e);
-    }
-}
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringConstructorArgElement.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringConstructorArgElement.java
index 553b3d33dd..b644a69c15 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringConstructorArgElement.java
+++ b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringConstructorArgElement.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations

  * under the License.

  */

-package org.apache.tuscany.sca.implementation.spring.xml;

+package org.apache.tuscany.sca.implementation.spring;

 

 import java.util.ArrayList;

 import java.util.List;

diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
deleted file mode 100644
index 6f22567070..0000000000
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
+++ /dev/null
@@ -1,227 +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;
-
-import java.util.Hashtable;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.assembly.Extensible;
-import org.apache.tuscany.sca.assembly.Implementation;
-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.impl.ImplementationImpl;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.assembly.builder.ComponentPreProcessor;
-import org.apache.tuscany.sca.implementation.spring.xml.SpringBeanElement;
-import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.springframework.core.io.Resource;
-
-/**
- * Represents a Spring implementation.
- * 
- * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $ 
- */
-public class SpringImplementation extends ImplementationImpl implements Implementation, ComponentPreProcessor, Extensible {
-
-    // The location attribute which points to the Spring application-context XML file
-    private String location;
-    // The application-context file as a Spring Resource
-    private Resource resource;
-    private ComponentType componentType;
-    // Mapping of Services to Beans
-    private Hashtable<String, SpringBeanElement> serviceMap;
-    // Mapping of property names to Java class
-    private Hashtable<String, Class> propertyMap;
-    private List<PolicyHandlerTuple> policyHandlerClassNames = null;
-    // List of unresolved bean property references
-    private Hashtable<String, Reference> unresolvedBeanRef;
-
-    protected SpringImplementation() {
-        this.location = null;
-        this.resource = null;
-        setUnresolved(true);
-        serviceMap = new Hashtable<String, SpringBeanElement>();
-        propertyMap = new Hashtable<String, Class>();
-        unresolvedBeanRef = new Hashtable<String, Reference>();
-    } // end method SpringImplementation
-
-    /* Returns the location attribute for this Spring implementation */
-    public String getLocation() {
-        return location;
-    }
-
-    /**
-     * Sets the location attribute for this Spring implementation
-     * location - a URI to the Spring application-context file
-     */
-    public void setLocation(String location) {
-        this.location = location;
-        return;
-    }
-
-    public void setResource(Resource resource) {
-        this.resource = resource;
-    }
-
-    public Resource getResource() {
-        return resource;
-    }
-
-    /* 
-     * Returns the componentType for this Spring implementation 
-     */
-    public ComponentType getComponentType() {
-        return componentType;
-    }
-
-    /*
-     * Sets the componentType for this Spring implementation
-     */
-    public void setComponentType(ComponentType componentType) {
-        this.componentType = componentType;
-    }
-
-    @Override
-    public List<Service> getServices() {
-        return componentType.getServices();
-    }
-
-    @Override
-    public List<Reference> getReferences() {
-        return componentType.getReferences();
-    }
-
-    @Override
-    public List<Property> getProperties() {
-        return componentType.getProperties();
-    }
-
-    /**
-     * Returns the Spring Bean which implements a particular service
-     * @param service the service
-     * @return the bean which implements the service, as a SpringBeanElement
-     */
-    public SpringBeanElement getBeanFromService(Service service) {
-        SpringBeanElement theBean = serviceMap.get(service.getName());
-        return theBean;
-    }
-
-    /**
-     * Sets the mapping from a service to the Spring Bean that implements the service
-     * @param service the service
-     * @param theBean a SpringBeanElement for the Bean implementing the service
-     */
-    public void setBeanForService(Service service, SpringBeanElement theBean) {
-        serviceMap.put(service.getName(), theBean);
-    }
-
-    /**
-     * Add a mapping from a SCA property name to a Java class for the property
-     * @param propertyName
-     * @param propertyClass
-     */
-    public void setPropertyClass(String propertyName, Class propertyClass) {
-        if (propertyName == null || propertyClass == null)
-            return;
-        propertyMap.put(propertyName, propertyClass);
-        return;
-    } // end method setPropertyClass
-
-    /**
-     * Gets the Java Class for an SCA property 
-     * @param propertyName - the property name
-     * @return - a Class object for the type of the property
-     */
-    public Class getPropertyClass(String propertyName) {
-        return propertyMap.get(propertyName);
-    } // end method getPropertyClass
-    
-    public void setUnresolvedBeanRef(String refName, Reference reference) {
-        if (refName == null || reference == null)
-            return;
-        unresolvedBeanRef.put(refName, reference);
-        return;
-    } // end method setUnresolvedBeanRef
-    
-    public Reference getUnresolvedBeanRef(String refName) {
-        return unresolvedBeanRef.get(refName);
-    } // end method getUnresolvedBeanRef
-    
-    public List<PolicyHandlerTuple> getPolicyHandlerClassNames() {
-        return policyHandlerClassNames;
-    }
-
-    public void setPolicyHandlerClassNames(List<PolicyHandlerTuple> policyHandlerClassNames) {
-        this.policyHandlerClassNames = policyHandlerClassNames;
-    } // end method setPolicyHandlerClassNames
-    
-    
-    /**
-     * Use preProcess to validate and map the references and properties dynamically 
-     */
-    public void preProcess(Component component) {
-        if (!(component instanceof RuntimeComponent))
-            return;
-        
-        RuntimeComponent rtc = (RuntimeComponent) component;
-        
-        for (Reference reference : rtc.getReferences()) {
-            if (unresolvedBeanRef.containsKey(reference.getName())) {
-            	Reference ref = unresolvedBeanRef.get(reference.getName());
-            	componentType.getReferences().add(
-            			createReference(reference, ref.getInterfaceContract()));
-            	unresolvedBeanRef.remove(reference.getName());
-            }
-        }
-
-        for (Property property : rtc.getProperties()) {
-        	if (unresolvedBeanRef.containsKey(property.getName())) {        		
-        		componentType.getProperties().add(createProperty(property));
-        		this.setPropertyClass(property.getName(), property.getClass());
-        		unresolvedBeanRef.remove(property.getName());
-            }
-        }      
-    }
-    
-    protected Reference createReference(Reference reference, InterfaceContract interfaze) {
-        Reference newReference;
-        try {
-            newReference = (Reference)reference.clone();
-            if (newReference.getInterfaceContract() == null)
-            	newReference.setInterfaceContract(interfaze);
-        } catch (CloneNotSupportedException e) {
-            throw new AssertionError(e); // should not ever happen
-        }
-        return newReference;
-    }
-    
-    protected Property createProperty(Property property) {
-        Property newProperty;
-        try {
-            newProperty = (Property)property.clone();
-        } catch (CloneNotSupportedException e) {
-            throw new AssertionError(e); // should not ever happen
-        }
-        return newProperty;
-    }
-}
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/Constants.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationConstants.java
index 92f980fdfe..339e753c04 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/Constants.java
+++ b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationConstants.java
@@ -17,14 +17,14 @@
  * under the License.    

  */

 

-package org.apache.tuscany.sca.implementation.spring.xml;

+package org.apache.tuscany.sca.implementation.spring;

 

 import javax.xml.namespace.QName;

 

 /**

  * Constants used in Spring Application Context XML files.

  */

-public interface Constants {

+public interface SpringImplementationConstants {

     

     String SCA_NS = "http://www.springframework.org/schema/sca";

     String SPRING_NS = "http://www.springframework.org/schema/beans";

diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java
deleted file mode 100644
index 88358732ed..0000000000
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java
+++ /dev/null
@@ -1,201 +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;
-
-import java.util.List;
-import java.util.Iterator;
-
-import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.context.support.FileSystemXmlApplicationContext;
-import org.apache.tuscany.sca.implementation.spring.processor.InitDestroyAnnotationProcessor;
-import org.apache.tuscany.sca.implementation.spring.processor.ReferenceAnnotationProcessor;
-import org.apache.tuscany.sca.implementation.spring.processor.PropertyAnnotationProcessor;
-import org.apache.tuscany.sca.implementation.spring.processor.ConstructorAnnotationProcessor;
-import org.apache.tuscany.sca.implementation.spring.processor.ComponentNameAnnotationProcessor;
-import org.springframework.beans.factory.config.BeanPostProcessor; 
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.ConstructorArgumentValues;
-import org.springframework.beans.factory.config.TypedStringValue;
-import org.springframework.beans.factory.support.ManagedList;
-
-/**
- * A provider class for runtime Spring implementation instances
- * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $ 
- */
-public class SpringImplementationProvider implements ImplementationProvider {
-    private RuntimeComponent component;
-    
-    // A Spring application context object
-    private AbstractApplicationContext springContext;
-    
-    private SpringImplementation implementation;
-    
-    private JavaPropertyValueObjectFactory propertyValueObjectFactory;
-
-    /**
-     * 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,
-                                        ProxyFactory proxyService,
-                                        JavaPropertyValueObjectFactory propertyValueObjectFactory,
-                                        List<PolicyHandlerTuple> policyHandlerClassNames) {
-        super();
-        this.implementation = implementation;
-        this.component = component;
-        this.propertyValueObjectFactory = propertyValueObjectFactory;
-        this.implementation.setPolicyHandlerClassNames(policyHandlerClassNames);
-        
-        SCAParentApplicationContext scaParentContext =
-            new SCAParentApplicationContext(component, implementation, proxyService, propertyValueObjectFactory);
-        //springContext = new SCAApplicationContext(scaParentContext, implementation.getResource());        
-        
-        XmlBeanFactory beanFactory = new XmlBeanFactory(implementation.getResource());
-        springContext = createApplicationContext(beanFactory, scaParentContext);        
-        
-    } // 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() {
-        // Do refresh here to ensure that Spring Beans are not touched before the SCA config process 
-        // is complete...
-        springContext.refresh();
-        springContext.start();
-        // System.out.println("SpringImplementationProvider: Spring context started");
-    } // end method start()
-
-    /**
-     * Stop this implementation instance
-     */
-    public void stop() {
-        // TODO - complete
-    	springContext.close();
-    	if (springContext instanceof GenericApplicationContext)
-    		springContext.stop();
-        //System.out.println("SpringImplementationProvider: Spring context stopped");
-    } // end method stop
-    
-    
-    /**
-     * Include BeanPostProcessor to deal with SCA Annotations in Spring Bean
-     */
-    private void includeAnnotationProcessors(ConfigurableListableBeanFactory beanFactory) {
-    	
-    	// Processor to deal with @Init and @Destroy SCA Annotations
-    	BeanPostProcessor initDestroyProcessor = new InitDestroyAnnotationProcessor();
-        beanFactory.addBeanPostProcessor(initDestroyProcessor);
-        
-        // Processor to deal with @Reference SCA Annotations
-        BeanPostProcessor referenceProcessor = new ReferenceAnnotationProcessor(component);
-        beanFactory.addBeanPostProcessor(referenceProcessor);
-        
-        // Processor to deal with @Property SCA Annotations
-        BeanPostProcessor propertyProcessor = new PropertyAnnotationProcessor(propertyValueObjectFactory, component);
-        beanFactory.addBeanPostProcessor(propertyProcessor);
-        
-        // Processor to deal with @ComponentName SCA Annotations
-        BeanPostProcessor componentNameProcessor = new ComponentNameAnnotationProcessor(component);
-        beanFactory.addBeanPostProcessor(componentNameProcessor);
-        
-        // Processor to deal with @Constructor SCA Annotations
-        BeanPostProcessor constructorProcessor = new ConstructorAnnotationProcessor();
-        beanFactory.addBeanPostProcessor(constructorProcessor);    	
-    }
-    
-    
-    /**
-     * Include BeanPostProcessor to deal with SCA Annotations in Spring Bean
-     */
-    private AbstractApplicationContext createApplicationContext(XmlBeanFactory beanFactory,
-    															SCAParentApplicationContext scaParentContext) {
-    	AbstractApplicationContext appContext = null;
-    	
-    	for (String bean : beanFactory.getBeanDefinitionNames()) {
-    		String beanClassName = (beanFactory.getType(bean)).getName();
-    		if (beanClassName.indexOf(".ClassPathXmlApplicationContext") != -1 || 
-    				beanClassName.indexOf(".FileSystemXmlApplicationContext") != -1) 
-    		{
-    			BeanDefinition beanDef = beanFactory.getBeanDefinition(bean);    			
-    			String[] listValues = null;
-    			List<ConstructorArgumentValues.ValueHolder> conArgs = 
-    				beanDef.getConstructorArgumentValues().getGenericArgumentValues();
-    			for (ConstructorArgumentValues.ValueHolder conArg : conArgs) {
-    				if (conArg.getValue() instanceof TypedStringValue) {
-	    				TypedStringValue value = (TypedStringValue) conArg.getValue();
-	    				if (value.getValue().indexOf(".xml") != -1)
-	    					listValues = new String[]{value.getValue()};
-	    			}
-	    			if (conArg.getValue() instanceof ManagedList) {
-	    				Iterator itml = ((ManagedList)conArg.getValue()).iterator();
-	    				StringBuffer values = new StringBuffer();
-	    				while (itml.hasNext()) {
-	    					TypedStringValue next = (TypedStringValue)itml.next();
-	    					if (next.getValue().indexOf(".xml") != -1) {
-	    						values.append(next.getValue());
-	    						values.append("~");
-	    					}
-	    				}
-	    				listValues = (values.toString()).split("~");	    				
-	    			}
-    			}
-    			
-    			if (beanClassName.indexOf(".ClassPathXmlApplicationContext") != -1) {    				    				
-    				appContext = new ClassPathXmlApplicationContext(listValues, false, scaParentContext);    				
-    				//includeAnnotationProcessors(appContext.getBeanFactory());
-					return appContext;
-    			} else {
-    				appContext = new FileSystemXmlApplicationContext(listValues, false, scaParentContext);    				
-    				//includeAnnotationProcessors(appContext.getBeanFactory());
-					return appContext;
-    			}
-    		}    		
-    	}
-    	
-    	// use the generic application context as default 
-        includeAnnotationProcessors(beanFactory);
-        appContext = new GenericApplicationContext(beanFactory, scaParentContext);
-        return appContext;
-    }
-    
-} // end class SpringImplementationProvider
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyElement.java
index c60fdb86a9..c6637d31c4 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java
+++ b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyElement.java
@@ -1,61 +1,61 @@
-/*
- * 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.util.ArrayList;
-import java.util.List;
-
-/**
- * Represents a <property> element in a Spring application-context
- * - this has name and ref attributes
- * 
- * @version $Rev: 512919 $ $Date: 2007-02-28 19:32:56 +0000 (Wed, 28 Feb 2007) $
- */
-public class SpringPropertyElement {
-
-    private String name;
-    private String ref;
-    private List<String> values = new ArrayList<String>();
-
-    public SpringPropertyElement(String name, String ref) {
-        this.name = name;
-        this.ref = ref;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getRef() {
-        return ref;
-    }
-    
-    public void setRef(String ref) {
-        this.ref = ref;
-    }
-    
-    public List<String> getValues() {
-        return this.values;
-    }
-
-    public void addValue(String value) {
-        this.values.add(value);
-    }
-
-} // end class SpringPropertyElement
+/*

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

+

+import java.util.ArrayList;

+import java.util.List;

+

+/**

+ * Represents a <property> element in a Spring application-context

+ * - this has name and ref attributes

+ * 

+ * @version $Rev: 512919 $ $Date: 2007-02-28 19:32:56 +0000 (Wed, 28 Feb 2007) $

+ */

+public class SpringPropertyElement {

+

+    private String name;

+    private String ref;

+    private List<String> values = new ArrayList<String>();

+

+    public SpringPropertyElement(String name, String ref) {

+        this.name = name;

+        this.ref = ref;

+    }

+

+    public String getName() {

+        return name;

+    }

+

+    public String getRef() {

+        return ref;

+    }

+    

+    public void setRef(String ref) {

+        this.ref = ref;

+    }

+    

+    public List<String> getValues() {

+        return this.values;

+    }

+

+    public void addValue(String value) {

+        this.values.add(value);

+    }

+

+} // end class SpringPropertyElement

diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java
deleted file mode 100644
index 3f98180498..0000000000
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java
+++ /dev/null
@@ -1,45 +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;
-
-import org.apache.tuscany.sca.databinding.Mediator;
-import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;
-
-/**
- *
- * Factory class for PropertyValueObjects for Spring implementations
- *
- * 6th May 2007: Chosen a very simple design for this class - since Spring implementations are a form
- * of Java POJO, the simple design chosen for this class is to re-use the PropertyValueObjectFactory
- * implementation from the base implementation-java-runtime package of Tuscany SCA Java, since the
- * same properties are going to be rendered in the same way to simple Tuscany POJOs and to Spring
- * Bean POJOs.  Mike Edwards
- * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $ 
- */
-public class SpringPropertyValueObjectFactory extends JavaPropertyValueObjectFactory {
-
-    /**
-     * Constructor simply defers to the superclass, along with the complete implementation...
-     */
-    public SpringPropertyValueObjectFactory(Mediator mediator) {
-        super(mediator);
-    } // end constructor JavaPropertyValueObjectFactory(Mediator mediator)
-
-} // end class SpringPropertyValueObjectFactory
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAPropertyElement.java
index 2f37ab6504..c666217777 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java
+++ b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAPropertyElement.java
@@ -1,52 +1,52 @@
-/*
- * 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;
-
-/**
- * Represents an <sca:property> element in a Spring application-context
- * - this has name and type attributes
- * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $ 
- */
-public class SpringSCAPropertyElement {
-
-    private String name;
-    private String type;
-
-    public SpringSCAPropertyElement(String name, String type) {
-        this.name = name;
-        this.type = type;
-    }
-    
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-    
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-} // end class SpringPropertyElement
+/*

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

+

+/**

+ * Represents an <sca:property> element in a Spring application-context

+ * - this has name and type attributes

+ * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $ 

+ */

+public class SpringSCAPropertyElement {

+

+    private String name;

+    private String type;

+

+    public SpringSCAPropertyElement(String name, String type) {

+        this.name = name;

+        this.type = type;

+    }

+    

+    public void setName(String name) {

+        this.name = name;

+    }

+

+    public String getName() {

+        return name;

+    }

+    

+    public void setType(String type) {

+        this.type = type;

+    }

+

+    public String getType() {

+        return type;

+    }

+

+} // end class SpringPropertyElement

diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAReferenceElement.java
index b3f45415fd..5b6206ef9b 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java
+++ b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAReferenceElement.java
@@ -1,54 +1,54 @@
-/*
- * 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;
-
-/**
- * Represents a <sca:reference> element in a Spring application-context
- * - this has id and className attributes
- * - plus zero or more property elements as children
- *
- * @version $Rev: 512919 $ $Date: 2007-02-28 19:32:56 +0000 (Wed, 28 Feb 2007) $
- */
-public class SpringSCAReferenceElement {
-
-    private String name;
-    private String type;
-
-    public SpringSCAReferenceElement(String name, String type) {
-        this.name = name;
-        this.type = type;
-    }
-    
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-    
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-} // end class SpringSCAReferenceElement
+/*

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

+

+/**

+ * Represents a <sca:reference> element in a Spring application-context

+ * - this has id and className attributes

+ * - plus zero or more property elements as children

+ *

+ * @version $Rev: 512919 $ $Date: 2007-02-28 19:32:56 +0000 (Wed, 28 Feb 2007) $

+ */

+public class SpringSCAReferenceElement {

+

+    private String name;

+    private String type;

+

+    public SpringSCAReferenceElement(String name, String type) {

+        this.name = name;

+        this.type = type;

+    }

+    

+    public void setName(String name) {

+        this.name = name;

+    }

+

+    public String getName() {

+        return name;

+    }

+    

+    public void setType(String type) {

+        this.type = type;

+    }

+

+    public String getType() {

+        return type;

+    }

+

+} // end class SpringSCAReferenceElement

diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAServiceElement.java
index 2eb5686270..774bc051d3 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java
+++ b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAServiceElement.java
@@ -1,64 +1,64 @@
-/*
- * 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;
-
-/**
- * Represents a <sca:service> element in a Spring application-context
- * - this has id and className attributes
- * - plus zero or more property elements as children
- *
- * @version $Rev: 512919 $ $Date: 2007-02-28 19:32:56 +0000 (Wed, 28 Feb 2007) $
- */
-public class SpringSCAServiceElement {
-
-    private String name;
-    private String type;
-    private String target;
-
-    public SpringSCAServiceElement(String name, String type, String target) {
-        this.name = name;
-        this.type = type;
-        this.target = target;
-    }
-    
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-    
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getType() {
-        return type;
-    }
-    
-    public void setTarget(String target) {
-        this.target = target;
-    }
-
-    public String getTarget() {
-        return target;
-    }
-
-} // end class SpringSCAServiceElement
+/*

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

+

+/**

+ * Represents a <sca:service> element in a Spring application-context

+ * - this has id and className attributes

+ * - plus zero or more property elements as children

+ *

+ * @version $Rev: 512919 $ $Date: 2007-02-28 19:32:56 +0000 (Wed, 28 Feb 2007) $

+ */

+public class SpringSCAServiceElement {

+

+    private String name;

+    private String type;

+    private String target;

+

+    public SpringSCAServiceElement(String name, String type, String target) {

+        this.name = name;

+        this.type = type;

+        this.target = target;

+    }

+    

+    public void setName(String name) {

+        this.name = name;

+    }

+

+    public String getName() {

+        return name;

+    }

+    

+    public void setType(String type) {

+        this.type = type;

+    }

+

+    public String getType() {

+        return type;

+    }

+    

+    public void setTarget(String target) {

+        this.target = target;

+    }

+

+    public String getTarget() {

+        return target;

+    }

+

+} // end class SpringSCAServiceElement

diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanIntrospector.java
index 5b6cfcab5b..de137e3d9c 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java
+++ b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanIntrospector.java
@@ -1,133 +1,135 @@
-/*
- * 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.util.List;
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFactory;
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
-import org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.BaseJavaClassVisitor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.ComponentNameProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.ConstructorProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.ContextProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.DestroyProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.EagerInitProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.InitProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.PolicyProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.PropertyProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.ReferenceProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.ResourceProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.ServiceProcessor;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-
-/**
- * Provides introspection functions for Spring beans
- * This version leans heavily on the implementation-java classes
- *
- * @version $Rev: 512919 $ $Date: 2007-02-28 19:32:56 +0000 (Wed, 28 Feb 2007) $
- */
-public class SpringBeanIntrospector {
-
-    private JavaImplementationFactory javaImplementationFactory;
-
-    /**
-     * The constructor sets up the various visitor elements that will be used to introspect
-     * the Spring bean and extract SCA information.
-     *
-     * @param assemblyFactory The Assembly Factory to use
-     * @param javaFactory The Java Interface Factory to use
-     * @param policyFactory The Policy Factory to use.
-     */
-    public SpringBeanIntrospector(AssemblyFactory assemblyFactory,
-                                  JavaInterfaceFactory javaFactory,
-                                  PolicyFactory policyFactory,
-                                  List<SpringConstructorArgElement> conArgs) {
-
-        javaImplementationFactory = new DefaultJavaImplementationFactory();
-        
-        // Create the list of class visitors
-        BaseJavaClassVisitor[] extensions =
-            new BaseJavaClassVisitor[] {
-                                        new ConstructorProcessor(assemblyFactory),
-                                        new ComponentNameProcessor(assemblyFactory),
-                                        new ContextProcessor(assemblyFactory),
-                                        new DestroyProcessor(assemblyFactory),
-                                        new EagerInitProcessor(assemblyFactory),
-                                        new InitProcessor(assemblyFactory),
-                                        new PropertyProcessor(assemblyFactory),
-                                        new ReferenceProcessor(assemblyFactory, javaFactory),
-                                        new ResourceProcessor(assemblyFactory),
-                                        new ServiceProcessor(assemblyFactory, javaFactory),
-                                        new SpringBeanPojoProcessor(assemblyFactory, javaFactory, conArgs),
-                                        new PolicyProcessor(assemblyFactory, policyFactory)};
-        for (JavaClassVisitor extension : extensions) {
-            javaImplementationFactory.addClassVisitor(extension);
-        }
-
-    } // end constructor 
-
-    /**
-     * Introspect a Spring Bean and extract the features important to SCA
-     * @param beanClass the Spring Bean class to introspect
-     * @param componentType the componentType that is filled in through the introspection
-     * process (assumed empty on invocation, filled on return
-     * @return a Map of property names to JavaElementImpl
-     * @throws ContributionResolveException - if there was a problem resolving the
-     * Spring Bean or its componentType
-     *
-     */
-    public JavaImplementation introspectBean(Class<?> beanClass, ComponentType componentType) throws ContributionResolveException 
-    {
-        if (componentType == null)
-            throw new ContributionResolveException("Introspect Spring bean: supplied componentType is null");
-
-        // Create a Java implementation ready for the introspection
-        JavaImplementation javaImplementation = javaImplementationFactory.createJavaImplementation();
-
-        try {
-            // Introspect the bean...the results of the introspection are placed into the Java implementation
-            javaImplementationFactory.createJavaImplementation(javaImplementation, beanClass);
-
-            // Extract the services, references & properties found through introspection
-            // put the services, references and properties into the component type
-            componentType.getServices().addAll(javaImplementation.getServices());
-            componentType.getReferences().addAll(javaImplementation.getReferences());
-            componentType.getProperties().addAll(javaImplementation.getProperties());
-            
-        } catch (IntrospectionException e) {
-            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
-
-} // end class SpringBeanIntrospector
+/*

+ * 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.util.List;

+

+import org.apache.tuscany.sca.assembly.AssemblyFactory;

+import org.apache.tuscany.sca.assembly.ComponentType;

+import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;

+import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFactory;

+import org.apache.tuscany.sca.implementation.java.IntrospectionException;

+import org.apache.tuscany.sca.implementation.java.JavaImplementation;

+import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;

+import org.apache.tuscany.sca.implementation.java.introspect.BaseJavaClassVisitor;

+import org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor;

+import org.apache.tuscany.sca.implementation.java.introspect.impl.ComponentNameProcessor;

+import org.apache.tuscany.sca.implementation.java.introspect.impl.ConstructorProcessor;

+import org.apache.tuscany.sca.implementation.java.introspect.impl.ContextProcessor;

+import org.apache.tuscany.sca.implementation.java.introspect.impl.DestroyProcessor;

+import org.apache.tuscany.sca.implementation.java.introspect.impl.EagerInitProcessor;

+import org.apache.tuscany.sca.implementation.java.introspect.impl.InitProcessor;

+import org.apache.tuscany.sca.implementation.java.introspect.impl.PolicyProcessor;

+import org.apache.tuscany.sca.implementation.java.introspect.impl.PropertyProcessor;

+import org.apache.tuscany.sca.implementation.java.introspect.impl.ReferenceProcessor;

+import org.apache.tuscany.sca.implementation.java.introspect.impl.ResourceProcessor;

+import org.apache.tuscany.sca.implementation.java.introspect.impl.ServiceProcessor;

+import org.apache.tuscany.sca.implementation.spring.SpringConstructorArgElement;

+import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;

+import org.apache.tuscany.sca.policy.PolicyFactory;

+

+/**

+ * Provides introspection functions for Spring beans

+ * This version leans heavily on the implementation-java classes

+ *

+ * @version $Rev: 512919 $ $Date: 2007-02-28 19:32:56 +0000 (Wed, 28 Feb 2007) $

+ */

+public class SpringBeanIntrospector {

+

+    private JavaImplementationFactory javaImplementationFactory;

+

+    /**

+     * The constructor sets up the various visitor elements that will be used to introspect

+     * the Spring bean and extract SCA information.

+     *

+     * @param assemblyFactory The Assembly Factory to use

+     * @param javaFactory The Java Interface Factory to use

+     * @param policyFactory The Policy Factory to use.

+     */

+    public SpringBeanIntrospector(AssemblyFactory assemblyFactory,

+                                  JavaInterfaceFactory javaFactory,

+                                  PolicyFactory policyFactory,

+                                  List<SpringConstructorArgElement> conArgs) {

+

+        javaImplementationFactory = new DefaultJavaImplementationFactory();

+        

+        // Create the list of class visitors

+        BaseJavaClassVisitor[] extensions =

+            new BaseJavaClassVisitor[] {

+                                        new ConstructorProcessor(assemblyFactory),

+                                        new ComponentNameProcessor(assemblyFactory),

+                                        new ContextProcessor(assemblyFactory),

+                                        new DestroyProcessor(assemblyFactory),

+                                        new EagerInitProcessor(assemblyFactory),

+                                        new InitProcessor(assemblyFactory),

+                                        new PropertyProcessor(assemblyFactory),

+                                        new ReferenceProcessor(assemblyFactory, javaFactory),

+                                        new ResourceProcessor(assemblyFactory),

+                                        new ServiceProcessor(assemblyFactory, javaFactory),

+                                        new SpringBeanPojoProcessor(assemblyFactory, javaFactory, conArgs),

+                                        new PolicyProcessor(assemblyFactory, policyFactory)};

+        for (JavaClassVisitor extension : extensions) {

+            javaImplementationFactory.addClassVisitor(extension);

+        }

+

+    } // end constructor 

+

+    /**

+     * Introspect a Spring Bean and extract the features important to SCA

+     * @param beanClass the Spring Bean class to introspect

+     * @param componentType the componentType that is filled in through the introspection

+     * process (assumed empty on invocation, filled on return

+     * @return a Map of property names to JavaElementImpl

+     * @throws ContributionResolveException - if there was a problem resolving the

+     * Spring Bean or its componentType

+     *

+     */

+    public JavaImplementation introspectBean(Class<?> beanClass, ComponentType componentType) throws ContributionResolveException 

+    {

+        if (componentType == null)

+            throw new ContributionResolveException("Introspect Spring bean: supplied componentType is null");

+

+        // Create a Java implementation ready for the introspection

+        JavaImplementation javaImplementation = javaImplementationFactory.createJavaImplementation();

+

+        try {

+            // Introspect the bean...the results of the introspection are placed into the Java implementation

+            javaImplementationFactory.createJavaImplementation(javaImplementation, beanClass);

+

+            // Extract the services, references & properties found through introspection

+            // put the services, references and properties into the component type

+            componentType.getServices().addAll(javaImplementation.getServices());

+            componentType.getReferences().addAll(javaImplementation.getReferences());

+            componentType.getProperties().addAll(javaImplementation.getProperties());

+            

+        } catch (IntrospectionException e) {

+            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

+

+} // end class SpringBeanIntrospector

diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanPojoProcessor.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanPojoProcessor.java
index fe632190ee..56b3ce2213 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanPojoProcessor.java
+++ b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanPojoProcessor.java
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations

  * under the License.    

  */

-package org.apache.tuscany.sca.implementation.spring.xml;

+package org.apache.tuscany.sca.implementation.spring.introspect;

 

-import static org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper.getAllInterfaces;

-import static org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper.getPrivateFields;

-import static org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper.getAllPublicAndProtectedFields;

-import static org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper.getAllUniquePublicProtectedMethods;

-import static org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper.toPropertyName;

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

@@ -44,28 +44,28 @@ 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.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.impl.JavaConstructorImpl;

-import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl;

-import org.apache.tuscany.sca.implementation.java.impl.JavaParameterImpl;

+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.osoa.sca.annotations.Callback;

-import org.osoa.sca.annotations.Context;

-import org.osoa.sca.annotations.Property;

-import org.osoa.sca.annotations.Reference;

-import org.osoa.sca.annotations.Remotable;

-

-import org.apache.tuscany.sca.implementation.java.introspect.impl.BaseJavaClassVisitor;

-import org.apache.tuscany.sca.implementation.java.introspect.impl.NoConstructorException;

-import org.apache.tuscany.sca.implementation.java.introspect.impl.AmbiguousConstructorException;

-import org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper;

-import org.apache.tuscany.sca.implementation.java.introspect.impl.InvalidServiceType;

-import org.apache.tuscany.sca.implementation.java.introspect.impl.Resource;

+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

@@ -106,7 +106,7 @@ public class SpringBeanPojoProcessor extends BaseJavaClassVisitor {
              * interfaces is remotable, then by default the implementation offers a single service whose type 

              * is the implementation class.

              */

-            Set<Class> interfaces = getAllInterfaces(clazz);

+            Set<Class<?>> interfaces = getAllInterfaces(clazz);

             for (Class<?> i : interfaces) {

                 if (i.isAnnotationPresent(Remotable.class) || i.isAnnotationPresent(WebService.class)) {

                     addService(type, i);

@@ -287,7 +287,7 @@ public class SpringBeanPojoProcessor extends BaseJavaClassVisitor {
         Constructor constructor;

         boolean explict = false;

         if (definition != null && definition.getConstructor()

-            .isAnnotationPresent(org.osoa.sca.annotations.Constructor.class)) {

+            .isAnnotationPresent(org.oasisopen.sca.annotation.Constructor.class)) {

             // the constructor was already defined explicitly

             return;

         } else if (definition != null) {

@@ -599,7 +599,7 @@ public class SpringBeanPojoProcessor extends BaseJavaClassVisitor {
         // FIXME:  This part seems to have already been taken care above!!

         try {

             processCallback(paramType, reference);

-        } catch (InvalidServiceType e) {

+        } catch (InvalidServiceTypeException e) {

             throw new IntrospectionException(e);

         }

         return reference;

@@ -625,7 +625,7 @@ public class SpringBeanPojoProcessor extends BaseJavaClassVisitor {
         return service;

     }

 

-    public void processCallback(Class<?> interfaze, Contract contract) throws InvalidServiceType {

+    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();

@@ -634,10 +634,10 @@ public class SpringBeanPojoProcessor extends BaseJavaClassVisitor {
                 javaInterface = javaFactory.createJavaInterface(callbackClass);

                 contract.getInterfaceContract().setCallbackInterface(javaInterface);

             } catch (InvalidInterfaceException e) {

-                throw new InvalidServiceType("Invalid callback interface "+callbackClass, interfaze);

+                throw new InvalidServiceTypeException("Invalid callback interface "+callbackClass, interfaze);

             }

         } else if (callback != null && Void.class.equals(callback.value())) {

-            throw new InvalidServiceType("No callback interface specified on annotation", interfaze);

+            throw new InvalidServiceTypeException("No callback interface specified on annotation", interfaze);

         }

     }

 

diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
index ef42e8c610..fd47e99b02 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java
+++ b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
@@ -1,739 +1,750 @@
-/*
- * 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 static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.jar.Attributes;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-import java.util.jar.Manifest;
-
-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.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl;
-import org.apache.tuscany.sca.implementation.java.impl.JavaConstructorImpl;
-import org.apache.tuscany.sca.implementation.java.impl.JavaParameterImpl;
-import org.apache.tuscany.sca.implementation.spring.SpringImplementation;
-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.apache.tuscany.sca.policy.PolicyFactory;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.UrlResource;
-
-/**
- * Introspects a Spring XML application-context configuration file to create <implementation-spring../>
- * component type information. 
- * 
- *
- * @version $Rev: 512919 $ $Date: 2007-02-28 19:32:56 +0000 (Wed, 28 Feb 2007) $
- */
-public class SpringXMLComponentTypeLoader {
-
-    private AssemblyFactory assemblyFactory;
-    private JavaInterfaceFactory javaFactory;
-    private PolicyFactory policyFactory;
-    private ClassLoader cl;
-
-    private SpringBeanIntrospector beanIntrospector;
-    private String contextPath;
-
-    public SpringXMLComponentTypeLoader(AssemblyFactory assemblyFactory,
-                                        JavaInterfaceFactory javaFactory,
-                                        PolicyFactory policyFactory) {
-        super();
-        this.assemblyFactory = assemblyFactory;
-        this.javaFactory = javaFactory;
-        this.policyFactory = policyFactory;
-    }
-
-    protected Class<SpringImplementation> getImplementationClass() {
-        return SpringImplementation.class;
-    }
-
-    /**
-     * Base method which loads the component type from the application-context attached to the 
-     * Spring implementation
-     * 
-     */
-    public void load(SpringImplementation implementation) throws ContributionReadException {
-        //System.out.println("Spring TypeLoader - load method start");
-    	ComponentType componentType = implementation.getComponentType();
-        /* Check that there is a component type object already set	*/
-        if (componentType == null) {
-            throw new ContributionReadException("SpringXMLLoader load: implementation has no ComponentType object");
-        }
-        if (componentType.isUnresolved()) {
-            /* Fetch the location of the application-context file from the implementation */
-            loadFromXML(implementation);
-            if (!componentType.isUnresolved())
-                implementation.setUnresolved(false);
-        } // end if
-        //System.out.println("Spring TypeLoader - load method complete");
-    } // end method load
-
-    /**
-     * Method which fills out the component type for a Spring implementation by reading the 
-     * Spring application-context.xml file.
-     * 
-     * @param implementation SpringImplementation into which to load the component type information
-     * @throws ContributionReadException Failed to read the contribution
-     */
-    private void loadFromXML(SpringImplementation implementation) throws ContributionReadException {
-        XMLStreamReader reader;
-        List<SpringBeanElement> beans = new ArrayList<SpringBeanElement>();
-        List<SpringSCAServiceElement> services = new ArrayList<SpringSCAServiceElement>();
-        List<SpringSCAReferenceElement> references = new ArrayList<SpringSCAReferenceElement>();
-        List<SpringSCAPropertyElement> scaproperties = new ArrayList<SpringSCAPropertyElement>();        
-
-        Resource resource;
-
-        contextPath = implementation.getLocation();
-
-        try {
-            // FIXME - is the ContextClassLoader the right place to start the search?
-            cl = Thread.currentThread().getContextClassLoader();
-
-            resource = getApplicationContextResource(contextPath, cl);
-            implementation.setResource(resource);
-            // The URI is used to uniquely identify the Implementation
-            implementation.setURI(resource.getURL().toString());            
-            // FIXME - need a better way to handle the XMLInputFactory than allocating a new one every time
-            XMLInputFactory xmlFactory = XMLInputFactory.newInstance();
-            reader = xmlFactory.createXMLStreamReader(resource.getInputStream());
-
-            // System.out.println("Spring TypeLoader - starting to read context file");            
-            readContextDefinition(reader, beans, services, references, scaproperties);
-
-        } catch (IOException e) {
-            throw new ContributionReadException(e);
-        } catch (XMLStreamException e) {
-            throw new ContributionReadException(e);
-        }
-
-        /* At this point, the complete application-context.xml file has been read and its contents  */
-        /* stored in the lists of beans, services, references.  These are now used to generate      */
-        /* the implied componentType for the application context								    */
-        generateComponentType(implementation, beans, services, references, scaproperties);
-
-        return;
-    } // end method loadFromXML
-    
-    /**
-     * Method which returns the XMLStreamReader for the Spring application-context.xml file
-     * specified in the location attribute
-     */
-    private XMLStreamReader getApplicationContextReader(String location) throws ContributionReadException {
-        
-        try {
-            // FIXME - is the ContextClassLoader the right place to start the search?
-            cl = Thread.currentThread().getContextClassLoader();
-            Resource resource = getApplicationContextResource(location, cl);            
-            // FIXME - need a better way to handle the XMLInputFactory than allocating a new one every time
-            XMLInputFactory xmlFactory = XMLInputFactory.newInstance();
-            XMLStreamReader reader = xmlFactory.createXMLStreamReader(resource.getInputStream());
-            return reader;
-        } catch (IOException e) {
-            throw new ContributionReadException(e);
-        } catch (XMLStreamException e) {
-            throw new ContributionReadException(e);
-        }
-    }    
-    
-    /**
-     * Method which reads the spring context definitions from Spring application-context.xml 
-     * file and identifies the defined beans, properties, services and references     
-     */
-    private void readContextDefinition(XMLStreamReader reader, 
-            List<SpringBeanElement> beans,
-            List<SpringSCAServiceElement> services,
-            List<SpringSCAReferenceElement> references,
-            List<SpringSCAPropertyElement> scaproperties) throws ContributionReadException {
-        
-        SpringBeanElement bean = null;
-        
-        try {
-            boolean completed = false;
-            while (!completed) {
-                switch (reader.next()) {
-                    case START_ELEMENT:
-                        QName qname = reader.getName();
-                        //System.out.println("Spring TypeLoader - found element with name: " + qname.toString());
-                        if (Constants.IMPORT_ELEMENT.equals(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(resourcePath);
-                                // Read the context definition for the identified imported resource
-                                readContextDefinition(ireader, beans, services, references, scaproperties);
-                            }
-                        } else if (Constants.SERVICE_ELEMENT.equals(qname)) {
-                            SpringSCAServiceElement service =
-                                new SpringSCAServiceElement(reader.getAttributeValue(null, "name"), reader
-                                    .getAttributeValue(null, "type"), reader.getAttributeValue(null, "target"));
-                            services.add(service);
-                        } else if (Constants.REFERENCE_ELEMENT.equals(qname)) {
-                            SpringSCAReferenceElement reference =
-                                new SpringSCAReferenceElement(reader.getAttributeValue(null, "name"), reader
-                                    .getAttributeValue(null, "type"));
-                            references.add(reference);
-                        } else if (Constants.SCAPROPERTY_ELEMENT.equals(qname)) {
-                            SpringSCAPropertyElement scaproperty =
-                                new SpringSCAPropertyElement(reader.getAttributeValue(null, "name"), reader
-                                    .getAttributeValue(null, "type"));
-                            scaproperties.add(scaproperty);
-                        } else if (Constants.BEAN_ELEMENT.equals(qname)) {
-                            bean = new SpringBeanElement(reader.getAttributeValue(null, "id"), reader
-                                    .getAttributeValue(null, "class"));
-                            beans.add(bean);
-                            // Read the <bean> element and its child elements
-                            readBeanDefinition(reader, bean, beans, services, references, scaproperties);
-                        } // end if*/
-                        break;
-                    case END_ELEMENT:
-                        if (Constants.BEANS_ELEMENT.equals(reader.getName())) {
-                            //System.out.println("Spring TypeLoader - finished read of context file");
-                            completed = true;
-                            break;
-                        } // end if
-                } // 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,
-            List<SpringSCAServiceElement> services,
-            List<SpringSCAReferenceElement> references,
-            List<SpringSCAPropertyElement> scaproperties) throws ContributionReadException {
-        
-    	SpringBeanElement innerbean = null;
-        SpringPropertyElement property = null;
-        SpringConstructorArgElement constructorArg = null;
-        int autoConstructorIndex = -1;
-        
-        try {
-            boolean completed = false;
-            while (!completed) {
-                switch (reader.next()) {
-                    case START_ELEMENT:
-                        QName qname = reader.getName();
-                        if (Constants.BEAN_ELEMENT.equals(qname)) {
-                        	innerbean = new SpringBeanElement(reader.getAttributeValue(null, "id"), reader
-                                    .getAttributeValue(null, "class"));
-                            innerbean.setInnerBean(true);
-                            beans.add(innerbean);
-                            readBeanDefinition(reader, innerbean, beans, services, references, scaproperties);
-                        } else if (Constants.PROPERTY_ELEMENT.equals(qname)) {
-                            property = new SpringPropertyElement(reader.getAttributeValue(null, "name"), reader
-                                    .getAttributeValue(null, "ref"));
-                            bean.addProperty(property);
-                        } else if (Constants.CONSTRUCTORARG_ELEMENT.equals(qname)) {
-                            constructorArg = new SpringConstructorArgElement(reader.getAttributeValue(null, "ref"), 
-                                    reader.getAttributeValue(null, "type"));
-                            autoConstructorIndex++;
-                            constructorArg.setAutoIndex(autoConstructorIndex);
-                            if (reader.getAttributeValue(null, "index") != null)
-                            	constructorArg.setIndex((new Integer(reader.getAttributeValue(null, "index"))).intValue());
-                            if (reader.getAttributeValue(null, "value") != null) {
-                            	String value = reader.getAttributeValue(null, "value");
-                            	constructorArg.addValue(value);
-                            	if ((value.indexOf(".xml") != -1)) {
-                                    if ((bean.getClassName().indexOf(".ClassPathXmlApplicationContext") != -1) ||
-                                        (bean.getClassName().indexOf(".FileSystemXmlApplicationContext") != -1)) {                                    
-                                        XMLStreamReader creader = getApplicationContextReader(value);
-                                        // Read the context definition for the constructor-arg resources
-                                        readContextDefinition(creader, beans, services, references, scaproperties);
-                                    }
-                                }
-                            }
-                            bean.addCustructorArgs(constructorArg);
-                        } else if (Constants.REF_ELEMENT.equals(qname)) {
-                            String ref = reader.getAttributeValue(null, "bean");
-                            // Check if the parent element is a property 
-                            if (property != null) property.setRef(ref);
-                            // Check if the parent element is a constructor-arg
-                            if (constructorArg != null) constructorArg.setRef(ref);
-                        } else if (Constants.VALUE_ELEMENT.equals(qname)) {
-                            String value = reader.getElementText();
-                            // Check if the parent element is a constructor-arg
-                            if (constructorArg != null) {
-                            	constructorArg.addValue(value);
-                                // Identify the XML resource specified for the constructor-arg element
-                                if ((value.indexOf(".xml") != -1)) {
-                                    if ((bean.getClassName().indexOf(".ClassPathXmlApplicationContext") != -1) ||
-                                        (bean.getClassName().indexOf(".FileSystemXmlApplicationContext") != -1)) {                                    
-                                        XMLStreamReader creader = getApplicationContextReader(value);
-                                        // Read the context definition for the constructor-arg resources
-                                        readContextDefinition(creader, beans, services, references, scaproperties);
-                                    }
-                                }
-                            }
-                        } // end if
-                        break;
-                    case END_ELEMENT:
-                        if (Constants.BEAN_ELEMENT.equals(reader.getName())) {
-                            completed = true;
-                            break;
-                        } else if (Constants.PROPERTY_ELEMENT.equals(reader.getName())) {
-                            property = null;
-                        } else if (Constants.CONSTRUCTORARG_ELEMENT.equals(reader.getName())) {
-                            constructorArg = null;
-                        } // end if
-                } // 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
-     */
-    private void generateComponentType(SpringImplementation implementation,
-                                       List<SpringBeanElement> beans,
-                                       List<SpringSCAServiceElement> services,
-                                       List<SpringSCAReferenceElement> references,
-                                       List<SpringSCAPropertyElement> scaproperties) throws ContributionReadException {
-        /*
-         * 1. Each sca:service becomes a service in the component type
-         * 2. Each sca:reference becomes a reference in the component type
-         * 3. Each sca:property becomes a property in the component type
-         * 4. IF there are no explicit service elements, each bean becomes a service
-         * 5. Each bean property which is a reference not pointing at another bean in the 
-         *    application context becomes a reference unless it is pointing at one of the references
-         * 6. Each bean property which is not a reference and which is not pointing 
-         *    at another bean in the application context becomes a property in the component type
-         */
-
-    	JavaImplementation javaImplementation = null;
-        ComponentType componentType = implementation.getComponentType();
-
-        try {
-            // Deal with the services first....												
-            Iterator<SpringSCAServiceElement> its = services.iterator();
-            while (its.hasNext()) {
-                SpringSCAServiceElement serviceElement = its.next();
-                Class<?> interfaze = cl.loadClass(serviceElement.getType());
-                Service theService = createService(interfaze, serviceElement.getName());
-                componentType.getServices().add(theService);
-                // Add this service to the Service / Bean map
-                String beanName = serviceElement.getTarget();
-                for (SpringBeanElement beanElement : beans) {
-                    if (beanName.equals(beanElement.getId())) {
-                        implementation.setBeanForService(theService, beanElement);
-                    }
-                } // end for
-            } // end while
-
-            // Next handle the references
-            Iterator<SpringSCAReferenceElement> itr = references.iterator();
-            while (itr.hasNext()) {
-                SpringSCAReferenceElement referenceElement = itr.next();
-                Class<?> interfaze = cl.loadClass(referenceElement.getType());
-                Reference theReference = createReference(interfaze, referenceElement.getName());
-                componentType.getReferences().add(theReference);
-            } // end while
-            
-            // Next handle the properties
-            Iterator<SpringSCAPropertyElement> itsp = scaproperties.iterator();
-            while (itsp.hasNext()) {
-                SpringSCAPropertyElement scaproperty = itsp.next();
-                // Create a component type property if the SCA property element has a name
-                // and a type declared...
-                if (scaproperty.getType() != null && scaproperty.getName() != null) {
-                    Property theProperty = assemblyFactory.createProperty();
-                    theProperty.setName(scaproperty.getName());
-                    // Get the Java class and then an XSD element type for the property
-                    Class<?> propType = Class.forName(scaproperty.getType());
-                    theProperty.setXSDType(JavaXMLMapper.getXMLType(propType));
-                    componentType.getProperties().add(theProperty);
-                    // Remember the Java Class (ie the type) for this property
-                    implementation.setPropertyClass(theProperty.getName(), propType);
-                } // end if 
-            } // end while
-
-            // Finally deal with the beans
-            Iterator<SpringBeanElement> itb;
-            // If there are no explicit service elements, then expose all the beans
-            if (services.isEmpty()) {
-                itb = beans.iterator();
-                // Loop through all the beans found
-                while (itb.hasNext()) {
-                    SpringBeanElement beanElement = itb.next();
-                    // If its a innerBean, ignore it
-                    if (beanElement.isInnerBean()) continue;
-                    // Load the Spring bean class
-                    Class<?> beanClass = cl.loadClass(beanElement.getClassName());
-                    // Introspect the bean
-                    beanIntrospector =
-                        new SpringBeanIntrospector(assemblyFactory, javaFactory, policyFactory, beanElement.getCustructorArgs());
-                    ComponentType beanComponentType = assemblyFactory.createComponentType();
-                    javaImplementation = beanIntrospector.introspectBean(beanClass, beanComponentType);
-                    // Get the service interface defined by this Spring Bean and add to
-                    // the component type of the Spring Assembly
-                    List<Service> beanServices = beanComponentType.getServices();
-                    componentType.getServices().addAll(beanServices);
-                    // Add these services to the Service / Bean map
-                    for (Service beanService : beanServices) {
-                        implementation.setBeanForService(beanService, beanElement);
-                    }
-                } // end while
-            } // end if
-          
-            itb = beans.iterator();
-            while (itb.hasNext()) {
-                SpringBeanElement beanElement = itb.next();               
-                // Ignore if the bean has no properties and constructor arguments
-                if (beanElement.getProperties().isEmpty() && beanElement.getCustructorArgs().isEmpty()) 
-                	continue;
-                
-                Class<?> beanClass = cl.loadClass(beanElement.getClassName());
-                // Introspect the bean
-                beanIntrospector =
-                    new SpringBeanIntrospector(assemblyFactory, javaFactory, policyFactory, beanElement.getCustructorArgs());
-                ComponentType beanComponentType = assemblyFactory.createComponentType();
-                javaImplementation = beanIntrospector.introspectBean(beanClass, beanComponentType);
-                Map<String, JavaElementImpl> propertyMap = javaImplementation.getPropertyMembers();
-                JavaConstructorImpl constructor = javaImplementation.getConstructor();
-                // Get the references by this Spring Bean and add the unresolved ones to
-                // the component type of the Spring Assembly
-                List<Reference> beanReferences = beanComponentType.getReferences();
-                List<Property> beanProperties = beanComponentType.getProperties();
-                
-                Iterator<SpringPropertyElement> itp = beanElement.getProperties().iterator();
-                while (itp.hasNext()) {
-                    SpringPropertyElement propertyElement = itp.next();
-                    if (propertyRefUnresolved(propertyElement.getRef(), beans, references, scaproperties)) {
-                        // This means an unresolved reference from the spring bean...
-                    	for (Reference reference : beanReferences) {
-                            if (propertyElement.getName().equals(reference.getName())) {
-                            	// The name of the reference in this case is the string in
-                                // the @ref attribute of the Spring property element, NOT the
-                                // name of the field in the Spring bean....
-                                reference.setName(propertyElement.getRef());
-                                componentType.getReferences().add(reference);
-                            } // end if
-                        } // end for
-                    	
-                    	// Store the unresolved references as unresolvedBeanRef in the Spring Implementation type
-                    	for (Property scaproperty : beanProperties) {
-                            if (propertyElement.getName().equals(scaproperty.getName())) {
-                            	// The name of the reference in this case is the string in
-                                // the @ref attribute of the Spring property element, NOT the
-                                // name of the field in the Spring bean....
-                            	Class<?> interfaze = cl.loadClass((propertyMap.get(propertyElement.getName()).getType()).getName());                                            
-                                Reference theReference = createReference(interfaze, propertyElement.getRef());
-                                implementation.setUnresolvedBeanRef(propertyElement.getRef(), theReference);
-                            } // end if
-                    	} // end for
-                    } // end if
-                } // end while
-                
-                Iterator<SpringConstructorArgElement> itcr = beanElement.getCustructorArgs().iterator();
-                while (itcr.hasNext()) {
-                	SpringConstructorArgElement conArgElement = itcr.next();
-                    if (propertyRefUnresolved(conArgElement.getRef(), beans, references, scaproperties)) {
-                    	for (JavaParameterImpl parameter : constructor.getParameters()) {
-                    		String paramType = parameter.getType().getName();
-                    		Class<?> interfaze = cl.loadClass(paramType);
-                    		// Create a component type reference/property if the constructor-arg element has a
-                            // type attribute OR index attribute declared...
-                    		if ((conArgElement.getType() != null && paramType.equals(conArgElement.getType())) || 
-                    		    (conArgElement.getIndex() != -1 && (conArgElement.getIndex() == parameter.getIndex())) || 
-                    		    (conArgElement.getAutoIndex() == parameter.getIndex())) 
-                    		{
-                    			if (parameter.getClassifer().getName().equals("org.osoa.sca.annotations.Reference")) {
-                    				Reference theReference = createReference(interfaze, conArgElement.getRef());
-                    				componentType.getReferences().add(theReference);
-                    			}
-                    			if (parameter.getClassifer().getName().equals("org.osoa.sca.annotations.Property")) {
-                    				// Store the unresolved references as unresolvedBeanRef in the Spring Implementation type
-                                	// we might need to verify with the component definition later.
-                    				Reference theReference = createReference(interfaze, conArgElement.getRef());
-                        			implementation.setUnresolvedBeanRef(conArgElement.getRef(), theReference);
-                    			}
-                    		}                        	
-                    	} // end for                        
-                    } // end if
-                } // end while
-                
-            } // end while
-
-        } catch (ClassNotFoundException e) {
-            // Means that either an interface class, property class or a bean was not found
-            throw new ContributionReadException(e);
-        } catch (InvalidInterfaceException e) {
-            throw new ContributionReadException(e);
-        } catch (ContributionResolveException e) {
-        	
-        } // end try
-
-        // If we get here, the Spring assembly component type is resolved
-        componentType.setUnresolved(false);
-        implementation.setComponentType(componentType);
-        return;
-    } // end method generateComponentType
-
-    /*
-     * Determines whether a reference attribute of a Spring property element is resolved either
-     * by a bean in the application context or by an SCA reference element or by an SCA property
-     * element
-     * @param ref - a String containing the name of the reference - may be null
-     * @param beans - a List of SpringBean elements
-     * @param references - a List of SCA reference elements
-     * @return true if the property is not resolved, false if it is resolved
-     */
-    private boolean propertyRefUnresolved(String ref,
-                                          List<SpringBeanElement> beans,
-                                          List<SpringSCAReferenceElement> references,
-                                          List<SpringSCAPropertyElement> scaproperties) {
-        boolean unresolved = true;
-
-        if (ref != null) {
-            // Scan over the beans looking for a match
-            Iterator<SpringBeanElement> itb = beans.iterator();
-            while (itb.hasNext()) {
-                SpringBeanElement beanElement = itb.next();
-                // Does the bean name match the ref?
-                if (ref.equals(beanElement.getId())) {
-                    unresolved = false;
-                    break;
-                } // end if
-            } // end while
-            // Scan over the SCA reference elements looking for a match
-            if (unresolved) {
-                Iterator<SpringSCAReferenceElement> itr = references.iterator();
-                while (itr.hasNext()) {
-                    SpringSCAReferenceElement referenceElement = itr.next();
-                    if (ref.equals(referenceElement.getName())) {
-                        unresolved = false;
-                        break;
-                    } // end if
-                } // end while
-            } // end if
-            // Scan over the SCA property elements looking for a match
-            if (unresolved) {
-                Iterator<SpringSCAPropertyElement> itsp = scaproperties.iterator();
-                while (itsp.hasNext()) {
-                    SpringSCAPropertyElement propertyElement = itsp.next();
-                    if (ref.equals(propertyElement.getName())) {
-                        unresolved = false;
-                        break;
-                    } // end if
-                } // end while
-            } // end if
-        } else {
-            // In the case where ref = null, the property is not going to be a reference of any
-            // kind and can be ignored
-            unresolved = false;
-        } // end if
-
-        return unresolved;
-
-    } // end method propertyRefUnresolved
-
-    /**
-     * Gets hold of the application-context.xml file as a Spring resource
-     * @param locationAttr - the location attribute from the <implementation.spring../> element
-     * @param cl - the ClassLoader for the Spring implementation
-     */
-    protected Resource getApplicationContextResource(String locationAttr, ClassLoader cl)
-        throws ContributionReadException {
-        File manifestFile = null;
-        File appXmlFile;
-        File locationFile = null;
-        
-        URL url = cl.getResource(locationAttr);
-        if (url != null) {
-            String path = url.getPath();
-            locationFile = new File(path);            
-        } else {
-            throw new ContributionReadException(
-                    "SpringXMLLoader getApplicationContextResource: " + "unable to find resource file " 
-                        + locationAttr);
-        }
-
-        if (locationFile.isDirectory()) {
-            try {
-                manifestFile = new File(locationFile, "META-INF"+ File.separator +"MANIFEST.MF");                
-                if (manifestFile.exists()) {
-                    Manifest mf = new Manifest(new FileInputStream(manifestFile));
-                    Attributes mainAttrs = mf.getMainAttributes();
-                    String appCtxPath = mainAttrs.getValue("Spring-Context");
-                    if (appCtxPath != null) {
-                        appXmlFile = new File(locationFile, appCtxPath);
-                        if (appXmlFile.exists()) {
-                            return new UrlResource(appXmlFile.toURL());
-                        }
-                    }
-                }
-                // no manifest-specified Spring context, use default
-                appXmlFile = new File(locationFile, "META-INF" + File.separator + "spring" 
-                                                        + File.separator + Constants.APPLICATION_CONTEXT);
-                if (appXmlFile.exists()) {
-                    return new UrlResource(appXmlFile.toURL());
-                }
-            } catch (IOException e) {
-                throw new ContributionReadException("Error reading manifest " + manifestFile);
-            }
-        } else {          
-        	if (locationFile.isFile() && locationFile.getName().endsWith(".jar")) {
-                try {
-                    JarFile jf = new JarFile(locationFile);
-                    JarEntry je;
-                    Manifest mf = jf.getManifest();
-                    if (mf != null) {
-                        Attributes mainAttrs = mf.getMainAttributes();
-                        String appCtxPath = mainAttrs.getValue("Spring-Context");
-                        if (appCtxPath != null) {
-                            je = jf.getJarEntry(appCtxPath);
-                            if (je != null) {
-                                // TODO return a Spring specific Resource type for jars
-                                return new UrlResource(new URL("jar:" + locationFile.toURI().toURL() + "!/" + appCtxPath));
-                            }
-                        }
-                    }
-                    je = jf.getJarEntry("META-INF" + "/" + "spring" + "/" + Constants.APPLICATION_CONTEXT);
-                    if (je != null) {
-                        return new UrlResource(new URL("jar:" + locationFile.toURI().toURL() + "!/" + Constants.APPLICATION_CONTEXT));
-                    }
-                } catch (IOException e) {
-                    // bad archive
-                    // TODO: create a more appropriate exception type
-                    throw new ContributionReadException("SpringXMLLoader getApplicationContextResource: " 
-                    												+ " IO exception reading context file.", e);
-                }
-        	}
-        	else {
-        		if (locationFile.getName().endsWith(".xml")) {
-        			return new UrlResource(url);
-        		} 
-        		else {
-        			// Deal with the directory inside a jar file, in case the contribution itself is a JAR file.
-        			try {
-	        			if (locationFile.getPath().indexOf(".jar") > 0) {
-	        				String jarEntry = url.getPath().substring(6, url.getPath().indexOf("!"));
-	        				JarFile jf = new JarFile(jarEntry);	        				
-	        				JarEntry je = jf.getJarEntry(url.getPath().substring(url.getPath().indexOf("!/")+2) 
-	        												+ "/" + "META-INF" + "/" + "MANIFEST.MF");
-	        			    if (je != null) {
-	        					Manifest mf = new Manifest(jf.getInputStream(je));
-	        					Attributes mainAttrs = mf.getMainAttributes();
-	                            String appCtxPath = mainAttrs.getValue("Spring-Context");
-	                            if (appCtxPath != null) {
-	                                je = jf.getJarEntry(url.getPath().substring(url.getPath().indexOf("!/")+2) + "/" + appCtxPath);
-	                                if (je != null) {
-	                                    return new UrlResource(new URL("jar:" + url.getPath() + "/" + appCtxPath));
-	                                }
-	                            }
-	        				}
-	        			}	        			
-            		} catch (IOException e) {
-                        throw new ContributionReadException("Error reading manifest " + manifestFile);
-                    }
-        		}        		
-        	}
-        }
-
-        throw new ContributionReadException("SpringXMLLoader getApplicationContextResource: " 
-                                        + "META-INF/spring/" + Constants.APPLICATION_CONTEXT + "not found");
-    } // end method getApplicationContextResource
-
-    /**
-     * Creates a Service for the component type based on its name and Java interface
-     */
-    public Service createService(Class<?> interfaze, String name) throws InvalidInterfaceException {
-        Service service = assemblyFactory.createService();
-        JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();
-        service.setInterfaceContract(interfaceContract);
-
-        // Set the name for the service
-        service.setName(name);
-
-        // Set the call interface and, if present, the callback interface
-        JavaInterface callInterface = javaFactory.createJavaInterface(interfaze);
-        service.getInterfaceContract().setInterface(callInterface);
-        if (callInterface.getCallbackClass() != null) {
-            JavaInterface callbackInterface = javaFactory.createJavaInterface(callInterface.getCallbackClass());
-            service.getInterfaceContract().setCallbackInterface(callbackInterface);
-        }
-        return service;
-    } // end method createService
-
-    /**
-     * Creates a Reference for the component type based on its name and Java interface
-     */
-    private org.apache.tuscany.sca.assembly.Reference createReference(Class<?> interfaze, String name)
-        throws InvalidInterfaceException {
-        org.apache.tuscany.sca.assembly.Reference reference = assemblyFactory.createReference();
-        JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();
-        reference.setInterfaceContract(interfaceContract);
-
-        // Set the name of the reference to the supplied name and the multiplicity of the reference
-        // to 1..1 - for Spring implementations, this is the only multiplicity supported
-        reference.setName(name);
-        reference.setMultiplicity(Multiplicity.ONE_ONE);
-
-        // Set the call interface and, if present, the callback interface
-        JavaInterface callInterface = javaFactory.createJavaInterface(interfaze);
-        reference.getInterfaceContract().setInterface(callInterface);
-        if (callInterface.getCallbackClass() != null) {
-            JavaInterface callbackInterface = javaFactory.createJavaInterface(callInterface.getCallbackClass());
-            reference.getInterfaceContract().setCallbackInterface(callbackInterface);
-        }
-
-        return reference;
-    }
-} // end class SpringXMLComponentTypeLoader
+/*

+ * 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 javax.xml.stream.XMLStreamConstants.END_ELEMENT;

+import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;

+

+import java.io.File;

+import java.io.FileInputStream;

+import java.io.IOException;

+import java.net.URISyntaxException;

+import java.net.URL;

+import java.util.ArrayList;

+import java.util.Iterator;

+import java.util.List;

+import java.util.Map;

+import java.util.jar.Attributes;

+import java.util.jar.JarEntry;

+import java.util.jar.JarFile;

+import java.util.jar.Manifest;

+

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

+import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;

+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.spring.SpringBeanElement;

+import org.apache.tuscany.sca.implementation.spring.SpringConstructorArgElement;

+import org.apache.tuscany.sca.implementation.spring.SpringImplementation;

+import org.apache.tuscany.sca.implementation.spring.SpringImplementationConstants;

+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.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.apache.tuscany.sca.policy.PolicyFactory;

+

+/**

+ * Introspects a Spring XML application-context configuration file to create <implementation-spring../>

+ * component type information. 

+ * 

+ *

+ * @version $Rev: 512919 $ $Date: 2007-02-28 19:32:56 +0000 (Wed, 28 Feb 2007) $

+ */

+public class SpringXMLComponentTypeLoader {

+

+    private AssemblyFactory assemblyFactory;

+    private JavaInterfaceFactory javaFactory;

+    private PolicyFactory policyFactory;

+    private ClassLoader cl;

+

+    private SpringBeanIntrospector beanIntrospector;

+    private String contextPath;

+

+    public SpringXMLComponentTypeLoader(AssemblyFactory assemblyFactory,

+                                        JavaInterfaceFactory javaFactory,

+                                        PolicyFactory policyFactory) {

+        super();

+        this.assemblyFactory = assemblyFactory;

+        this.javaFactory = javaFactory;

+        this.policyFactory = policyFactory;

+    }

+

+    protected Class<SpringImplementation> getImplementationClass() {

+        return SpringImplementation.class;

+    }

+

+    /**

+     * Base method which loads the component type from the application-context attached to the 

+     * Spring implementation

+     * 

+     */

+    public void load(SpringImplementation implementation) throws ContributionReadException {

+        //System.out.println("Spring TypeLoader - load method start");

+    	ComponentType componentType = implementation.getComponentType();

+        /* Check that there is a component type object already set	*/

+        if (componentType == null) {

+            throw new ContributionReadException("SpringXMLLoader load: implementation has no ComponentType object");

+        }

+        if (componentType.isUnresolved()) {

+            /* Fetch the location of the application-context file from the implementation */

+            loadFromXML(implementation);

+            if (!componentType.isUnresolved())

+                implementation.setUnresolved(false);

+        } // end if

+        //System.out.println("Spring TypeLoader - load method complete");

+    } // end method load

+

+    /**

+     * Method which fills out the component type for a Spring implementation by reading the 

+     * Spring application-context.xml file.

+     * 

+     * @param implementation SpringImplementation into which to load the component type information

+     * @throws ContributionReadException Failed to read the contribution

+     */

+    private void loadFromXML(SpringImplementation implementation) throws ContributionReadException {

+        XMLStreamReader reader;

+        List<SpringBeanElement> beans = new ArrayList<SpringBeanElement>();

+        List<SpringSCAServiceElement> services = new ArrayList<SpringSCAServiceElement>();

+        List<SpringSCAReferenceElement> references = new ArrayList<SpringSCAReferenceElement>();

+        List<SpringSCAPropertyElement> scaproperties = new ArrayList<SpringSCAPropertyElement>();        

+

+        URL resource;

+

+        contextPath = implementation.getLocation();

+

+        try {

+            // FIXME - is the ContextClassLoader the right place to start the search?

+            cl = Thread.currentThread().getContextClassLoader();

+

+            resource = getApplicationContextResource(contextPath, cl);

+            implementation.setResource(resource);

+            // The URI is used to uniquely identify the Implementation

+            implementation.setURI(resource.toString());            

+            // FIXME - need a better way to handle the XMLInputFactory than allocating a new one every time

+            XMLInputFactory xmlFactory = XMLInputFactory.newInstance();

+            reader = xmlFactory.createXMLStreamReader(new FileInputStream(new File(resource.toURI())));

+

+            // System.out.println("Spring TypeLoader - starting to read context file");            

+            readContextDefinition(reader, beans, services, references, scaproperties);

+

+        } catch (IOException e) {

+            throw new ContributionReadException(e);

+        } catch (XMLStreamException e) {

+            throw new ContributionReadException(e);

+        } catch (URISyntaxException e) {

+            throw new ContributionReadException(e);

+        }

+

+        /* At this point, the complete application-context.xml file has been read and its contents  */

+        /* stored in the lists of beans, services, references.  These are now used to generate      */

+        /* the implied componentType for the application context								    */

+        generateComponentType(implementation, beans, services, references, scaproperties);

+

+        return;

+    } // end method loadFromXML

+    

+    /**

+     * Method which returns the XMLStreamReader for the Spring application-context.xml file

+     * specified in the location attribute

+     */

+    private XMLStreamReader getApplicationContextReader(String location) throws ContributionReadException {

+        

+        try {

+            // FIXME - is the ContextClassLoader the right place to start the search?

+            cl = Thread.currentThread().getContextClassLoader();

+            URL resource = getApplicationContextResource(location, cl);            

+            // FIXME - need a better way to handle the XMLInputFactory than allocating a new one every time

+            XMLInputFactory xmlFactory = XMLInputFactory.newInstance();

+            XMLStreamReader reader = 

+            	xmlFactory.createXMLStreamReader(new FileInputStream(new File(resource.toURI())));

+            return reader;

+        } catch (IOException e) {

+            throw new ContributionReadException(e);

+        } catch (XMLStreamException e) {

+            throw new ContributionReadException(e);

+        } catch (URISyntaxException e) {

+            throw new ContributionReadException(e);

+        }

+    }    

+    

+    /**

+     * Method which reads the spring context definitions from Spring application-context.xml 

+     * file and identifies the defined beans, properties, services and references     

+     */

+    private void readContextDefinition(XMLStreamReader reader, 

+            List<SpringBeanElement> beans,

+            List<SpringSCAServiceElement> services,

+            List<SpringSCAReferenceElement> references,

+            List<SpringSCAPropertyElement> scaproperties) throws ContributionReadException {

+        

+        SpringBeanElement bean = null;

+        

+        try {

+            boolean completed = false;

+            while (!completed) {

+                switch (reader.next()) {

+                    case START_ELEMENT:

+                        QName qname = reader.getName();

+                        //System.out.println("Spring TypeLoader - found element with name: " + qname.toString());

+                        if (SpringImplementationConstants.IMPORT_ELEMENT.equals(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(resourcePath);

+                                // Read the context definition for the identified imported resource

+                                readContextDefinition(ireader, beans, services, references, scaproperties);

+                            }

+                        } else if (SpringImplementationConstants.SERVICE_ELEMENT.equals(qname)) {

+                            SpringSCAServiceElement service =

+                                new SpringSCAServiceElement(reader.getAttributeValue(null, "name"), reader

+                                    .getAttributeValue(null, "type"), reader.getAttributeValue(null, "target"));

+                            services.add(service);

+                        } else if (SpringImplementationConstants.REFERENCE_ELEMENT.equals(qname)) {

+                            SpringSCAReferenceElement reference =

+                                new SpringSCAReferenceElement(reader.getAttributeValue(null, "name"), reader

+                                    .getAttributeValue(null, "type"));

+                            references.add(reference);

+                        } else if (SpringImplementationConstants.SCAPROPERTY_ELEMENT.equals(qname)) {

+                            SpringSCAPropertyElement scaproperty =

+                                new SpringSCAPropertyElement(reader.getAttributeValue(null, "name"), reader

+                                    .getAttributeValue(null, "type"));

+                            scaproperties.add(scaproperty);

+                        } else if (SpringImplementationConstants.BEAN_ELEMENT.equals(qname)) {

+                            bean = new SpringBeanElement(reader.getAttributeValue(null, "id"), reader

+                                    .getAttributeValue(null, "class"));

+                            beans.add(bean);

+                            // Read the <bean> element and its child elements

+                            readBeanDefinition(reader, bean, beans, services, references, scaproperties);

+                        } // end if*/

+                        break;

+                    case END_ELEMENT:

+                        if (SpringImplementationConstants.BEANS_ELEMENT.equals(reader.getName())) {

+                            //System.out.println("Spring TypeLoader - finished read of context file");

+                            completed = true;

+                            break;

+                        } // end if

+                } // 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,

+            List<SpringSCAServiceElement> services,

+            List<SpringSCAReferenceElement> references,

+            List<SpringSCAPropertyElement> scaproperties) throws ContributionReadException {

+        

+    	SpringBeanElement innerbean = null;

+        SpringPropertyElement property = null;

+        SpringConstructorArgElement constructorArg = null;

+        int autoConstructorIndex = -1;

+        

+        try {

+            boolean completed = false;

+            while (!completed) {

+                switch (reader.next()) {

+                    case START_ELEMENT:

+                        QName qname = reader.getName();

+                        if (SpringImplementationConstants.BEAN_ELEMENT.equals(qname)) {

+                        	innerbean = new SpringBeanElement(reader.getAttributeValue(null, "id"), reader

+                                    .getAttributeValue(null, "class"));

+                            innerbean.setInnerBean(true);

+                            beans.add(innerbean);

+                            readBeanDefinition(reader, innerbean, beans, services, references, scaproperties);

+                        } else if (SpringImplementationConstants.PROPERTY_ELEMENT.equals(qname)) {

+                            property = new SpringPropertyElement(reader.getAttributeValue(null, "name"), reader

+                                    .getAttributeValue(null, "ref"));

+                            bean.addProperty(property);

+                        } else if (SpringImplementationConstants.CONSTRUCTORARG_ELEMENT.equals(qname)) {

+                            constructorArg = new SpringConstructorArgElement(reader.getAttributeValue(null, "ref"), 

+                                    reader.getAttributeValue(null, "type"));

+                            autoConstructorIndex++;

+                            constructorArg.setAutoIndex(autoConstructorIndex);

+                            if (reader.getAttributeValue(null, "index") != null)

+                            	constructorArg.setIndex((new Integer(reader.getAttributeValue(null, "index"))).intValue());

+                            if (reader.getAttributeValue(null, "value") != null) {

+                            	String value = reader.getAttributeValue(null, "value");

+                            	constructorArg.addValue(value);

+                            	if ((value.indexOf(".xml") != -1)) {

+                                    if ((bean.getClassName().indexOf(".ClassPathXmlApplicationContext") != -1) ||

+                                        (bean.getClassName().indexOf(".FileSystemXmlApplicationContext") != -1)) {                                    

+                                        XMLStreamReader creader = getApplicationContextReader(value);

+                                        // Read the context definition for the constructor-arg resources

+                                        readContextDefinition(creader, beans, services, references, scaproperties);

+                                    }

+                                }

+                            }

+                            bean.addCustructorArgs(constructorArg);

+                        } else if (SpringImplementationConstants.REF_ELEMENT.equals(qname)) {

+                            String ref = reader.getAttributeValue(null, "bean");

+                            // Check if the parent element is a property 

+                            if (property != null) property.setRef(ref);

+                            // Check if the parent element is a constructor-arg

+                            if (constructorArg != null) constructorArg.setRef(ref);

+                        } else if (SpringImplementationConstants.VALUE_ELEMENT.equals(qname)) {

+                            String value = reader.getElementText();

+                            // Check if the parent element is a constructor-arg

+                            if (constructorArg != null) {

+                            	constructorArg.addValue(value);

+                                // Identify the XML resource specified for the constructor-arg element

+                                if ((value.indexOf(".xml") != -1)) {

+                                    if ((bean.getClassName().indexOf(".ClassPathXmlApplicationContext") != -1) ||

+                                        (bean.getClassName().indexOf(".FileSystemXmlApplicationContext") != -1)) {                                    

+                                        XMLStreamReader creader = getApplicationContextReader(value);

+                                        // Read the context definition for the constructor-arg resources

+                                        readContextDefinition(creader, beans, services, references, scaproperties);

+                                    }

+                                }

+                            }

+                        } // end if

+                        break;

+                    case END_ELEMENT:

+                        if (SpringImplementationConstants.BEAN_ELEMENT.equals(reader.getName())) {

+                            completed = true;

+                            break;

+                        } else if (SpringImplementationConstants.PROPERTY_ELEMENT.equals(reader.getName())) {

+                            property = null;

+                        } else if (SpringImplementationConstants.CONSTRUCTORARG_ELEMENT.equals(reader.getName())) {

+                            constructorArg = null;

+                        } // end if

+                } // 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

+     */

+    private void generateComponentType(SpringImplementation implementation,

+                                       List<SpringBeanElement> beans,

+                                       List<SpringSCAServiceElement> services,

+                                       List<SpringSCAReferenceElement> references,

+                                       List<SpringSCAPropertyElement> scaproperties) throws ContributionReadException {

+        /*

+         * 1. Each sca:service becomes a service in the component type

+         * 2. Each sca:reference becomes a reference in the component type

+         * 3. Each sca:property becomes a property in the component type

+         * 4. IF there are no explicit service elements, each bean becomes a service

+         * 5. Each bean property which is a reference not pointing at another bean in the 

+         *    application context becomes a reference unless it is pointing at one of the references

+         * 6. Each bean property which is not a reference and which is not pointing 

+         *    at another bean in the application context becomes a property in the component type

+         */

+

+    	JavaImplementation javaImplementation = null;

+        ComponentType componentType = implementation.getComponentType();

+

+        try {

+            // Deal with the services first....												

+            Iterator<SpringSCAServiceElement> its = services.iterator();

+            while (its.hasNext()) {

+                SpringSCAServiceElement serviceElement = its.next();

+                Class<?> interfaze = cl.loadClass(serviceElement.getType());

+                Service theService = createService(interfaze, serviceElement.getName());

+                componentType.getServices().add(theService);

+                // Add this service to the Service / Bean map

+                String beanName = serviceElement.getTarget();

+                for (SpringBeanElement beanElement : beans) {

+                    if (beanName.equals(beanElement.getId())) {

+                        implementation.setBeanForService(theService, beanElement);

+                    }

+                } // end for

+            } // end while

+

+            // Next handle the references

+            Iterator<SpringSCAReferenceElement> itr = references.iterator();

+            while (itr.hasNext()) {

+                SpringSCAReferenceElement referenceElement = itr.next();

+                Class<?> interfaze = cl.loadClass(referenceElement.getType());

+                Reference theReference = createReference(interfaze, referenceElement.getName());

+                componentType.getReferences().add(theReference);

+            } // end while

+            

+            // Next handle the properties

+            Iterator<SpringSCAPropertyElement> itsp = scaproperties.iterator();

+            while (itsp.hasNext()) {

+                SpringSCAPropertyElement scaproperty = itsp.next();

+                // Create a component type property if the SCA property element has a name

+                // and a type declared...

+                if (scaproperty.getType() != null && scaproperty.getName() != null) {

+                    Property theProperty = assemblyFactory.createProperty();

+                    theProperty.setName(scaproperty.getName());

+                    // Get the Java class and then an XSD element type for the property

+                    Class<?> propType = Class.forName(scaproperty.getType());

+                    theProperty.setXSDType(JavaXMLMapper.getXMLType(propType));

+                    componentType.getProperties().add(theProperty);

+                    // Remember the Java Class (ie the type) for this property

+                    implementation.setPropertyClass(theProperty.getName(), propType);

+                } // end if 

+            } // end while

+

+            // Finally deal with the beans

+            Iterator<SpringBeanElement> itb;

+            // If there are no explicit service elements, then expose all the beans

+            if (services.isEmpty()) {

+                itb = beans.iterator();

+                // Loop through all the beans found

+                while (itb.hasNext()) {

+                    SpringBeanElement beanElement = itb.next();

+                    // If its a innerBean, ignore it

+                    if (beanElement.isInnerBean()) continue;

+                    // Load the Spring bean class

+                    Class<?> beanClass = cl.loadClass(beanElement.getClassName());

+                    // Introspect the bean

+                    beanIntrospector =

+                        new SpringBeanIntrospector(assemblyFactory, javaFactory, policyFactory, beanElement.getCustructorArgs());

+                    ComponentType beanComponentType = assemblyFactory.createComponentType();

+                    javaImplementation = beanIntrospector.introspectBean(beanClass, beanComponentType);

+                    // Get the service interface defined by this Spring Bean and add to

+                    // the component type of the Spring Assembly

+                    List<Service> beanServices = beanComponentType.getServices();

+                    componentType.getServices().addAll(beanServices);

+                    // Add these services to the Service / Bean map

+                    for (Service beanService : beanServices) {

+                        implementation.setBeanForService(beanService, beanElement);

+                    }

+                } // end while

+            } // end if

+          

+            itb = beans.iterator();

+            while (itb.hasNext()) {

+                SpringBeanElement beanElement = itb.next();               

+                // Ignore if the bean has no properties and constructor arguments

+                if (beanElement.getProperties().isEmpty() && beanElement.getCustructorArgs().isEmpty()) 

+                	continue;

+                

+                Class<?> beanClass = cl.loadClass(beanElement.getClassName());

+                // Introspect the bean

+                beanIntrospector =

+                    new SpringBeanIntrospector(assemblyFactory, javaFactory, policyFactory, beanElement.getCustructorArgs());

+                ComponentType beanComponentType = assemblyFactory.createComponentType();

+                javaImplementation = beanIntrospector.introspectBean(beanClass, beanComponentType);

+                Map<String, JavaElementImpl> propertyMap = javaImplementation.getPropertyMembers();

+                JavaConstructorImpl constructor = javaImplementation.getConstructor();

+                // Get the references by this Spring Bean and add the unresolved ones to

+                // the component type of the Spring Assembly

+                List<Reference> beanReferences = beanComponentType.getReferences();

+                List<Property> beanProperties = beanComponentType.getProperties();

+                

+                Iterator<SpringPropertyElement> itp = beanElement.getProperties().iterator();

+                while (itp.hasNext()) {

+                    SpringPropertyElement propertyElement = itp.next();

+                    if (propertyRefUnresolved(propertyElement.getRef(), beans, references, scaproperties)) {

+                        // This means an unresolved reference from the spring bean...

+                    	for (Reference reference : beanReferences) {

+                            if (propertyElement.getName().equals(reference.getName())) {

+                            	// The name of the reference in this case is the string in

+                                // the @ref attribute of the Spring property element, NOT the

+                                // name of the field in the Spring bean....

+                                reference.setName(propertyElement.getRef());

+                                componentType.getReferences().add(reference);

+                            } // end if

+                        } // end for

+                    	

+                    	// Store the unresolved references as unresolvedBeanRef in the Spring Implementation type

+                    	for (Property scaproperty : beanProperties) {

+                            if (propertyElement.getName().equals(scaproperty.getName())) {

+                            	// The name of the reference in this case is the string in

+                                // the @ref attribute of the Spring property element, NOT the

+                                // name of the field in the Spring bean....

+                            	Class<?> interfaze = cl.loadClass((propertyMap.get(propertyElement.getName()).getType()).getName());                                            

+                                Reference theReference = createReference(interfaze, propertyElement.getRef());

+                                implementation.setUnresolvedBeanRef(propertyElement.getRef(), theReference);

+                            } // end if

+                    	} // end for

+                    } // end if

+                } // end while

+                

+                Iterator<SpringConstructorArgElement> itcr = beanElement.getCustructorArgs().iterator();

+                while (itcr.hasNext()) {

+                	SpringConstructorArgElement conArgElement = itcr.next();

+                    if (propertyRefUnresolved(conArgElement.getRef(), beans, references, scaproperties)) {

+                    	for (JavaParameterImpl parameter : constructor.getParameters()) {

+                    		String paramType = parameter.getType().getName();

+                    		Class<?> interfaze = cl.loadClass(paramType);

+                    		// Create a component type reference/property if the constructor-arg element has a

+                            // type attribute OR index attribute declared...

+                    		if ((conArgElement.getType() != null && paramType.equals(conArgElement.getType())) || 

+                    		    (conArgElement.getIndex() != -1 && (conArgElement.getIndex() == parameter.getIndex())) || 

+                    		    (conArgElement.getAutoIndex() == parameter.getIndex())) 

+                    		{

+                    			if (parameter.getClassifer().getName().equals("org.osoa.sca.annotations.Reference")) {

+                    				Reference theReference = createReference(interfaze, conArgElement.getRef());

+                    				componentType.getReferences().add(theReference);

+                    			}

+                    			if (parameter.getClassifer().getName().equals("org.osoa.sca.annotations.Property")) {

+                    				// Store the unresolved references as unresolvedBeanRef in the Spring Implementation type

+                                	// we might need to verify with the component definition later.

+                    				Reference theReference = createReference(interfaze, conArgElement.getRef());

+                        			implementation.setUnresolvedBeanRef(conArgElement.getRef(), theReference);

+                    			}

+                    		}                        	

+                    	} // end for                        

+                    } // end if

+                } // end while

+                

+            } // end while

+

+        } catch (ClassNotFoundException e) {

+            // Means that either an interface class, property class or a bean was not found

+            throw new ContributionReadException(e);

+        } catch (InvalidInterfaceException e) {

+            throw new ContributionReadException(e);

+        } catch (ContributionResolveException e) {

+        	

+        } // end try

+

+        // If we get here, the Spring assembly component type is resolved

+        componentType.setUnresolved(false);

+        implementation.setComponentType(componentType);

+        return;

+    } // end method generateComponentType

+

+    /*

+     * Determines whether a reference attribute of a Spring property element is resolved either

+     * by a bean in the application context or by an SCA reference element or by an SCA property

+     * element

+     * @param ref - a String containing the name of the reference - may be null

+     * @param beans - a List of SpringBean elements

+     * @param references - a List of SCA reference elements

+     * @return true if the property is not resolved, false if it is resolved

+     */

+    private boolean propertyRefUnresolved(String ref,

+                                          List<SpringBeanElement> beans,

+                                          List<SpringSCAReferenceElement> references,

+                                          List<SpringSCAPropertyElement> scaproperties) {

+        boolean unresolved = true;

+

+        if (ref != null) {

+            // Scan over the beans looking for a match

+            Iterator<SpringBeanElement> itb = beans.iterator();

+            while (itb.hasNext()) {

+                SpringBeanElement beanElement = itb.next();

+                // Does the bean name match the ref?

+                if (ref.equals(beanElement.getId())) {

+                    unresolved = false;

+                    break;

+                } // end if

+            } // end while

+            // Scan over the SCA reference elements looking for a match

+            if (unresolved) {

+                Iterator<SpringSCAReferenceElement> itr = references.iterator();

+                while (itr.hasNext()) {

+                    SpringSCAReferenceElement referenceElement = itr.next();

+                    if (ref.equals(referenceElement.getName())) {

+                        unresolved = false;

+                        break;

+                    } // end if

+                } // end while

+            } // end if

+            // Scan over the SCA property elements looking for a match

+            if (unresolved) {

+                Iterator<SpringSCAPropertyElement> itsp = scaproperties.iterator();

+                while (itsp.hasNext()) {

+                    SpringSCAPropertyElement propertyElement = itsp.next();

+                    if (ref.equals(propertyElement.getName())) {

+                        unresolved = false;

+                        break;

+                    } // end if

+                } // end while

+            } // end if

+        } else {

+            // In the case where ref = null, the property is not going to be a reference of any

+            // kind and can be ignored

+            unresolved = false;

+        } // end if

+

+        return unresolved;

+

+    } // end method propertyRefUnresolved

+

+    /**

+     * Gets hold of the application-context.xml file as a Spring resource

+     * @param locationAttr - the location attribute from the <implementation.spring../> element

+     * @param cl - the ClassLoader for the Spring implementation

+     */

+    protected URL getApplicationContextResource(String locationAttr, ClassLoader cl)

+        throws ContributionReadException {

+        File manifestFile = null;

+        File appXmlFile;

+        File locationFile = null;

+        

+        URL url = cl.getResource(locationAttr);

+        if (url != null) {

+            String path = url.getPath();

+            locationFile = new File(path);            

+        } else {

+            throw new ContributionReadException(

+                    "SpringXMLLoader getApplicationContextResource: " + "unable to find resource file " 

+                        + locationAttr);

+        }

+

+        if (locationFile.isDirectory()) {

+            try {

+                manifestFile = new File(locationFile, "META-INF"+ File.separator +"MANIFEST.MF");                

+                if (manifestFile.exists()) {

+                    Manifest mf = new Manifest(new FileInputStream(manifestFile));

+                    Attributes mainAttrs = mf.getMainAttributes();

+                    String appCtxPath = mainAttrs.getValue("Spring-Context");

+                    if (appCtxPath != null) {

+                        appXmlFile = new File(locationFile, appCtxPath);

+                        if (appXmlFile.exists()) {

+                            return appXmlFile.toURL();

+                        }

+                    }

+                }

+                // no manifest-specified Spring context, use default

+                appXmlFile = new File(locationFile, "META-INF" + File.separator + "spring" 

+                                                        + File.separator + SpringImplementationConstants.APPLICATION_CONTEXT);

+                if (appXmlFile.exists()) {

+                    return appXmlFile.toURL();

+                }

+            } catch (IOException e) {

+                throw new ContributionReadException("Error reading manifest " + manifestFile);

+            }

+        } else {          

+        	if (locationFile.isFile() && locationFile.getName().endsWith(".jar")) {

+                try {

+                    JarFile jf = new JarFile(locationFile);

+                    JarEntry je;

+                    Manifest mf = jf.getManifest();

+                    if (mf != null) {

+                        Attributes mainAttrs = mf.getMainAttributes();

+                        String appCtxPath = mainAttrs.getValue("Spring-Context");

+                        if (appCtxPath != null) {

+                            je = jf.getJarEntry(appCtxPath);

+                            if (je != null) {

+                                // TODO return a Spring specific Resource type for jars

+                                return new URL("jar:" + locationFile.toURI().toURL() + "!/" + appCtxPath);

+                            }

+                        }

+                    }

+                    je = jf.getJarEntry("META-INF" + "/" + "spring" + "/" + SpringImplementationConstants.APPLICATION_CONTEXT);

+                    if (je != null) {

+                        return new URL("jar:" + locationFile.toURI().toURL() + "!/" + SpringImplementationConstants.APPLICATION_CONTEXT);

+                    }

+                } catch (IOException e) {

+                    // bad archive

+                    // TODO: create a more appropriate exception type

+                    throw new ContributionReadException("SpringXMLLoader getApplicationContextResource: " 

+                    												+ " IO exception reading context file.", e);

+                }

+        	}

+        	else {

+        		if (locationFile.getName().endsWith(".xml")) {

+        			return url;

+        		} 

+        		else {

+        			// Deal with the directory inside a jar file, in case the contribution itself is a JAR file.

+        			try {

+	        			if (locationFile.getPath().indexOf(".jar") > 0) {

+	        				String jarEntry = url.getPath().substring(6, url.getPath().indexOf("!"));

+	        				JarFile jf = new JarFile(jarEntry);	        				

+	        				JarEntry je = jf.getJarEntry(url.getPath().substring(url.getPath().indexOf("!/")+2) 

+	        												+ "/" + "META-INF" + "/" + "MANIFEST.MF");

+	        			    if (je != null) {

+	        					Manifest mf = new Manifest(jf.getInputStream(je));

+	        					Attributes mainAttrs = mf.getMainAttributes();

+	                            String appCtxPath = mainAttrs.getValue("Spring-Context");

+	                            if (appCtxPath != null) {

+	                                je = jf.getJarEntry(url.getPath().substring(url.getPath().indexOf("!/")+2) + "/" + appCtxPath);

+	                                if (je != null) {

+	                                    return new URL("jar:" + url.getPath() + "/" + appCtxPath);

+	                                }

+	                            }

+	        				}

+	        			}	        			

+            		} catch (IOException e) {

+                        throw new ContributionReadException("Error reading manifest " + manifestFile);

+                    }

+        		}        		

+        	}

+        }

+

+        throw new ContributionReadException("SpringXMLLoader getApplicationContextResource: " 

+                                        + "META-INF/spring/" + SpringImplementationConstants.APPLICATION_CONTEXT + "not found");

+    } // end method getApplicationContextResource

+

+    /**

+     * Creates a Service for the component type based on its name and Java interface

+     */

+    public Service createService(Class<?> interfaze, String name) throws InvalidInterfaceException {

+        Service service = assemblyFactory.createService();

+        JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();

+        service.setInterfaceContract(interfaceContract);

+

+        // Set the name for the service

+        service.setName(name);

+

+        // Set the call interface and, if present, the callback interface

+        JavaInterface callInterface = javaFactory.createJavaInterface(interfaze);

+        service.getInterfaceContract().setInterface(callInterface);

+        if (callInterface.getCallbackClass() != null) {

+            JavaInterface callbackInterface = javaFactory.createJavaInterface(callInterface.getCallbackClass());

+            service.getInterfaceContract().setCallbackInterface(callbackInterface);

+        }

+        return service;

+    } // end method createService

+

+    /**

+     * Creates a Reference for the component type based on its name and Java interface

+     */

+    private org.apache.tuscany.sca.assembly.Reference createReference(Class<?> interfaze, String name)

+        throws InvalidInterfaceException {

+        org.apache.tuscany.sca.assembly.Reference reference = assemblyFactory.createReference();

+        JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();

+        reference.setInterfaceContract(interfaceContract);

+

+        // Set the name of the reference to the supplied name and the multiplicity of the reference

+        // to 1..1 - for Spring implementations, this is the only multiplicity supported

+        reference.setName(name);

+        reference.setMultiplicity(Multiplicity.ONE_ONE);

+

+        // Set the call interface and, if present, the callback interface

+        JavaInterface callInterface = javaFactory.createJavaInterface(interfaze);

+        reference.getInterfaceContract().setInterface(callInterface);

+        if (callInterface.getCallbackClass() != null) {

+            JavaInterface callbackInterface = javaFactory.createJavaInterface(callInterface.getCallbackClass());

+            reference.getInterfaceContract().setCallbackInterface(callbackInterface);

+        }

+

+        return reference;

+    }

+} // end class SpringXMLComponentTypeLoader

diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ComponentTie.java
index b34b1ee0b1..2f245d7f06 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java
+++ b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ComponentTie.java
@@ -1,40 +1,41 @@
-/*
- * 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;
-
-/**
- * @version $Rev$ $Date$
- */
-public class SpringOperationNotFoundException extends Exception {
-
-    private static final long serialVersionUID = -1157790036638157554L;
-
-    public SpringOperationNotFoundException(String msg) {
-        super(msg);
-    }
-    
-    public SpringOperationNotFoundException(Throwable e) {
-        super(e);
-    }
-    
-    public SpringOperationNotFoundException(String msg,Throwable e) {
-        super(msg,e);
-    }
-
-}
+/*

+ * 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/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/PropertyValueTie.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/PropertyValueTie.java
new file mode 100644
index 0000000000..743abaa79b
--- /dev/null
+++ b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/PropertyValueTie.java
@@ -0,0 +1,53 @@
+/*

+ * 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.implementation.java.injection.JavaPropertyValueObjectFactory;

+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 JavaPropertyValueObjectFactory propertyFactory;

+    

+    public PropertyValueTie(RuntimeComponent component, JavaPropertyValueObjectFactory 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.createValueFactory(prop, prop.getValue(), type).getInstance();

+            } 

+        }         

+        return null; // property name not found

+    }

+}

diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringContextStub.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringContextStub.java
new file mode 100644
index 0000000000..3d8d4112f0
--- /dev/null
+++ b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringContextStub.java
@@ -0,0 +1,130 @@
+/*

+ * 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.net.URL;

+

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

+import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;

+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,

+                               ProxyFactory proxyService,

+                               JavaPropertyValueObjectFactory propertyValueObjectFactory) {

+

+        initTie(component, implementation, propertyValueObjectFactory);        

+

+    }

+

+    private void initTie(RuntimeComponent component,

+                         SpringImplementation implementation,

+                         JavaPropertyValueObjectFactory 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, component, propertyValueObjectFactory));

+

+            Class<?> tieClass = Class.forName("org.apache.tuscany.sca.implementation.spring.runtime.context.SpringContextTie", true, cl);

+            Constructor<?> tieConstructor = tieClass.getConstructor(new Class<?>[]{stubClass, URL.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) {

+            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) {

+            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) {

+            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) {

+            throw new RuntimeException(e);

+        }

+    }

+

+}

diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProvider.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProvider.java
new file mode 100644
index 0000000000..e010f30776
--- /dev/null
+++ b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProvider.java
@@ -0,0 +1,85 @@
+/*

+ * 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.core.invocation.ProxyFactory;

+import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;

+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: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $ 

+ */

+public class SpringImplementationProvider implements ImplementationProvider {

+    private RuntimeComponent component;

+    

+    // A Spring application context object

+    private SpringContextStub springContext;

+    

+    private SpringImplementation implementation;

+    

+    private JavaPropertyValueObjectFactory propertyValueObjectFactory;

+

+    /**

+     * 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,

+                                        ProxyFactory proxyService,

+                                        JavaPropertyValueObjectFactory propertyValueObjectFactory) {

+        super();

+        this.implementation = implementation;

+        this.component = component;

+        this.propertyValueObjectFactory = propertyValueObjectFactory;

+

+        springContext = new SpringContextStub(component, implementation, 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/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProviderFactory.java
index 9f46683bcb..b7deeb2eb5 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java
+++ b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProviderFactory.java
@@ -1,85 +1,77 @@
-/*
- * 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;
-
-import java.util.List;
-
-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.core.invocation.ProxyFactoryExtensionPoint;
-import org.apache.tuscany.sca.databinding.Mediator;
-import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;
-import org.apache.tuscany.sca.policy.util.PolicyHandlerDefinitionsLoader;
-import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
-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: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $
- *
- */
-public class SpringImplementationProviderFactory implements ImplementationProviderFactory<SpringImplementation> {
-
-    private ProxyFactory proxyFactory;
-    private JavaPropertyValueObjectFactory propertyFactory;
-    private List<PolicyHandlerTuple> policyHandlerClassNames = null;
-
-    /**
-     * Simple constructor
-     *
-     */
-    public SpringImplementationProviderFactory(ExtensionPointRegistry extensionPoints) {
-        super();
-
-        ProxyFactoryExtensionPoint proxyFactories = extensionPoints.getExtensionPoint(ProxyFactoryExtensionPoint.class);
-        proxyFactory = new ExtensibleProxyFactory(proxyFactories);
-
-        Mediator mediator = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class).getUtility(Mediator.class);
-        propertyFactory = new JavaPropertyValueObjectFactory(mediator);
-
-        policyHandlerClassNames = PolicyHandlerDefinitionsLoader.loadPolicyHandlerClassnames();
-    }
-
-    /**
-     * 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) {
-        return new SpringImplementationProvider(component,
-                                                implementation,
-                                                proxyFactory,
-                                                propertyFactory,
-                                                policyHandlerClassNames);
-    }
-
-    /**
-     * Returns the class of the Spring implementation
-     */
-    public Class<SpringImplementation> getModelType() {
-        return SpringImplementation.class;
-    }
-} // end class SpringImplementationProviderFactory
+/*

+ * 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.core.ExtensionPointRegistry;

+import org.apache.tuscany.sca.core.invocation.ExtensibleProxyFactory;

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

+import org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint;

+import org.apache.tuscany.sca.databinding.impl.MediatorImpl;

+import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;

+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: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $ 

+ *

+ */

+public class SpringImplementationProviderFactory implements ImplementationProviderFactory<SpringImplementation> {

+

+    private ProxyFactory proxyFactory;

+    private JavaPropertyValueObjectFactory propertyFactory;

+

+    /**

+     * Simple constructor

+     *

+     */

+    public SpringImplementationProviderFactory(ExtensionPointRegistry extensionPoints) {

+        super();

+        

+        ProxyFactoryExtensionPoint proxyFactories = extensionPoints.getExtensionPoint(ProxyFactoryExtensionPoint.class); 

+        proxyFactory = new ExtensibleProxyFactory(proxyFactories); 

+

+        // TODO: could the runtime have a default PropertyValueObjectFactory?

+        propertyFactory = new JavaPropertyValueObjectFactory(new MediatorImpl(extensionPoints));

+    }

+

+    /**

+     * 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) {

+        return new SpringImplementationProvider(component, 

+                                                implementation, 

+                                                proxyFactory, 

+                                                propertyFactory);

+    }

+

+    /**

+     * Returns the class of the Spring implementation

+     */

+    public Class<SpringImplementation> getModelType() {

+        return SpringImplementation.class;

+    }

+} // end class SpringImplementationProviderFactory

diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java
new file mode 100644
index 0000000000..ac913fdee2
--- /dev/null
+++ b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java
@@ -0,0 +1,143 @@
+/*

+ * 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.core.factory.ObjectFactory;

+import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;

+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 RuntimeComponent component;

+    private JavaPropertyValueObjectFactory propertyFactory;

+    

+    public SpringImplementationTie(SpringImplementation implementation, RuntimeComponent component, JavaPropertyValueObjectFactory propertyFactory) {

+        this.implementation = implementation;

+        this.component = component;

+        this.propertyFactory = propertyFactory;

+    }

+    

+    public String getURI() {

+        throw new IllegalStateException("Not yet impl");

+    }

+

+    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

+                ObjectFactory factory = propertyFactory.createValueFactory(prop, prop.getValue(), requiredType);

+                propertyObject = (B)factory.getInstance();

+            } // 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) {

+        System.out.println("Spring parent context - getBean called for name: " + name);

+        // 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);

+

+    } // end method getBean( String, Class )

+    

+    public Object getComponentTie() {

+        return new ComponentTie(component);

+    }

+

+    public Object getPropertyValueTie() {

+        return new PropertyValueTie(component, propertyFactory);

+    }

+}

diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvocationException.java
index 410525a054..d1330f8471 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java
+++ b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvocationException.java
@@ -1,40 +1,40 @@
-/*
- * 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;
-
-/**
- * @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);
-    }
-
-}
+/*

+ * 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/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvoker.java
index 3a183b7a4e..3bf68a689c 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java
+++ b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvoker.java
@@ -1,127 +1,124 @@
-/*
- * 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;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.sca.implementation.spring.xml.SpringBeanElement;
-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;
-import org.springframework.beans.BeansException;
-import org.springframework.context.support.AbstractApplicationContext;
-
-/**
- * Initial implementation of a Spring bean invoker
- * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $ 
- */
-public class SpringInvoker implements Invoker {
-
-    private Method theMethod = null;
-    private Object bean;
-    private SpringBeanElement beanElement;
-    private boolean badInvoker = false;
-
-    private AbstractApplicationContext 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,
-                         AbstractApplicationContext 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 (BeansException e) {
-            throw new SpringInvocationException(e);
-        } 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
+/*

+ * 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: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $ 

+ */

+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/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java
deleted file mode 100644
index cd0567f461..0000000000
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java
+++ /dev/null
@@ -1,151 +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.processor;

-

-import java.lang.reflect.Field;

-import java.lang.reflect.Method;

-import java.lang.reflect.Modifier;

-import java.beans.PropertyDescriptor;

-import java.lang.annotation.Annotation;

-

-import org.springframework.util.Assert;

-import org.springframework.beans.BeanUtils;

-import org.springframework.util.ReflectionUtils;

-import org.springframework.beans.BeansException;

-import org.springframework.beans.FatalBeanException;

-import org.springframework.beans.factory.config.BeanPostProcessor;

-

-import org.osoa.sca.annotations.ComponentName;

-import org.apache.tuscany.sca.runtime.RuntimeComponent;

-

-public class ComponentNameAnnotationProcessor implements BeanPostProcessor {

-

-    private Class<? extends Annotation> componentNameAnnotationType = ComponentName.class;

-    

-    private RuntimeComponent component;

-    

-    public ComponentNameAnnotationProcessor (RuntimeComponent component) {

-        this.component = component;

-    }

-    

-    /**

-     * Gets componentName annotation type.

-     */

-    protected Class<? extends Annotation> getComponentNameAnnotationType() {

-        return this.componentNameAnnotationType;

-    }

-

-    /**

-     * Sets componentName annotation type.

-     */

-    public void setComponentNameAnnotationType(Class<? extends Annotation> componentNameAnnotationType) {

-        Assert.notNull(componentNameAnnotationType, "'componentNameAnnotationType' type must not be null.");

-        this.componentNameAnnotationType = componentNameAnnotationType;

-    }

-

-    /**

-     * This method is used to execute before a bean's initialization callback.

-     * 

-     * @see org.springframework.beans.factory.config.BeanPostProcessor#postProcessBeforeInitialization(java.lang.Object, java.lang.String)

-     */

-    public Object postProcessBeforeInitialization(Object bean, String beanName) 

-    throws BeansException {

-        processAnnotation(bean);

-        return bean;

-    }

-

-    /**

-     * This method is used to execute after a bean's initialization callback.

-     * 

-     * @see org.springframework.beans.factory.config.BeanPostProcessor#postProcessAfterInitialization(java.lang.Object, java.lang.String)

-     */

-    public Object postProcessAfterInitialization(Object bean, String beanName)

-    throws BeansException {

-        return bean;

-    }

-

-    /**

-     * <p>Processes a beans fields for injection if it has a {@link Reference} annotation.</p>

-     */

-    protected void processAnnotation(final Object bean) {

-        

-        final Class<?> clazz = bean.getClass();

-

-        ReflectionUtils.doWithFields(clazz, new ReflectionUtils.FieldCallback() {

-            public void doWith(Field field) {

-                Annotation annotation = field.getAnnotation(getComponentNameAnnotationType());

-

-                if (annotation != null) {

-                    if (Modifier.isStatic(field.getModifiers())) {

-                        throw new IllegalStateException("ComponentName annotation is not supported on static fields");

-                    }

-                    

-                    if (Modifier.isPrivate(field.getModifiers())) {

-                        throw new IllegalStateException("ComponentName annotation is not supported on private fields");

-                    }

-

-                    ReflectionUtils.makeAccessible(field);

-                    

-                    if (field.getType().getName().equals("java.lang.String")) {

-                        Object nameObj = component.getName();   

-                        if (nameObj != null)

-                            ReflectionUtils.setField(field, bean, nameObj);

-                    } else {

-                        throw new IllegalStateException("ComponentName annotation is supported only on java.lang.String field type.");

-                    }

-                }

-            }

-        });

-

-        ReflectionUtils.doWithMethods(clazz, new ReflectionUtils.MethodCallback() {

-            public void doWith(Method method) {

-                Annotation annotation = method.getAnnotation(getComponentNameAnnotationType());

-                

-                if (annotation != null) {

-                    if (Modifier.isStatic(method.getModifiers())) {

-                        throw new IllegalStateException("ComponentName annotation is not supported on static methods");

-                    }

-                    

-                    if (Modifier.isPrivate(method.getModifiers())) {

-                        throw new IllegalStateException("ComponentName annotation is not supported on private methods");

-                    }

-

-                    if (method.getParameterTypes().length == 0) {

-                        throw new IllegalStateException("ComponentName annotation requires at least one argument: " + method);

-                    }

-                    

-                    PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method);                    

-                    

-                    if (pd.getPropertyType().getName().equals("java.lang.String")) {

-                        Object nameObj = component.getName();                    

-                        if (nameObj != null) {

-                            try {                                                       

-                                pd.getWriteMethod().invoke(bean, new Object[] { nameObj });

-                            } catch (Throwable e) {

-                                throw new FatalBeanException("Problem injecting reference:  " + e.getMessage(), e);

-                            }

-                        }

-                    } else {

-                        throw new IllegalStateException("ComponentName annotation is supported only on java.lang.String field type.");

-                    }

-                }

-            }

-        });

-    }

-}

diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java
deleted file mode 100644
index 4dadf37189..0000000000
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java
+++ /dev/null
@@ -1,119 +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.processor;

-

-import java.lang.reflect.Method;

-import java.lang.reflect.Modifier;

-import java.lang.reflect.Constructor;

-import java.lang.annotation.Annotation;

-import java.util.ArrayList;

-import java.util.List;

-

-import org.springframework.util.Assert;

-import org.springframework.beans.BeansException;

-import org.springframework.beans.factory.config.InstantiationAwareBeanPostProcessorAdapter;

-import org.springframework.beans.factory.annotation.Autowired;

-

-public class ConstructorAnnotationProcessor extends InstantiationAwareBeanPostProcessorAdapter {

-

-    private Class<? extends Annotation> constructorAnnotationType 

-                                            = org.osoa.sca.annotations.Constructor.class;

-    

-    private Class<? extends Annotation> autowiredAnnotationType = Autowired.class;

-    

-    public ConstructorAnnotationProcessor () {

-        // Default constructor.

-    }

-    

-    /**

-     * Set the 'autowired' annotation type, to be used on constructors, fields,

-     * setter methods and arbitrary config methods.

-     */

-    public void setAutowiredAnnotationType(Class<? extends Annotation> autowiredAnnotationType) {

-        Assert.notNull(autowiredAnnotationType, "'autowiredAnnotationType' must not be null");

-        this.autowiredAnnotationType = autowiredAnnotationType;

-    }

-

-    /**

-     * Return the 'autowired' annotation type.

-     */

-    protected Class<? extends Annotation> getAutowiredAnnotationType() {

-        return this.autowiredAnnotationType;

-    }

-    

-    /**

-     * Return the 'constructor' annotation type.

-     */

-    protected Class<? extends Annotation> getConstructorAnnotationType() {

-        return this.constructorAnnotationType;

-    }

-

-    /**

-     * Sets the 'constructor' annotation type.

-     */

-    public void setConstructorAnnotationType(Class<? extends Annotation> constructorAnnotationType) {

-        Assert.notNull(constructorAnnotationType, "'constructorAnnotationType' type must not be null.");

-        this.constructorAnnotationType = constructorAnnotationType;

-    }

-

-    /**

-     * This method is used to execute before a bean's initialization callback.

-     * 

-     * @see org.springframework.beans.factory.config.BeanPostProcessor#postProcessBeforeInitialization(java.lang.Object, java.lang.String)

-     */

-    public Object postProcessBeforeInitialization(Object bean, String beanName) 

-    throws BeansException {

-        return bean;

-    }

-

-    /**

-     * This method is used to execute after a bean's initialization callback.

-     * 

-     * @see org.springframework.beans.factory.config.BeanPostProcessor#postProcessAfterInitialization(java.lang.Object, java.lang.String)

-     */

-    public Object postProcessAfterInitialization(Object bean, String beanName)

-    throws BeansException {

-        return bean;

-    }

-    

-    public Constructor[] determineCandidateConstructors(Class beanClass, String beanName) throws BeansException {

-        /*Constructor[] declaredConstructors = beanClass.getDeclaredConstructors();                

-        Method[] declaredMethods = beanClass.getDeclaredMethods();

-        List candidates = new ArrayList(declaredConstructors.length);

-

-        for (int i = 0; i < declaredMethods.length; i++) {

-            Method method = declaredMethods[i];

-            Annotation annotation = method.getAnnotation(getConstructorAnnotationType());

-            if (annotation != null) {

-                if (Modifier.isStatic(method.getModifiers())) {

-                    throw new IllegalStateException("Constructor annotation is not supported on static methods");

-                }

-                

-                if (candidates.size() == 1) {

-                    throw new IllegalStateException("Only one method is allowed to have constructor annotation in a bean: " + method);

-                }

-                

-                candidates.add(method);

-            }

-        }

-

-        return (Constructor[]) candidates.toArray(new Constructor[candidates.size()]);*/

-        return null;

-    }

-}

diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java
deleted file mode 100644
index 44737bf9d1..0000000000
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java
+++ /dev/null
@@ -1,72 +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.processor;

-

-import java.lang.annotation.Annotation;

-import org.osoa.sca.annotations.Init;

-import org.osoa.sca.annotations.Destroy;

-import org.springframework.beans.factory.annotation.InitDestroyAnnotationBeanPostProcessor;

-import org.springframework.util.Assert;

-

-public class InitDestroyAnnotationProcessor extends InitDestroyAnnotationBeanPostProcessor {    

-    

-    private static final long serialVersionUID = 0;

-    

-    private Class<? extends Annotation> initAnnotationType = Init.class;

-

-    private Class<? extends Annotation> destroyAnnotationType = Destroy.class;

-    

-    /**

-     * Gets init annotation type.

-     */

-    protected Class<? extends Annotation> getInitAnnotationType() {

-        return this.initAnnotationType;

-    }

-

-    /**

-     * Sets init annotation type.

-     */

-    /*public void setInitAnnotationType(Class<? extends Annotation> initAnnotationType) {

-        Assert.notNull(initAnnotationType, "Init annotation type must not be null.");

-        this.initAnnotationType = initAnnotationType;

-    }*/

-    

-    /**

-     * Gets destroy annotation type.

-     */

-    protected Class<? extends Annotation> getDestroyAnnotationType() {

-        return this.destroyAnnotationType;

-    }

-

-    /**

-     * Sets destroy annotation type.

-     */

-    /*public void setDestroyAnnotationType(Class<? extends Annotation> destroyAnnotationType) {

-        Assert.notNull(destroyAnnotationType, "Destroy annotation type must not be null.");

-        this.destroyAnnotationType = destroyAnnotationType;

-    }*/

-

-    public InitDestroyAnnotationProcessor () {

-        // Set the @Init annotation type

-        setInitAnnotationType(initAnnotationType);

-        

-        // Set the @Destroy annotation type

-        setDestroyAnnotationType(destroyAnnotationType);

-    }

-}

diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java
deleted file mode 100644
index d8755c58f4..0000000000
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java
+++ /dev/null
@@ -1,220 +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.processor;

-

-import java.lang.reflect.Field;

-import java.lang.reflect.Method;

-import java.lang.reflect.Modifier;

-import java.beans.PropertyDescriptor;

-import java.lang.annotation.Annotation;

-import java.util.List;

-

-import org.springframework.util.Assert;

-import org.springframework.beans.BeanUtils;

-import org.springframework.util.ReflectionUtils;

-import org.springframework.beans.BeansException;

-import org.springframework.beans.FatalBeanException;

-import org.springframework.beans.factory.config.BeanPostProcessor;

-

-import org.osoa.sca.annotations.Property;

-import org.apache.tuscany.sca.assembly.ComponentProperty;

-import org.apache.tuscany.sca.core.factory.ObjectFactory;

-import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;

-import org.apache.tuscany.sca.runtime.RuntimeComponent;

-

-public class PropertyAnnotationProcessor implements BeanPostProcessor {

-

-    private Class<? extends Annotation> propertyAnnotationType = Property.class;

-    

-    private RuntimeComponent component;

-    

-    private JavaPropertyValueObjectFactory propertyFactory;

-    

-    public PropertyAnnotationProcessor (JavaPropertyValueObjectFactory propertyFactory, 

-                                        RuntimeComponent component) {

-        this.propertyFactory = propertyFactory;

-        this.component = component;

-    }

-

-    /**

-     * Gets property annotation type.

-     */

-    protected Class<? extends Annotation> getPropertyAnnotationType() {

-        return this.propertyAnnotationType;

-    }

-

-    /**

-     * Sets property annotation type.

-     */

-    public void setPropertyAnnotationType(Class<? extends Annotation> propertyAnnotationType) {

-        Assert.notNull(propertyAnnotationType, "'propertyAnnotationType' type must not be null.");

-        this.propertyAnnotationType = propertyAnnotationType;

-    }

-

-    /**

-     * This method is used to execute before a bean's initialization callback.

-     * 

-     * @see org.springframework.beans.factory.config.BeanPostProcessor#postProcessBeforeInitialization(java.lang.Object, java.lang.String)

-     */

-    public Object postProcessBeforeInitialization(Object bean, String beanName) 

-    throws BeansException {

-        processAnnotation(bean);

-        return bean;

-    }

-

-    /**

-     * This method is used to execute after a bean's initialization callback.

-     * 

-     * @see org.springframework.beans.factory.config.BeanPostProcessor#postProcessAfterInitialization(java.lang.Object, java.lang.String)

-     */

-    public Object postProcessAfterInitialization(Object bean, String beanName)

-    throws BeansException {

-        return bean;

-    }

-

-    /**

-     * <p>Processes a beans fields for injection if it has a {@link Property} annotation.</p>

-     */

-    protected void processAnnotation(final Object bean) {

-        

-        final Class<?> clazz = bean.getClass();       

-

-        ReflectionUtils.doWithMethods(clazz, new ReflectionUtils.MethodCallback() {

-            public void doWith(Method method) {

-                //Annotation annotation = method.getAnnotation(getPropertyAnnotationType());                

-                Property annotation = (Property) method.getAnnotation(getPropertyAnnotationType());

-                

-                if (annotation != null) {

-                    if (Modifier.isStatic(method.getModifiers())) {

-                        throw new IllegalStateException("Property annotation is not supported on static methods");

-                    }

-                    

-                    if (Modifier.isPrivate(method.getModifiers())) {

-                        throw new IllegalStateException("Property annotation is not supported on private methods");

-                    }

-

-                    if (method.getParameterTypes().length == 0) {

-                        throw new IllegalStateException("Property annotation requires at least one argument: " + method);

-                    }

-                    

-                    PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method);

-                    if (pd != null) {

-                        String propName = annotation.name();

-                        if ("".equals(propName)) {

-                            injectProperty(bean, pd, getPropertyObj(pd.getPropertyType(), pd.getName()));

-                        } else {

-                            injectProperty(bean, pd, getPropertyObj(pd.getPropertyType(), propName));

-                        }

-                    }

-                }

-            }

-        });

-        

-        ReflectionUtils.doWithFields(clazz, new ReflectionUtils.FieldCallback() {

-            public void doWith(Field field) {

-                //Annotation annotation = field.getAnnotation(getPropertyAnnotationType());

-                Property annotation = (Property) field.getAnnotation(getPropertyAnnotationType());

-                

-                if (annotation != null) {

-                    if (Modifier.isStatic(field.getModifiers())) {

-                        throw new IllegalStateException("Property annotation is not supported on static fields");

-                    }

-                    

-                    if (Modifier.isPrivate(field.getModifiers())) {

-                        throw new IllegalStateException("Property annotation is not supported on private fields");

-                    }

-

-                    ReflectionUtils.makeAccessible(field);

-                    

-                    Object propertyObj = null;

-                    String propName = annotation.name();

-                    if ("".equals(propName)) {

-                        propertyObj = getPropertyObj(field.getType(), field.getName());                        

-                    } else {

-                        propertyObj = getPropertyObj(field.getType(), propName);

-                    }

-                    

-                    if (propertyObj != null)

-                        ReflectionUtils.setField(field, bean, propertyObj);

-                }

-            }

-        });

-    }

-    

-    /**

-     * Processes a property descriptor to inject a service.

-     */

-    public Object getPropertyObj(Class requiredType, String name) {

-        

-        Object propertyObj = null;

-        

-        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

-                ObjectFactory factory = propertyFactory.createValueFactory(prop, prop.getValue(), requiredType);

-                propertyObj = factory.getInstance();

-            } // end if

-        } // end for        

-        

-        return propertyObj;

-    }

-    

-    

-    public void injectProperty(Object bean, PropertyDescriptor pd, Object propertyObj) {

-        

-        if (propertyObj != null) {

-            try {                                                       

-                pd.getWriteMethod().invoke(bean, new Object[] { propertyObj });

-            } catch (Throwable e) {

-                throw new FatalBeanException("Problem injecting property:  " + e.getMessage(), e);

-            }

-        }

-    }

-    

-    /**

-     * Processes a property descriptor to inject a service.

-     */

-    /*public void injectMethod(Object bean, Method method) {

-        PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method);        

-

-        if (pd != null) {

-            Object propertyObj = null;

-            

-            List<ComponentProperty> props = component.getProperties();

-            for (ComponentProperty prop : props) {

-                if (prop.getName().equals(pd.getName())) {

-                    // On finding the property, create a factory for it and create a Bean using

-                    // the factory

-                    ObjectFactory factory = propertyFactory.createValueFactory(prop, prop.getValue(), pd.getPropertyType());

-                    propertyObj = factory.getInstance();

-                } // end if

-            } // end for

-

-            if (propertyObj != null) {

-                try {                                                       

-                    pd.getWriteMethod().invoke(bean, new Object[] { propertyObj });

-                } catch (Throwable e) {

-                    throw new FatalBeanException("Problem injecting property:  " + e.getMessage(), e);

-                }

-            }

-        }

-    }*/

-}

diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java
deleted file mode 100644
index 52f8ac3684..0000000000
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java
+++ /dev/null
@@ -1,186 +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.processor;

-

-import java.lang.reflect.Field;

-import java.lang.reflect.Method;

-import java.lang.reflect.Modifier;

-import java.beans.PropertyDescriptor;

-import java.lang.annotation.Annotation;

-

-import org.springframework.util.Assert;

-import org.springframework.beans.BeanUtils;

-import org.springframework.util.ReflectionUtils;

-import org.springframework.beans.BeansException;

-import org.springframework.beans.FatalBeanException;

-import org.springframework.beans.factory.config.BeanPostProcessor;

-

-import org.osoa.sca.annotations.Reference;

-import org.apache.tuscany.sca.runtime.RuntimeComponent;

-

-public class ReferenceAnnotationProcessor implements BeanPostProcessor {

-

-    private Class<? extends Annotation> referenceAnnotationType = Reference.class;

-    

-    private RuntimeComponent component;

-    

-    public ReferenceAnnotationProcessor (RuntimeComponent component) {

-        this.component = component;

-    }

-    

-    /**

-     * Gets referece annotation type.

-     */

-    protected Class<? extends Annotation> getReferenceAnnotationType() {

-        return this.referenceAnnotationType;

-    }

-

-    /**

-     * Sets referece annotation type.

-     */

-    public void setReferenceAnnotationType(Class<? extends Annotation> referenceAnnotationType) {

-        Assert.notNull(referenceAnnotationType, "'referenceAnnotationType' type must not be null.");

-        this.referenceAnnotationType = referenceAnnotationType;

-    }

-

-    /**

-     * This method is used to execute before a bean's initialization callback.

-     * 

-     * @see org.springframework.beans.factory.config.BeanPostProcessor#postProcessBeforeInitialization(java.lang.Object, java.lang.String)

-     */

-    public Object postProcessBeforeInitialization(Object bean, String beanName) 

-    throws BeansException {

-        processAnnotation(bean);

-        return bean;

-    }

-

-    /**

-     * This method is used to execute after a bean's initialization callback.

-     * 

-     * @see org.springframework.beans.factory.config.BeanPostProcessor#postProcessAfterInitialization(java.lang.Object, java.lang.String)

-     */

-    public Object postProcessAfterInitialization(Object bean, String beanName)

-    throws BeansException {

-        return bean;

-    }

-

-    /**

-     * <p>Processes a beans fields for injection if it has a {@link Reference} annotation.</p>

-     */

-    protected void processAnnotation(final Object bean) {

-        

-        final Class<?> clazz = bean.getClass();        

-

-        ReflectionUtils.doWithMethods(clazz, new ReflectionUtils.MethodCallback() {

-            public void doWith(Method method) {

-                //Annotation annotation = method.getAnnotation(getReferenceAnnotationType());                

-                Reference annotation = (Reference) method.getAnnotation(getReferenceAnnotationType());

-                

-                if (annotation != null) {

-                    if (Modifier.isStatic(method.getModifiers())) {

-                        throw new IllegalStateException("Reference annotation is not supported on static methods");

-                    }

-                    

-                    if (Modifier.isPrivate(method.getModifiers())) {

-                        throw new IllegalStateException("Reference annotation is not supported on private methods");

-                    }

-

-                    if (method.getParameterTypes().length == 0) {

-                        throw new IllegalStateException("Reference annotation requires at least one argument: " + method);

-                    }

-                    

-                    PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method);

-                    if (pd != null) {

-                        String refName = annotation.name();

-                        if ("".equals(refName)) {

-                            injectReference(bean, pd, pd.getName());

-                        } else {

-                            injectReference(bean, pd, refName);

-                        }

-                    }

-                }

-            }

-        });

-        

-        ReflectionUtils.doWithFields(clazz, new ReflectionUtils.FieldCallback() {

-            public void doWith(Field field) {

-                //Annotation annotation = field.getAnnotation(getReferenceAnnotationType());                

-                Reference annotation = (Reference) field.getAnnotation(getReferenceAnnotationType());

-                

-                if (annotation != null) {

-                    if (Modifier.isStatic(field.getModifiers())) {

-                        throw new IllegalStateException("Reference annotation is not supported on static fields");

-                    }

-                    

-                    if (Modifier.isPrivate(field.getModifiers())) {

-                        throw new IllegalStateException("Reference annotation is not supported on private fields");

-                    }

-

-                    ReflectionUtils.makeAccessible(field);

-                    

-                    Object referenceObj = null;

-                    String refName = annotation.name();

-                    if ("".equals(refName)) {

-                        referenceObj = component.getComponentContext().getService(field.getType(), field.getName());

-                    } else {

-                        referenceObj = component.getComponentContext().getService(field.getType(), refName);

-                    }                        

-                    

-                    if (referenceObj != null)

-                        ReflectionUtils.setField(field, bean, referenceObj);

-                }

-            }

-        });

-    }

-    

-    /**

-     * Processes a property descriptor to inject a service.

-     */

-    public void injectReference(Object bean, PropertyDescriptor pd, String name) {

-               

-        Object referenceObj = component.getComponentContext().getService(pd.getPropertyType(), name);

-        

-        if (referenceObj != null) {

-            try {                                                       

-                pd.getWriteMethod().invoke(bean, new Object[] { referenceObj });

-            } catch (Throwable e) {

-                throw new FatalBeanException("Problem injecting reference:  " + e.getMessage(), e);

-            }

-        }

-    }

-    

-    /**

-     * Processes a property descriptor to inject a service.

-     */

-    /*public void injectMethod(Object bean, Method method) {

-        PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method);        

-

-        if (pd != null) {            

-            Object referenceObj = component.getComponentContext().getService(pd.getPropertyType(), pd.getName());

-

-            if (referenceObj != null) {

-                try {                                                       

-                    pd.getWriteMethod().invoke(bean, new Object[] { referenceObj });

-                } catch (Throwable e) {

-                    throw new FatalBeanException("Problem injecting reference:  " + e.getMessage(), e);

-                }

-            }

-        }

-    }*/

-}

diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java
index 546006e504..ffbb40a8e1 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java
+++ b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java
@@ -1,230 +1,230 @@
-/*
- * 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;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.assembly.xml.PolicyAttachPointProcessor;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.implementation.spring.xml.SpringXMLComponentTypeLoader;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-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;
-
-/**
- * SpringArtifactProcessor is responsible for processing the XML of an <implementation.spring.../>
- * element in an SCA SCDL file.
- * 
- * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $ 
- */
-public class SpringImplementationProcessor implements StAXArtifactProcessor<SpringImplementation> {
-
-    private static final String LOCATION = "location";
-    private static final String IMPLEMENTATION_SPRING = "implementation.spring";
-    private static final QName IMPLEMENTATION_SPRING_QNAME = new QName(Constants.SCA10_NS, IMPLEMENTATION_SPRING);
-    private static final String MSG_LOCATION_MISSING = "Reading implementation.spring - location attribute missing";
-
-    private AssemblyFactory assemblyFactory;
-    private JavaInterfaceFactory javaFactory;
-    private PolicyFactory policyFactory;
-    private PolicyAttachPointProcessor policyProcessor;
-    private Monitor monitor;
-    
-    public SpringImplementationProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        this.javaFactory = modelFactories.getFactory(JavaInterfaceFactory.class);
-        this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
-        this.policyProcessor = new PolicyAttachPointProcessor(policyFactory);
-        this.monitor = monitor;
-    }
-    
-    /**
-     * Report a exception.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Exception ex) {
-    	 if (monitor != null) {
-	        Problem problem = new ProblemImpl(this.getClass().getName(), "impl-spring-validation-messages", Severity.ERROR, model, message, ex);
-	        monitor.problem(problem);
-    	 }
-    }
-    
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Object... messageParameters) {
-    	 if (monitor != null) {
-	        Problem problem = new ProblemImpl(this.getClass().getName(), "impl-spring-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-	        monitor.problem(problem);
-    	 }
-    }
-
-    /*
-     * Read the XML and parse out the attributes.
-     * 
-     * <implementation.spring.../> has a single required attribute:
-     * "location" - which is the target URI of of an archive file or a directory that contains the Spring
-     * application context files.
-     * If the resource identified by the location attribute is an archive file, then the file 
-     * META-INF/MANIFEST.MF is read from the archive. 
-     * If the location URI identifies a directory, then META-INF/MANIFEST.MF must exist
-     * underneath that directory. 
-     * If the manifest file contains a header "Spring-Context" of the format:
-     *    Spring-Context ::= path ( ';' path )*
-     *    
-     * Where path is a relative path with respect to the location URI, then the set of paths 
-     * specified in the header identify the context configuration files. 
-     * If there is no MANIFEST.MF file or no Spring-Context header within that file, 
-     * then the default behaviour is to build an application context using all the *.xml files 
-     * in the METAINF/spring directory.
-     */
-    public SpringImplementation read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-
-        // Create the Spring implementation
-        SpringImplementation springImplementation = null;
-
-        // Read the location attribute for the spring implementation
-        String springLocation = reader.getAttributeValue(null, LOCATION);
-        if (springLocation != null) {
-        	springImplementation = new SpringImplementation();
-        	springImplementation.setLocation(springLocation);
-        	springImplementation.setUnresolved(true);
-            processComponentType(springImplementation);
-        } else {
-        	error("LocationAttributeMissing", reader);
-            //throw new ContributionReadException(MSG_LOCATION_MISSING);
-        }
-        
-        // Read policies
-        policyProcessor.readPolicies(springImplementation, reader);
-
-        // Skip to end element
-        while (reader.hasNext()) {
-            if (reader.next() == END_ELEMENT && IMPLEMENTATION_SPRING_QNAME.equals(reader.getName())) {
-                break;
-            }
-        } // end while
-
-        return springImplementation;
-    } // end read
-
-    /*
-     * Handles the component type for the Spring implementation
-     * @param springImplementation - a Spring implementation.  The component type information
-     * is created for this implementation
-     *  
-     */
-    private void processComponentType(SpringImplementation springImplementation) {
-
-        // Create a ComponentType and mark it unresolved
-        ComponentType componentType = assemblyFactory.createComponentType();
-        componentType.setUnresolved(true);
-        springImplementation.setComponentType(componentType);
-    } // end processComponentType
-
-    /*
-     * Write out the XML representation of the Spring implementation
-     * <implementation.spring location="..." />
-     */
-    public void write(SpringImplementation springImplementation, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-
-        // Write <implementation.spring>
-        policyProcessor.writePolicyPrefixes(springImplementation, writer);
-        writer.writeStartElement(Constants.SCA10_NS, IMPLEMENTATION_SPRING);
-        policyProcessor.writePolicyAttributes(springImplementation, writer);
-        
-        if (springImplementation.getLocation() != null) {
-            writer.writeAttribute(LOCATION, springImplementation.getLocation());
-        }
-
-        writer.writeEndElement();
-
-    } // end write
-
-    /**
-     * Resolves the Spring implementation - loads the Spring application-context XML and
-     * derives the spring implementation componentType from it
-     */
-    public void resolve(SpringImplementation springImplementation, ModelResolver resolver)
-        throws ContributionResolveException {
-    	
-    	if (springImplementation == null)
-    		return;
-
-        /* Load the Spring component type by reading the Spring application context */
-        SpringXMLComponentTypeLoader springLoader =
-            new SpringXMLComponentTypeLoader(assemblyFactory, javaFactory, policyFactory);
-        try {
-            // Load the Spring Implementation information from its application context file...
-            springLoader.load(springImplementation);
-        } catch (ContributionReadException e) {
-        	ContributionResolveException ce = new ContributionResolveException(e);
-        	error("ContributionResolveException", resolver, ce);
-            throw ce;
-        }
-
-        ComponentType ct = springImplementation.getComponentType();
-        if (ct.isUnresolved()) {
-            // If the introspection fails to resolve, try to find a side file...
-            ComponentType componentType = resolver.resolveModel(ComponentType.class, ct);
-            if (componentType.isUnresolved()) {
-            	error("UnableToResolveComponentType", resolver);
-                //throw new ContributionResolveException("SpringArtifactProcessor: unable to resolve componentType for Spring component");             
-            } else {
-                springImplementation.setComponentType(componentType);
-                springImplementation.setUnresolved(false);
-           }            
-   
-        } // end if
-
-    } // end method resolve
-
-    public QName getArtifactType() {
-        return IMPLEMENTATION_SPRING_QNAME;
-    }
-
-    public Class<SpringImplementation> getModelType() {
-        return SpringImplementation.class;
-    }
-
-} // end class SpringArtifactProcessor
+/*

+ * 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 static javax.xml.stream.XMLStreamConstants.END_ELEMENT;

+

+import javax.xml.namespace.QName;

+import javax.xml.stream.XMLStreamException;

+import javax.xml.stream.XMLStreamReader;

+import javax.xml.stream.XMLStreamWriter;

+

+import org.apache.tuscany.sca.assembly.AssemblyFactory;

+import org.apache.tuscany.sca.assembly.ComponentType;

+import org.apache.tuscany.sca.assembly.xml.Constants;

+import org.apache.tuscany.sca.assembly.xml.PolicySubjectProcessor;

+import org.apache.tuscany.sca.contribution.processor.ContributionReadException;

+import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;

+import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;

+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;

+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;

+import org.apache.tuscany.sca.core.FactoryExtensionPoint;

+import org.apache.tuscany.sca.implementation.spring.SpringImplementation;

+import org.apache.tuscany.sca.implementation.spring.introspect.SpringXMLComponentTypeLoader;

+import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;

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

+

+/**

+ * SpringArtifactProcessor is responsible for processing the XML of an <implementation.spring.../>

+ * element in an SCA SCDL file.

+ * 

+ * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $ 

+ */

+public class SpringImplementationProcessor implements StAXArtifactProcessor<SpringImplementation> {

+

+    private static final String LOCATION = "location";

+    private static final String IMPLEMENTATION_SPRING = "implementation.spring";

+    private static final QName IMPLEMENTATION_SPRING_QNAME = new QName(Constants.SCA11_NS, IMPLEMENTATION_SPRING);

+    private static final String MSG_LOCATION_MISSING = "Reading implementation.spring - location attribute missing";

+

+    private AssemblyFactory assemblyFactory;

+    private JavaInterfaceFactory javaFactory;

+    private PolicyFactory policyFactory;

+    private PolicySubjectProcessor policyProcessor;

+    private Monitor monitor;

+    

+    public SpringImplementationProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) {

+        this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);

+        this.javaFactory = modelFactories.getFactory(JavaInterfaceFactory.class);

+        this.policyFactory = modelFactories.getFactory(PolicyFactory.class);

+        this.policyProcessor = new PolicySubjectProcessor(policyFactory);

+        this.monitor = monitor;

+    }

+    

+    /**

+     * Report a exception.

+     * 

+     * @param problems

+     * @param message

+     * @param model

+     */

+    private void error(String message, Object model, Exception ex) {

+    	 if (monitor != null) {

+	        Problem problem = monitor.createProblem(this.getClass().getName(), "impl-spring-validation-messages", Severity.ERROR, model, message, ex);

+	        monitor.problem(problem);

+    	 }

+    }

+    

+    /**

+     * Report a error.

+     * 

+     * @param problems

+     * @param message

+     * @param model

+     */

+    private void error(String message, Object model, Object... messageParameters) {

+    	 if (monitor != null) {

+	        Problem problem = monitor.createProblem(this.getClass().getName(), "impl-spring-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);

+	        monitor.problem(problem);

+    	 }

+    }

+

+    /*

+     * Read the XML and parse out the attributes.

+     * 

+     * <implementation.spring.../> has a single required attribute:

+     * "location" - which is the target URI of of an archive file or a directory that contains the Spring

+     * application context files.

+     * If the resource identified by the location attribute is an archive file, then the file 

+     * META-INF/MANIFEST.MF is read from the archive. 

+     * If the location URI identifies a directory, then META-INF/MANIFEST.MF must exist

+     * underneath that directory. 

+     * If the manifest file contains a header "Spring-Context" of the format:

+     *    Spring-Context ::= path ( ';' path )*

+     *    

+     * Where path is a relative path with respect to the location URI, then the set of paths 

+     * specified in the header identify the context configuration files. 

+     * If there is no MANIFEST.MF file or no Spring-Context header within that file, 

+     * then the default behaviour is to build an application context using all the *.xml files 

+     * in the METAINF/spring directory.

+     */

+    public SpringImplementation read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {

+

+        // Create the Spring implementation

+        SpringImplementation springImplementation = null;

+

+        // Read the location attribute for the spring implementation

+        String springLocation = reader.getAttributeValue(null, LOCATION);

+        if (springLocation != null) {

+        	springImplementation = new SpringImplementation();

+        	springImplementation.setLocation(springLocation);

+        	springImplementation.setUnresolved(true);

+            processComponentType(springImplementation);

+        } else {

+        	error("LocationAttributeMissing", reader);

+            //throw new ContributionReadException(MSG_LOCATION_MISSING);

+        }

+        

+        // Read policies

+        policyProcessor.readPolicies(springImplementation, reader);

+

+        // Skip to end element

+        while (reader.hasNext()) {

+            if (reader.next() == END_ELEMENT && IMPLEMENTATION_SPRING_QNAME.equals(reader.getName())) {

+                break;

+            }

+        } // end while

+

+        return springImplementation;

+    } // end read

+

+    /*

+     * Handles the component type for the Spring implementation

+     * @param springImplementation - a Spring implementation.  The component type information

+     * is created for this implementation

+     *  

+     */

+    private void processComponentType(SpringImplementation springImplementation) {

+

+        // Create a ComponentType and mark it unresolved

+        ComponentType componentType = assemblyFactory.createComponentType();

+        componentType.setUnresolved(true);

+        springImplementation.setComponentType(componentType);

+    } // end processComponentType

+

+    /*

+     * Write out the XML representation of the Spring implementation

+     * <implementation.spring location="..." />

+     */

+    public void write(SpringImplementation springImplementation, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {

+

+        // Write <implementation.spring>

+        policyProcessor.writePolicyPrefixes(springImplementation, writer);

+        writer.writeStartElement(Constants.SCA11_NS, IMPLEMENTATION_SPRING);

+        policyProcessor.writePolicyAttributes(springImplementation, writer);

+        

+        if (springImplementation.getLocation() != null) {

+            writer.writeAttribute(LOCATION, springImplementation.getLocation());

+        }

+

+        writer.writeEndElement();

+

+    } // end write

+

+    /**

+     * Resolves the Spring implementation - loads the Spring application-context XML and

+     * derives the spring implementation componentType from it

+     */

+    public void resolve(SpringImplementation springImplementation, ModelResolver resolver)

+        throws ContributionResolveException {

+    	

+    	if (springImplementation == null)

+    		return;

+

+        /* Load the Spring component type by reading the Spring application context */

+        SpringXMLComponentTypeLoader springLoader =

+            new SpringXMLComponentTypeLoader(assemblyFactory, javaFactory, policyFactory);

+        try {

+            // Load the Spring Implementation information from its application context file...

+            springLoader.load(springImplementation);

+        } catch (ContributionReadException e) {

+        	ContributionResolveException ce = new ContributionResolveException(e);

+        	error("ContributionResolveException", resolver, ce);

+            throw ce;

+        }

+

+        ComponentType ct = springImplementation.getComponentType();

+        if (ct.isUnresolved()) {

+            // If the introspection fails to resolve, try to find a side file...

+            ComponentType componentType = resolver.resolveModel(ComponentType.class, ct);

+            if (componentType.isUnresolved()) {

+            	error("UnableToResolveComponentType", resolver);

+                //throw new ContributionResolveException("SpringArtifactProcessor: unable to resolve componentType for Spring component");             

+            } else {

+                springImplementation.setComponentType(componentType);

+                springImplementation.setUnresolved(false);

+           }            

+   

+        } // end if

+

+    } // end method resolve

+

+    public QName getArtifactType() {

+        return IMPLEMENTATION_SPRING_QNAME;

+    }

+

+    public Class<SpringImplementation> getModelType() {

+        return SpringImplementation.class;

+    }

+

+} // end class SpringArtifactProcessor

diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/resources/META-INF/spring.handlers b/branches/sca-java-1.x/modules/implementation-spring/src/main/resources/META-INF/spring.handlers
deleted file mode 100644
index 7f9a7b17b0..0000000000
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/resources/META-INF/spring.handlers
+++ /dev/null
@@ -1 +0,0 @@
-http\://www.springframework.org/schema/sca=org.apache.tuscany.sca.implementation.spring.ScaNamespaceHandler
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/resources/META-INF/spring.schemas b/branches/sca-java-1.x/modules/implementation-spring/src/main/resources/META-INF/spring.schemas
deleted file mode 100644
index 249cc21c13..0000000000
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/resources/META-INF/spring.schemas
+++ /dev/null
@@ -1 +0,0 @@
-http\://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd=org/springframework/sca/xml/spring-sca.xsd
diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd b/branches/sca-java-1.x/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
deleted file mode 100644
index 4f1d5ca730..0000000000
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * 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.    
--->
-<xsd:schema xmlns="http://www.springframework.org/schema/sca" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    attributeFormDefault="unqualified" elementFormDefault="qualified"
-    targetNamespace="http://www.springframework.org/schema/sca">
-
-    <xsd:element name="composite">
-        <xsd:complexType>
-            <xsd:attribute name="component" use="required">
-                <xsd:simpleType>
-                    <xsd:restriction base="xsd:string" />
-                </xsd:simpleType>
-            </xsd:attribute>
-            <xsd:attribute name="sca-adapter-class" use="optional">
-                <xsd:simpleType>
-                    <xsd:restriction base="xsd:string" />
-                </xsd:simpleType>
-            </xsd:attribute>
-        </xsd:complexType>
-    </xsd:element>
-
-    <xsd:element name="reference">
-        <xsd:complexType>
-            <xsd:attribute name="name" use="required">
-                <xsd:simpleType>
-                    <xsd:restriction base="xsd:string" />
-                </xsd:simpleType>
-            </xsd:attribute>
-            <xsd:attribute name="type" use="required">
-                <xsd:simpleType>
-                    <xsd:restriction base="xsd:string" />
-                </xsd:simpleType>
-            </xsd:attribute>
-            <xsd:attribute name="default" use="optional">
-                <xsd:simpleType>
-                    <xsd:restriction base="xsd:string" />
-                </xsd:simpleType>
-            </xsd:attribute>
-        </xsd:complexType>
-    </xsd:element>
-
-    <xsd:element name="property">
-        <xsd:complexType>
-            <xsd:attribute name="id" use="optional">
-                <xsd:simpleType>
-                    <xsd:restriction base="xsd:string" />
-                </xsd:simpleType>
-            </xsd:attribute>
-            <xsd:attribute name="name" use="required">
-                <xsd:simpleType>
-                    <xsd:restriction base="xsd:string" />
-                </xsd:simpleType>
-            </xsd:attribute>
-            <xsd:attribute name="type" use="required">
-                <xsd:simpleType>
-                    <xsd:restriction base="xsd:string" />
-                </xsd:simpleType>
-            </xsd:attribute>
-        </xsd:complexType>
-    </xsd:element>
-
-    <xsd:element name="service">
-        <xsd:complexType>
-            <xsd:attribute name="name" use="required">
-                <xsd:simpleType>
-                    <xsd:restriction base="xsd:string" />
-                </xsd:simpleType>
-            </xsd:attribute>
-            <xsd:attribute name="type" use="required">
-                <xsd:simpleType>
-                    <xsd:restriction base="xsd:string" />
-                </xsd:simpleType>
-            </xsd:attribute>
-            <xsd:attribute name="target" use="required">
-                <xsd:simpleType>
-                    <xsd:restriction base="xsd:string" />
-                </xsd:simpleType>
-            </xsd:attribute>
-        </xsd:complexType>
-    </xsd:element>
-
-</xsd:schema>