Copy 1.x trunk to branches for start of 1.6 release

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

30 files changed, 3722 insertions, 0 deletions

diff --git a/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/LICENSE b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/LICENSE
new file mode 100644
index 0000000000..8aa906c321
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/LICENSE
@@ -0,0 +1,205 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
+
+
+
diff --git a/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/NOTICE b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/NOTICE
new file mode 100644
index 0000000000..25bb89c9b2
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/NOTICE
@@ -0,0 +1,6 @@
+${pom.name}
+Copyright (c) 2005 - 2009 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
diff --git a/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/README b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/README
new file mode 100644
index 0000000000..e1b1f98fe0
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/README
@@ -0,0 +1,9 @@
+Note that the implementation spring modules have a different structure from other extensions.

+

+The aim is to have the Tuscany runtime embedded in a container with the Tuscany classes hidden

+from user applications and the Spring jar's packaged with the application. That means that the

+Tuscany code has no visibilty of the Spring classes and visa-versa. To implement that the

+implementation-spring module has no dependencies on Spring and the implementation-spring-runtime

+module has no dependencies on Tuscany (other than the sca-api), and reflection is used to call

+methods between the modules.

+

diff --git a/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/pom.xml b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/pom.xml
new file mode 100644
index 0000000000..0853d4ff81
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/pom.xml
@@ -0,0 +1,109 @@
+<?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.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-modules</artifactId>
+        <version>1.6-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>tuscany-implementation-spring</artifactId>
+    <name>Apache Tuscany SCA Spring Framework Implementation Extension</name>
+
+    <dependencies>
+        <!-- **************************************** -->    
+        <!-- *                                      * -->    
+        <!-- * DONT ADD ANY SPRING DEPENDENCIES!!!  * -->    
+        <!-- *                                      * -->    
+        <!-- * See the README for details why not   * -->    
+        <!-- *                                      * -->    
+        <!-- *                                      * -->    
+        <!-- **************************************** -->    
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-assembly</artifactId>
+            <version>1.6-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core</artifactId>
+            <version>1.6-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-interface</artifactId>
+            <version>1.6-SNAPSHOT</version>
+        </dependency>        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-assembly-xml</artifactId>
+            <version>1.6-SNAPSHOT</version>
+        </dependency>        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-impl</artifactId>
+            <version>1.6-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>1.6-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding</artifactId>
+            <version>1.6-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.6-SNAPSHOT</version>
+        </dependency>  
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.6-SNAPSHOT</version>
+        </dependency>
+          
+    </dependencies>
+
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+
+                <configuration>
+                    <instructions>
+                        <Bundle-Version>${tuscany.version}</Bundle-Version>
+                        <Bundle-SymbolicName>org.apache.tuscany.sca.implementation.spring</Bundle-SymbolicName>
+                        <Bundle-Description>${pom.name}</Bundle-Description>
+                        <Export-Package>org.apache.tuscany.sca.implementation.spring*</Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanElement.java b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanElement.java
new file mode 100644
index 0000000000..86902e5104
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanElement.java
@@ -0,0 +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;

+

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

+ * 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 <constructor-arg> element in a Spring application-context

+ * - this has ref attribute

+ * 

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

+ */

+public class SpringConstructorArgElement {

+    

+    private String ref;

+    private String type;

+    private int autoIndex = -1;

+    private int index = -1;

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

+

+    public SpringConstructorArgElement(String ref, String type) {

+        this.ref = ref;

+        this.type = type;

+    }

+    

+    public String getType() {

+        return this.type;

+    }

+    

+    public String getRef() {

+        return this.ref;

+    }

+    

+    public void setRef(String ref) {

+        this.ref = ref;

+    }

+    

+    public int getIndex() {

+        return this.index;

+    }

+    

+    public void setIndex(int index) {

+        this.index = index;

+    }

+    

+    public int getAutoIndex() {

+        return this.autoIndex;

+    }

+    

+    public void setAutoIndex(int index) {

+        this.autoIndex = index;

+    }

+    

+    public List<String> getValues() {

+        return this.values;

+    }

+

+    public void addValue(String value) {

+        this.values.add(value);

+    }

+}

diff --git a/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
new file mode 100644
index 0000000000..61b707b1e1
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
@@ -0,0 +1,226 @@
+/*

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

+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.builder.ComponentPreProcessor;

+import org.apache.tuscany.sca.assembly.impl.ImplementationImpl;

+import org.apache.tuscany.sca.interfacedef.InterfaceContract;

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

+

+/**

+ * Represents a Spring implementation.

+ *

+ * @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 List<URL> 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;

+    // List of unresolved bean property references

+    private Hashtable<String, Reference> unresolvedBeanRef;

+

+    private ClassLoader classLoader;

+

+    public 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(List<URL> resource) {

+        this.resource = resource;

+    }

+

+    public List<URL> 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

+

+

+    /**

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

+    }

+

+    public ClassLoader getClassLoader() {

+        return classLoader;

+    }

+

+    public void setClassLoader(ClassLoader classLoader) {

+        this.classLoader = classLoader;

+    }

+}

diff --git a/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationConstants.java b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationConstants.java
new file mode 100644
index 0000000000..339e753c04
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationConstants.java
@@ -0,0 +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;

+

+import javax.xml.namespace.QName;

+

+/**

+ * Constants used in Spring Application Context XML files.

+ */

+public interface SpringImplementationConstants {

+    

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

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

+    

+    String PROPERTY = "property";

+    QName SCAPROPERTY_ELEMENT = new QName(SCA_NS, PROPERTY);

+    QName PROPERTY_ELEMENT = new QName(SPRING_NS, PROPERTY);

+    

+    String SERVICE = "service";

+    QName SERVICE_ELEMENT = new QName(SCA_NS, SERVICE);

+    

+    String REFERENCE = "reference";

+    QName REFERENCE_ELEMENT = new QName(SCA_NS, REFERENCE);

+    

+    String BEANS = "beans";

+    QName BEANS_ELEMENT = new QName(SPRING_NS, BEANS);

+    

+    String IMPORT = "import";

+    QName IMPORT_ELEMENT = new QName(SPRING_NS, IMPORT);

+    

+    String BEAN = "bean";

+    QName BEAN_ELEMENT = new QName(SPRING_NS, BEAN);

+    

+    String CONSTRUCTORARG = "constructor-arg";

+    QName CONSTRUCTORARG_ELEMENT = new QName(SPRING_NS, CONSTRUCTORARG);

+    

+    String LIST = "list";

+    QName LIST_ELEMENT = new QName(SPRING_NS, LIST); 

+    

+    String VALUE = "value";

+    QName VALUE_ELEMENT = new QName(SPRING_NS, VALUE);

+    

+    String REF = "ref";

+    QName REF_ELEMENT = new QName(SPRING_NS, REF);

+

+    String APPLICATION_CONTEXT = "application-context.xml";

+}

diff --git a/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyElement.java b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyElement.java
new file mode 100644
index 0000000000..c6637d31c4
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyElement.java
@@ -0,0 +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;

+

+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/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAPropertyElement.java b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAPropertyElement.java
new file mode 100644
index 0000000000..c666217777
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAPropertyElement.java
@@ -0,0 +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;

+

+/**

+ * 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/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAReferenceElement.java b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAReferenceElement.java
new file mode 100644
index 0000000000..5b6206ef9b
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAReferenceElement.java
@@ -0,0 +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;

+

+/**

+ * 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/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAServiceElement.java b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAServiceElement.java
new file mode 100644
index 0000000000..774bc051d3
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAServiceElement.java
@@ -0,0 +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;

+

+/**

+ * 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/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanIntrospector.java b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanIntrospector.java
new file mode 100644
index 0000000000..c74d4abed9
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanIntrospector.java
@@ -0,0 +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.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.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.impl.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/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanPojoProcessor.java b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanPojoProcessor.java
new file mode 100644
index 0000000000..732557e4ea
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanPojoProcessor.java
@@ -0,0 +1,656 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

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

+

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

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

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

+

+import java.lang.annotation.Annotation;

+import java.lang.reflect.Constructor;

+import java.lang.reflect.Field;

+import java.lang.reflect.Member;

+import java.lang.reflect.Method;

+import java.lang.reflect.Modifier;

+import java.lang.reflect.Type;

+import java.util.Arrays;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.List;

+import java.util.Map;

+import java.util.Set;

+

+import javax.jws.WebService;

+

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

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

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

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

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

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

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

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

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

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

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

+

+/**

+ * Heuristically evaluates an un-annotated Java implementation type to determine

+ * services, references, and properties according to the algorithm described in

+ * the SCA Java Client and Implementation Model Specification <p/> TODO

+ * Implement: <p/> When no service interface is annotated, need to calculate a

+ * single service comprising all public methods that are not reference or

+ * property injection sites. If that service can be exactly mapped to an

+ * interface implemented by the class then the service interface will be defined

+ * in terms of that interface.

+ * 

+ * @version $Rev: 689426 $ $Date: 2008-08-27 14:56:06 +0530 (Wed, 27 Aug 2008) $

+ */

+public class SpringBeanPojoProcessor extends BaseJavaClassVisitor {

+    private JavaInterfaceFactory javaFactory;

+    private List<SpringConstructorArgElement> conArgs;

+

+    public SpringBeanPojoProcessor(AssemblyFactory assemblyFactory, JavaInterfaceFactory javaFactory, List<SpringConstructorArgElement> conArgs) {

+        super(assemblyFactory);

+        this.javaFactory = javaFactory;

+        this.conArgs = conArgs;

+    }

+

+    @Override

+    public <T> void visitEnd(Class<T> clazz, JavaImplementation type) throws IntrospectionException {

+        List<org.apache.tuscany.sca.assembly.Service> services = type.getServices();

+        if (services.isEmpty()) {

+            // heuristically determine the service

+            /**

+             * The following is quoted from Java Specification 1.2.1.3. Introspecting services offered by a Java implementation

+             * In the cases described below, the services offered by a Java implementation class may be determined

+             * through introspection, eliding the need to specify them using @Service. The following algorithm is used 

+             * to determine how services are introspected from an implementation class:

+             * 

+             * If the interfaces of the SCA services are not specified with the @Service annotation on the 

+             * implementation class, it is assumed that all implemented interfaces that have been annotated 

+             * as @Remotable are the service interfaces provided by the component. If none of the implemented 

+             * interfaces is remotable, then by default the implementation offers a single service whose type 

+             * is the implementation class.

+             */

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

+            for (Class<?> i : interfaces) {

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

+                    addService(type, i);

+                }

+            }

+            if (services.isEmpty()) {

+                // class is the interface

+                addService(type, clazz);

+            }

+        }

+        Set<Method> methods = getAllUniquePublicProtectedMethods(clazz, false);

+        if (!type.getReferenceMembers().isEmpty() || !type.getPropertyMembers().isEmpty()) {

+            // references and properties have been explicitly defined

+            //            if (type.getServices().isEmpty()) {

+            //                calculateServiceInterface(clazz, type, methods);

+            //                if (type.getServices().isEmpty()) {

+            //                    throw new ServiceTypeNotFoundException(clazz.getName());

+            //                }

+            //            }

+            evaluateConstructor(type, clazz);

+            return;

+        }

+        calcPropRefs(methods, services, type, clazz);

+        evaluateConstructor(type, clazz);

+    }

+

+    private void addService(JavaImplementation type, Class<?> clazz) throws IntrospectionException {

+        try {

+            org.apache.tuscany.sca.assembly.Service service = createService(clazz);

+            type.getServices().add(service);

+        } catch (InvalidInterfaceException e) {

+            throw new IntrospectionException(e);

+        }

+    }

+

+    private boolean isPublicSetter(Method method) {

+        return method.getParameterTypes().length == 1 && Modifier.isPublic(method.getModifiers())

+            && method.getName().startsWith("set")

+            && method.getReturnType() == void.class;

+    }

+

+    private boolean isProtectedSetter(Method method) {

+        return method.getParameterTypes().length == 1 && Modifier.isProtected(method.getModifiers())

+            && method.getName().startsWith("set")

+            && method.getReturnType() == void.class;

+    }

+

+    private <T> void calcPropRefs(Set<Method> methods,

+                                  List<org.apache.tuscany.sca.assembly.Service> services,

+                                  JavaImplementation type,

+                                  Class<T> clazz) throws IntrospectionException {

+        // heuristically determine the properties references

+        // make a first pass through all public methods with one param

+        Set<String> setters = new HashSet<String>();

+        Set<String> others = new HashSet<String>();

+        for (Method method : methods) {

+            if (!isPublicSetter(method)) {

+                continue;

+            }

+            if (method.isAnnotationPresent(Callback.class) || method.isAnnotationPresent(Context.class)) {

+                // Add the property name as others

+                others.add(toPropertyName(method.getName()));

+                continue;

+            }

+            if (!isInServiceInterface(method, services)) {

+                // Not part of the service interface

+                String name = toPropertyName(method.getName());

+                setters.add(name);

+                // avoid duplicate property or ref names

+                if (!type.getPropertyMembers().containsKey(name) && !type.getReferenceMembers().containsKey(name)) {

+                    Class<?> param = method.getParameterTypes()[0];

+                    Type genericType = method.getGenericParameterTypes()[0];

+                    if (isReferenceType(param, genericType)) {

+                        type.getReferences().add(createReference(name, param));

+                        type.getReferenceMembers().put(name, new JavaElementImpl(method, 0));

+                    } else {

+                        type.getProperties().add(createProperty(name, param));

+                        type.getPropertyMembers().put(name, new JavaElementImpl(method, 0));

+                    }

+                }

+            }

+        }

+        // second pass for protected methods with one param

+        for (Method method : methods) {

+            if (!isProtectedSetter(method)) {

+                continue;

+            }

+            if (method.isAnnotationPresent(Callback.class) || method.isAnnotationPresent(Context.class)) {

+                // Add the property name as others

+                others.add(toPropertyName(method.getName()));

+                continue;

+            }

+            Class<?> param = method.getParameterTypes()[0];

+            String name = toPropertyName(method.getName());

+            setters.add(name);

+            // avoid duplicate property or ref names

+            if (isReferenceType(param, method.getGenericParameterTypes()[0])) {

+                if (!type.getReferenceMembers().containsKey(name)) {

+                    type.getReferences().add(createReference(name, param));

+                    type.getReferenceMembers().put(name, new JavaElementImpl(method, 0));

+                }

+            } else {

+                if (!type.getPropertyMembers().containsKey(name)) {

+                    type.getProperties().add(createProperty(name, param));

+                    type.getPropertyMembers().put(name, new JavaElementImpl(method, 0));

+                }

+            }

+        }

+

+        // Public or protected fields unless there is a public or protected

+        // setter method

+        // for the same name

+        Set<Field> fields = getAllPublicAndProtectedFields(clazz, false);

+        for (Field field : fields) {

+            if (field.isAnnotationPresent(Callback.class) || field.isAnnotationPresent(Context.class)) {

+                continue;

+            }

+            if (setters.contains(field.getName()) || others.contains(field.getName())) {

+                continue;

+            }

+            String name = field.getName();

+            Class<?> paramType = field.getType();

+            if (isReferenceType(paramType, field.getGenericType())) {

+                if (!type.getReferenceMembers().containsKey(name)) {

+                    type.getReferences().add(createReference(name, paramType));

+                    type.getReferenceMembers().put(name, new JavaElementImpl(field));

+                }

+            } else {

+                if (!type.getPropertyMembers().containsKey(name)) {

+                    type.getProperties().add(createProperty(name, paramType));

+                    type.getPropertyMembers().put(name, new JavaElementImpl(field));

+                }

+            }

+        }

+        

+        // Private fields unless there is a public or protected

+        // setter method for the same name

+        Set<Field> privateFields = getPrivateFields(clazz);

+        for (Field field : privateFields) {

+            if (field.isAnnotationPresent(Callback.class) || field.isAnnotationPresent(Context.class)) {

+                continue;

+            }

+            if (setters.contains(field.getName()) || others.contains(field.getName())) {

+                continue;

+            }

+            String name = field.getName();

+            Class<?> paramType = field.getType();

+            if (isReferenceType(paramType, field.getGenericType())) {

+                if (!type.getReferenceMembers().containsKey(name)) {

+                    type.getReferences().add(createReference(name, paramType));

+                    type.getReferenceMembers().put(name, new JavaElementImpl(field));

+                }

+            } else {

+                if (!type.getPropertyMembers().containsKey(name)) {

+                    type.getProperties().add(createProperty(name, paramType));

+                    type.getPropertyMembers().put(name, new JavaElementImpl(field));

+                }

+            }

+        }

+    }

+

+    /**

+     * Determines the constructor to use based on the component type's

+     * references and properties

+     * 

+     * @param type the component type

+     * @param clazz the implementation class corresponding to the component type

+     * @throws NoConstructorException if no suitable constructor is found

+     * @throws AmbiguousConstructorException if the parameters of a constructor

+     *             cannot be unambiguously mapped to references and properties

+     */

+    @SuppressWarnings("unchecked")

+    private <T> void evaluateConstructor(JavaImplementation type, Class<T> clazz) throws IntrospectionException {

+        // determine constructor if one is not annotated

+        JavaConstructorImpl<?> definition = type.getConstructor();

+        Map<String, JavaElementImpl> props = type.getPropertyMembers();

+        Map<String, JavaElementImpl> refs = type.getReferenceMembers();        

+        Constructor constructor;

+        boolean explict = false;

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

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

+            // the constructor was already defined explicitly

+            return;

+        } else if (definition != null) {

+            explict = true;

+            constructor = definition.getConstructor();

+        } else {

+            // no definition, heuristically determine constructor

+            Constructor[] constructors = clazz.getConstructors();

+            if (constructors.length == 0) {

+                throw new NoConstructorException("No public constructor for class");

+            } else if (constructors.length == 1) {

+                // Only one constructor, take it

+                constructor = constructors[0];

+            } else {

+                // multiple constructors scenario

+                Constructor<T> selected = null;                

+                for (Constructor<T> ctor : constructors) {

+                    if (ctor.getParameterTypes().length == 0) {

+                        selected = ctor;

+                    } else if (ctor.getParameterTypes().length == conArgs.size()) {

+                        // we will find a constructor which has atleast one

+                    	// reference or property as its parameter types.

+                    	Class<?>[] parametersTypes = ctor.getParameterTypes();

+                		for (Class<?> pType: parametersTypes) {

+                			for (JavaElementImpl property : props.values()) {            				

+                				if (pType.equals(property.getType())) 

+                					selected = ctor;

+                			}

+                			for (JavaElementImpl reference : refs.values()) {

+                				if (pType.equals(reference.getType())) 

+                					selected = ctor;

+                			}               			           			

+                		}

+                    }

+                }

+                if (selected == null) {

+                    throw new NoConstructorException();

+                }

+                constructor = selected;

+            }

+            definition = type.getConstructors().get(constructor);

+            type.setConstructor(definition);

+        }

+        

+        JavaParameterImpl[] parameters = definition.getParameters();

+        if (parameters.length == 0) {

+            return;

+        }

+        

+        Annotation[][] annotations = constructor.getParameterAnnotations();

+        if (!explict) {

+            // the constructor wasn't defined by an annotation, so check to see

+            // if any of the params have an annotation

+            // which we can impute as explicitly defining the constructor, e.g.

+            // @Property, @Reference, or @Autowire

+            explict = injectionAnnotationsPresent(annotations);

+        }

+        if (explict) {

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

+                if (isAnnotated(parameters[i])) {

+                    continue;

+                } else if (!findReferenceOrProperty(parameters[i], props, refs)) {

+                    throw new AmbiguousConstructorException(parameters[i].toString());

+                }

+            }

+        } else {

+            if (!areUnique(parameters)) {

+                throw new AmbiguousConstructorException("Cannot resolve non-unique parameter types, use @Constructor");

+            }

+            if (!calcPropRefUniqueness(props.values(), refs.values())) {

+                throw new AmbiguousConstructorException("Cannot resolve non-unique parameter types, use @Constructor");

+            }

+            if (!(props.isEmpty() && refs.isEmpty())) {

+                calcParamNames(parameters, props, refs);

+            } else {

+                heuristicParamNames(type, parameters);

+

+            }

+        }

+    }

+

+    private void calcParamNames(JavaParameterImpl[] parameters,

+                                Map<String, JavaElementImpl> props,

+                                Map<String, JavaElementImpl> refs) throws AmbiguousConstructorException {

+        // the constructor param types must unambiguously match defined

+        // reference or property types

+        for (JavaParameterImpl param : parameters) {

+            if (!findReferenceOrProperty(param, props, refs)) {

+                throw new AmbiguousConstructorException(param.getName());

+            }

+        }

+    }

+

+    private void heuristicParamNames(JavaImplementation type, JavaParameterImpl[] parameters)

+        throws IntrospectionException {

+        // heuristically determine refs and props from the parameter types

+        for (JavaParameterImpl p : parameters) {

+            String name = p.getType().getSimpleName().toLowerCase();

+            if (isReferenceType(p.getType(), p.getGenericType())) {

+                type.getReferences().add(createReference(name, p.getType()));

+                p.setClassifer(Reference.class);

+                type.getReferenceMembers().put(name, p);

+            } else {

+                type.getProperties().add(createProperty(name, p.getType()));

+                p.setClassifer(Property.class);

+                type.getPropertyMembers().put(name, p);

+            }

+            p.setName(name);

+        }

+    }

+

+    private static boolean areUnique(Class[] collection) {

+        Set<Class> set = new HashSet<Class>(Arrays.asList(collection));

+        return set.size() == collection.length;

+    }

+

+    /**

+     * Returns true if the union of the given collections of properties and

+     * references have unique Java types

+     */

+    private boolean calcPropRefUniqueness(Collection<JavaElementImpl> props, Collection<JavaElementImpl> refs) {

+

+        Class[] classes = new Class[props.size() + refs.size()];

+        int i = 0;

+        for (JavaElementImpl property : props) {

+            classes[i] = property.getType();

+            i++;

+        }

+        for (JavaElementImpl reference : refs) {

+            classes[i] = reference.getType();

+            i++;

+        }

+        return areUnique(classes);

+    }

+

+    /**

+     * Unambiguously finds the reference or property associated with the given

+     * type

+     * 

+     * @return the name of the reference or property if found, null if not

+     * @throws AmbiguousConstructorException if the constructor parameter cannot

+     *             be resolved to a property or reference

+     */

+    private boolean findReferenceOrProperty(JavaParameterImpl parameter,

+                                            Map<String, JavaElementImpl> props,

+                                            Map<String, JavaElementImpl> refs) throws AmbiguousConstructorException {

+

+        boolean found = false;

+        if (!"".equals(parameter.getName())) {

+            // Match by name

+            JavaElementImpl prop = props.get(parameter.getName());

+            if (prop != null && prop.getType() == parameter.getType()) {

+                parameter.setClassifer(Property.class);

+                return true;

+            }

+            JavaElementImpl ref = refs.get(parameter.getName());

+            if (ref != null && ref.getType() == parameter.getType()) {

+                parameter.setClassifer(Reference.class);

+                return true;

+            }

+        }

+        for (JavaElementImpl property : props.values()) {

+            if (property.getType() == parameter.getType()) {

+                if (found) {

+                    throw new AmbiguousConstructorException("Ambiguous property or reference for constructor type",

+                                                            (Member)parameter.getAnchor());

+                }

+                parameter.setClassifer(Property.class);

+                parameter.setName(property.getName());

+                found = true;

+                // do not break since ambiguities must be checked, i.e. more

+                // than one prop or ref of the same type

+            }

+        }

+        for (JavaElementImpl reference : refs.values()) {

+            if (reference.getType() == parameter.getType()) {

+                if (found) {

+                    throw new AmbiguousConstructorException("Ambiguous property or reference for constructor type",

+                                                            (Member)parameter.getAnchor());

+                }

+                parameter.setClassifer(Reference.class);

+                parameter.setName(reference.getName());

+                found = true;

+                // do not break since ambiguities must be checked, i.e. more

+                // than one prop or ref of the same type

+            }

+        }

+        return found;

+    }

+

+    /**

+     * Returns true if a given type is reference according to the SCA

+     * specification rules for determining reference types The following rules

+     * are used to determine whether an unannotated field or setter method is a

+     * property or reference:

+     * <ol>

+     * <li>If its type is simple, then it is a property.

+     * <li>If its type is complex, then if the type is an interface marked by

+     * 

+     * @Remotable, then it is a reference; otherwise, it is a property.

+     *             <li>Otherwise, if the type associated with the member is an

+     *             array or a java.util.Collection, the basetype is the element

+     *             type of the array or the parameterized type of the

+     *             Collection; otherwise the basetype is the member type. If the

+     *             basetype is an interface with an

+     * @Remotable or

+     * @Service annotation then the member is defined as a reference. Otherwise,

+     *          it is defined as a property.

+     *          </ol>

+     *          <p>

+     *          The name of the reference or of the property is derived from the

+     *          name found on the setter method or on the field.

+     */

+    private boolean isReferenceType(Class<?> cls, Type genericType) {

+        Class<?> baseType = JavaIntrospectionHelper.getBaseType(cls, genericType);

+        return baseType.isInterface() && baseType.isAnnotationPresent(Remotable.class);

+    }

+

+    /**

+     * Returns true if the given operation is defined in the collection of

+     * service interfaces

+     */

+    private boolean isInServiceInterface(Method operation, List<org.apache.tuscany.sca.assembly.Service> services) {

+        for (org.apache.tuscany.sca.assembly.Service service : services) {

+            Interface interface1 = service.getInterfaceContract().getInterface();

+            if (interface1 instanceof JavaInterface) {

+                Class<?> clazz = ((JavaInterface)interface1).getJavaClass();

+                if (isMethodMatched(clazz, operation)) {

+                    return true;

+                }

+            }

+        }

+        return false;

+    }

+

+    /**

+     * Test if the class declares a method which matches the signature of the

+     * given method

+     * 

+     * @param clazz

+     * @param method

+     * @return

+     */

+    private boolean isMethodMatched(Class<?> clazz, Method method) {

+        if (method.getDeclaringClass() == clazz) {

+            return true;

+        }

+        Method[] methods = clazz.getMethods();

+        for (Method m : methods) {

+            if (JavaIntrospectionHelper.exactMethodMatch(method, m)) {

+                return true;

+            }

+        }

+        return false;

+    }

+

+    /**

+     * Creates a mapped property.

+     * 

+     * @param name the property name

+     * @param paramType the property type

+     */

+    private org.apache.tuscany.sca.assembly.Property createProperty(String name, Class<?> paramType) {

+        org.apache.tuscany.sca.assembly.Property property = assemblyFactory.createProperty();

+        property.setName(name);

+        property.setXSDType(JavaXMLMapper.getXMLType(paramType));

+        return property;

+    }

+

+    private boolean isAnnotated(JavaParameterImpl parameter) {

+        for (Annotation annotation : parameter.getAnnotations()) {

+            Class<? extends Annotation> annotType = annotation.annotationType();

+            if (annotType.equals(Property.class) || annotType.equals(Reference.class)

+                || annotType.equals(Resource.class)) {

+                return true;

+            }

+        }

+        return false;

+    }

+

+    public boolean areUnique(JavaParameterImpl[] parameters) {

+        Set<Class> set = new HashSet<Class>(parameters.length);

+        for (JavaParameterImpl p : parameters) {

+            if (!set.add(p.getType())) {

+                return false;

+            }

+        }

+        return true;

+    }

+

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

+        throws IntrospectionException {

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

+        reference.setName(name);

+        JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();

+        reference.setInterfaceContract(interfaceContract);

+        try {

+            JavaInterface callInterface = javaFactory.createJavaInterface(paramType);

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

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

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

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

+            }

+            reference.setMultiplicity(Multiplicity.ZERO_ONE);

+        } catch (InvalidInterfaceException e1) {

+            throw new IntrospectionException(e1);

+        }

+

+        // FIXME:  This part seems to have already been taken care above!!

+        try {

+            processCallback(paramType, reference);

+        } catch (InvalidServiceType e) {

+            throw new IntrospectionException(e);

+        }

+        return reference;

+    }

+

+    public org.apache.tuscany.sca.assembly.Service createService(Class<?> interfaze) throws InvalidInterfaceException {

+        org.apache.tuscany.sca.assembly.Service service = assemblyFactory.createService();

+        service.setName(interfaze.getSimpleName());

+

+        JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();

+        service.setInterfaceContract(interfaceContract);

+

+        JavaInterface callInterface = javaFactory.createJavaInterface(interfaze);

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

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

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

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

+        }

+

+        Interface javaInterface = service.getInterfaceContract().getInterface();

+        javaInterface.setRemotable(interfaze.getAnnotation(Remotable.class) != null);

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

+        return service;

+    }

+

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

+        Callback callback = interfaze.getAnnotation(Callback.class);

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

+            Class<?> callbackClass = callback.value();

+            JavaInterface javaInterface;

+            try {

+                javaInterface = javaFactory.createJavaInterface(callbackClass);

+                contract.getInterfaceContract().setCallbackInterface(javaInterface);

+            } catch (InvalidInterfaceException e) {

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

+            }

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

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

+        }

+    }

+

+    public boolean injectionAnnotationsPresent(Annotation[][] annots) {

+        for (Annotation[] annotations : annots) {

+            for (Annotation annotation : annotations) {

+                Class<? extends Annotation> annotType = annotation.annotationType();

+                if (annotType.equals(Property.class) || annotType.equals(Reference.class)

+                    || annotType.equals(Resource.class)) {

+                    return true;

+                }

+            }

+        }

+        return false;

+    }

+}

diff --git a/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
new file mode 100644
index 0000000000..3b73ba00c1
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
@@ -0,0 +1,859 @@
+/*

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

+import java.net.URI;

+import java.net.URL;

+import java.util.ArrayList;

+import java.util.Arrays;

+import java.util.Collection;

+import java.util.Collections;

+import java.util.Enumeration;

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

+import org.apache.tuscany.sca.contribution.ContributionFactory;

+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;

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

+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.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.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 XMLInputFactory xmlInputFactory;

+    private ContributionFactory contributionFactory;

+    private AssemblyFactory assemblyFactory;

+    private JavaInterfaceFactory javaFactory;

+    private PolicyFactory policyFactory;

+

+    private SpringBeanIntrospector beanIntrospector;

+

+    public SpringXMLComponentTypeLoader(ModelFactoryExtensionPoint factories,

+                                        AssemblyFactory assemblyFactory,

+                                        JavaInterfaceFactory javaFactory,

+                                        PolicyFactory policyFactory) {

+        super();

+        this.assemblyFactory = assemblyFactory;

+        this.javaFactory = javaFactory;

+        this.policyFactory = policyFactory;

+        this.contributionFactory = factories.getFactory(ContributionFactory.class);

+        this.xmlInputFactory = factories.getFactory(XMLInputFactory.class);

+    }

+

+    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, ModelResolver resolver) 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, resolver);

+            if (!componentType.isUnresolved())

+                implementation.setUnresolved(false);

+        } // end if

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

+    } // end method load

+

+    

+    private Class<?> resolveClass(ModelResolver resolver, String className) throws ClassNotFoundException {

+        ClassReference classReference = new ClassReference(className);

+        classReference = resolver.resolveModel(ClassReference.class, classReference);

+        if (classReference.isUnresolved()) {

+            throw new ClassNotFoundException(className);

+        }

+        Class<?> javaClass = classReference.getJavaClass();

+        return javaClass;

+    }

+

+    /**

+     * 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, ModelResolver resolver) 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;

+        List<URL> contextResources = new ArrayList<URL>();

+        String contextPath = implementation.getLocation();

+

+        try {

+            resource = resolveLocation(resolver, contextPath);

+            contextResources = getApplicationContextResource(resource);

+

+            implementation.setClassLoader(new ContextClassLoader(resolver));

+            implementation.setResource(contextResources);

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

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

+            

+            for (URL contextResource : contextResources) {

+            	reader = xmlInputFactory.createXMLStreamReader(contextResource.openStream());

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

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

+            	

+            	reader.close();

+            }

+

+        } 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, resolver, beans, services, references, scaproperties);

+

+        return;

+    } // end method loadFromXML

+

+    

+    private URL resolveLocation(ModelResolver resolver, String contextPath) throws MalformedURLException,

+        ContributionReadException {

+        URL resource = null;

+        URI uri = URI.create(contextPath);

+        if (!uri.isAbsolute()) {

+            Artifact artifact = contributionFactory.createArtifact();

+            artifact.setUnresolved(true);

+            artifact.setURI(contextPath);

+            artifact = resolver.resolveModel(Artifact.class, artifact);

+            if (!artifact.isUnresolved()) {

+                resource = new URL(artifact.getLocation());

+            } else {

+                throw new ContributionReadException("Location cannot be resloved: " + contextPath);

+            }

+        } else {

+            resource = new URL(contextPath);

+        }

+        return resource;

+    }

+

+    /**

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

+     * specified in the location attribute

+     */

+    private XMLStreamReader getApplicationContextReader(ModelResolver resolver, String location) throws ContributionReadException {

+

+        try {

+            URL resource = getApplicationContextResource(resolveLocation(resolver, location)).get(0);

+            XMLStreamReader reader =

+            	xmlInputFactory.createXMLStreamReader(resource.openStream());

+            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(ModelResolver resolver,

+                                       XMLStreamReader reader,

+                                       String contextPath,

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

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

+                                readContextDefinition(resolver, ireader, contextPath, 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(resolver, reader, contextPath, 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(ModelResolver resolver,

+                                    XMLStreamReader reader,

+                                    String contextPath,

+                                    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(resolver, reader, contextPath, 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);

+                            }

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

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

+                                       ModelResolver resolver,

+                                       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 = resolveClass(resolver, serviceElement.getType());

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

+                // Spring allows duplication of bean definitions in multiple context scenario,

+                // in such cases, the latest bean definition overrides the older ones, hence 

+                // we will remove any older definition and use the latest.

+                Service duplicate = null;

+                for (Service service : componentType.getServices()) {

+                	if (service.getName().equals(theService.getName()))

+                		duplicate = service;

+                }

+                if (duplicate != null)

+                	componentType.getServices().remove(duplicate);

+                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 = resolveClass(resolver, referenceElement.getType());

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

+                // Override the older bean definition with the latest ones.

+                Reference duplicate = null;

+                for (Reference reference : componentType.getReferences()) {

+                	if (reference.getName().equals(theReference.getName()))

+                		duplicate = reference;

+                }

+                if (duplicate != null)

+                	componentType.getReferences().remove(duplicate);

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

+                    // Override the older bean definition with the latest ones.

+                    Property duplicate = null;

+                    for (Property property : componentType.getProperties()) {

+                    	if (property.getName().equals(theProperty.getName()))

+                    		duplicate = property;

+                    }

+                    if (duplicate != null)

+                    	componentType.getProperties().remove(duplicate);

+                    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 = resolveClass(resolver, beanElement.getClassName());

+                    // Introspect the bean

+                    beanIntrospector =

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

+                    ComponentType beanComponentType = assemblyFactory.createComponentType();

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

+                    // Set the service name as bean name

+                    for (Service componentService : beanComponentType.getServices())                    	

+                    	componentService.setName(beanElement.getId());

+                    // 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 = resolveClass(resolver, 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 = resolveClass(resolver, (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 = resolveClass(resolver, 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())))

+                    		{                    		

+                    			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 List<URL> getApplicationContextResource(URL url)

+        throws ContributionReadException {

+        File manifestFile = null;

+        File appXmlFile;

+        File locationFile = null;

+        List<URL> appCtxResources = new ArrayList<URL>();

+

+        if (url != null) {

+            String path = url.getPath();

+            locationFile = new File(path);

+        } else {

+            throw new ContributionReadException("SpringXMLComponentTypeLoader getApplicationContextResource: " 

+            		            + "unable to find resource file " + url);

+        }

+

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

+	            		String[] cxtPaths = appCtxPath.split(";");

+	            		for (String path : cxtPaths) {

+	            			appXmlFile = new File(locationFile, path);

+	            			if (appXmlFile.exists()) {

+	            				appCtxResources.add(appXmlFile.toURI().toURL());

+	            			}

+	            		}

+	            		return appCtxResources;

+                    }

+                }

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

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

+                                                        + File.separator + SpringImplementationConstants.APPLICATION_CONTEXT);

+                if (appXmlFile.exists()) {

+                	appCtxResources.add(appXmlFile.toURI().toURL());

+                	return appCtxResources;

+                }

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

+                        	String[] cxtPaths = appCtxPath.split(";");

+    	            		for (String path : cxtPaths) {

+    	            			je = jf.getJarEntry(path);

+    	            			if (je != null) {

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

+    	            			}

+    	            		}

+    	            		return appCtxResources;

+                        }

+                    }

+                    // Look for the default applicaiton-context.xml file, when MANIFEST.MF is absent.

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

+                    if (je != null) {

+                    	appCtxResources.add(new URL("jar:" + locationFile.toURI().toURL() + "!/" +

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

+                    	return appCtxResources;                        

+                    }

+                } catch (IOException e) {

+                    // TODO: create a more appropriate exception type

+                    throw new ContributionReadException("SpringXMLLoader getApplicationContextResource: "

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

+                }

+        	}

+        	else {

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

+        			appCtxResources.add(url);

+                	return appCtxResources;

+        		}

+        		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 jarPath = url.getPath().substring(6, url.getPath().indexOf("!"));

+	        				JarFile jf = new JarFile(jarPath);

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

+	                            	String[] cxtPaths = appCtxPath.split(";");

+	        	            		for (String path : cxtPaths) {

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

+		                                if (je != null) {

+		                                	appCtxResources.add(new URL("jar:" + url.getPath() + "/" + path));

+		    	                        	return appCtxResources;

+		                                }

+	        	            		}

+	                            }

+	        				}

+	        			    // Look for the default applicaiton-context.xml file, when MANIFEST.MF is absent.

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

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

+                            if (je != null) {

+                            	appCtxResources.add(new URL("jar:" + url.getPath() + "/" + 

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

+	                        	return appCtxResources;

+                            }

+	        			}

+            		} catch (IOException e) {

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

+                    }

+        		}

+        	}

+        }

+

+        throw new ContributionReadException("SpringXMLComponentTypeLoader getApplicationContextResource: " 

+        		                            + "unable to read resource file " + url);

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

+    }

+

+    private class ContextClassLoader extends ClassLoader {

+        public ContextClassLoader(ModelResolver resolver) {

+            super();

+            this.resolver = resolver;

+        }

+

+        private ModelResolver resolver;

+

+        @Override

+        protected Class<?> findClass(String name) throws ClassNotFoundException {

+            return SpringXMLComponentTypeLoader.this.resolveClass(resolver, name);

+        }

+

+        @Override

+        protected URL findResource(String name) {

+            try {

+                return resolveLocation(resolver, name);

+            } catch (Exception e) {

+                return null;

+            }

+        }

+

+        @Override

+        protected Enumeration<URL> findResources(String name) throws IOException {

+            URL url = findResource(name);

+            if (url != null) {

+                return Collections.enumeration(Arrays.asList(url));

+            } else {

+                Collection<URL> urls = Collections.emptyList();

+                return Collections.enumeration(urls);

+            }

+        }

+    }

+} // end class SpringXMLComponentTypeLoader

diff --git a/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ComponentTie.java b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ComponentTie.java
new file mode 100644
index 0000000000..2f245d7f06
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ComponentTie.java
@@ -0,0 +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.invocation;

+

+/**

+ * This is the Tuscany side tie for the corresponding Spring runtime side stub class.

+ * It enables the Tuscany code to invoke methods on a Spring context without

+ * needing to know about any Spring classes. See the ComponentStub class

+ * in the implementation-spring-runtime module for what the stub does. 

+ */

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

+

+public class ComponentTie {

+

+    private RuntimeComponent component;

+    

+    public ComponentTie(RuntimeComponent component) {

+        this.component = component;

+    }

+

+    public Object getService(Class<?> type, String name) {

+        return component.getComponentContext().getService(type, name);

+    }

+}

diff --git a/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ConfigurationPropertiesExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ConfigurationPropertiesExtensionPoint.java
new file mode 100644
index 0000000000..0464355565
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ConfigurationPropertiesExtensionPoint.java
@@ -0,0 +1,9 @@
+package org.apache.tuscany.sca.implementation.spring.invocation;

+

+public interface ConfigurationPropertiesExtensionPoint {

+	

+	boolean isAnnotationSupported();

+	

+	String getSupportedVersion();

+

+}

diff --git a/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/DefaultConfigurationPropertiesExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/DefaultConfigurationPropertiesExtensionPoint.java
new file mode 100644
index 0000000000..a0e7186eab
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/DefaultConfigurationPropertiesExtensionPoint.java
@@ -0,0 +1,27 @@
+package org.apache.tuscany.sca.implementation.spring.invocation;

+

+public class DefaultConfigurationPropertiesExtensionPoint implements ConfigurationPropertiesExtensionPoint {

+	

+	// Contructor

+	public DefaultConfigurationPropertiesExtensionPoint() {

+		

+	}

+	

+	// By default SCA annotations for implementation.spring

+	// will be supproted.

+	public boolean isAnnotationSupported() {

+		return true;

+	}

+	

+	// By defauly all the Spring version are supported for 

+	// Tuscany.

+	public String getSupportedVersion() {

+		

+		// Customize the code here for a limited version

+		// support

+		/* 

+		return "2.5.5"; 

+		*/		

+		return "ANY";

+	}

+}

diff --git a/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/PropertyValueTie.java b/sca-java-1.x/branches/sca-java-1.6/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/sca-java-1.x/branches/sca-java-1.6/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/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringContextStub.java b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringContextStub.java
new file mode 100644
index 0000000000..290bbff171
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringContextStub.java
@@ -0,0 +1,138 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

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

+

+import java.lang.reflect.Constructor;

+import java.lang.reflect.InvocationTargetException;

+import java.lang.reflect.Method;

+import java.util.List;

+

+import org.apache.tuscany.sca.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,

+                               boolean annotationSupport,

+                               String versionSupported) {

+

+        initTie(component, implementation, propertyValueObjectFactory, annotationSupport, versionSupported);        

+

+    }

+

+    private void initTie(RuntimeComponent component,

+                         SpringImplementation implementation,

+                         JavaPropertyValueObjectFactory propertyValueObjectFactory,

+                         boolean annotationSupport,

+                         String versionSupported) {

+

+        // 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, List.class, boolean.class, String.class});

+            this.tie = tieConstructor.newInstance(stub, implementation.getResource(), annotationSupport, versionSupported);

+            

+            this.startMethod = tieClass.getMethod("start");

+            this.closeMethod = tieClass.getMethod("close");

+            this.getBeanMethod = tieClass.getMethod("getBean", String.class);

+

+        } catch (ClassNotFoundException e) {

+            throw new RuntimeException(e);

+        } catch (SecurityException e) {

+            throw new RuntimeException(e);

+        } catch (NoSuchMethodException e) {

+            throw new RuntimeException(e);

+        } catch (IllegalArgumentException e) {

+            throw new RuntimeException(e);

+        } catch (InstantiationException e) {

+            throw new RuntimeException(e);

+        } catch (IllegalAccessException e) {

+            throw new RuntimeException(e);

+        } catch (InvocationTargetException e) {

+        	e.printStackTrace();

+            throw new RuntimeException(e);

+        }

+    }

+

+    public void start() {

+        try {

+            startMethod.invoke(tie);

+        } catch (IllegalArgumentException e) {

+            throw new RuntimeException(e);

+        } catch (IllegalAccessException e) {

+            throw new RuntimeException(e);

+        } catch (InvocationTargetException e) {

+        	e.printStackTrace();

+            throw new RuntimeException(e);

+        }

+    }

+

+    public void close() {

+        try {

+            closeMethod.invoke(tie);

+        } catch (IllegalArgumentException e) {

+            throw new RuntimeException(e);

+        } catch (IllegalAccessException e) {

+            throw new RuntimeException(e);

+        } catch (InvocationTargetException e) {

+        	e.printStackTrace();

+            throw new RuntimeException(e);

+        }

+    }

+

+    public Object getBean(String id) throws SpringInvocationException {

+        try {

+

+            return getBeanMethod.invoke(tie, id);

+

+        } catch (IllegalArgumentException e) {

+            throw new RuntimeException(e);

+        } catch (IllegalAccessException e) {

+            throw new RuntimeException(e);

+        } catch (InvocationTargetException e) {

+        	e.printStackTrace();

+            throw new RuntimeException(e);

+        }

+    }

+

+}

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

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

+                                        boolean annotationSupport,

+                                        String versionSupported) {

+        super();

+        this.implementation = implementation;

+        this.component = component;

+        this.propertyValueObjectFactory = propertyValueObjectFactory;

+

+        springContext = new SpringContextStub(component, implementation, proxyService, propertyValueObjectFactory, annotationSupport, versionSupported);        

+        

+    } // end constructor

+

+    public Invoker createInvoker(RuntimeComponentService service, Operation operation) {

+        return new SpringInvoker(component, springContext, service, operation);

+    }

+    

+    public boolean supportsOneWayInvocation() {

+        return false;

+    }

+

+    /**

+     * Start this Spring implementation instance

+     */

+    public void start() {

+        springContext.start();

+    }

+

+    /**

+     * Stop this implementation instance

+     */

+    public void stop() {

+    	springContext.close();

+    }

+

+} // end class SpringImplementationProvider

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

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

+    private ConfigurationPropertiesExtensionPoint configProperties;

+    private boolean annotationSupport;

+    private String versionSupported;

+

+    /**

+     * Simple constructor

+     *

+     */

+    public SpringImplementationProviderFactory(ExtensionPointRegistry extensionPoints) {

+        super();

+        

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

+        proxyFactory = new ExtensibleProxyFactory(proxyFactories);

+        

+        configProperties = extensionPoints.getExtensionPoint(ConfigurationPropertiesExtensionPoint.class);

+        if (configProperties == null) {

+        	configProperties = new DefaultConfigurationPropertiesExtensionPoint();

+        }

+        annotationSupport = configProperties.isAnnotationSupported();

+        versionSupported = configProperties.getSupportedVersion();

+        

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

+                                                annotationSupport,

+                                                versionSupported);

+    }

+

+    /**

+     * Returns the class of the Spring implementation

+     */

+    public Class<SpringImplementation> getModelType() {

+        return SpringImplementation.class;

+    }

+} // end class SpringImplementationProviderFactory

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

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

+    }

+

+    public ClassLoader getClassLoader() {

+        return implementation.getClassLoader();

+    }

+}

diff --git a/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvocationException.java b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvocationException.java
new file mode 100644
index 0000000000..d1330f8471
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvocationException.java
@@ -0,0 +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.invocation;

+

+/**

+ * @version $Rev$ $Date$

+ */

+public class SpringInvocationException extends Exception {

+

+    private static final long serialVersionUID = -1157790036638157513L;

+

+    public SpringInvocationException(String msg) {

+        super(msg);

+    }

+    

+    public SpringInvocationException(Throwable e) {

+        super(e);

+    }

+    

+    public SpringInvocationException(String msg,Throwable e) {

+        super(msg,e);

+    }

+

+}

diff --git a/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvoker.java b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvoker.java
new file mode 100644
index 0000000000..3bf68a689c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvoker.java
@@ -0,0 +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.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/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java
new file mode 100644
index 0000000000..1d941e2a4f
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java
@@ -0,0 +1,234 @@
+/*

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

+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;

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

+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.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.monitor.impl.ProblemImpl;
+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;

+

+    private ModelFactoryExtensionPoint factories;

+

+    public SpringImplementationProcessor(ExtensionPointRegistry extensionPoints, Monitor monitor) {

+        this.factories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);    	

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

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

+        this.policyFactory = factories.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>

+        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(factories, assemblyFactory, javaFactory, policyFactory);

+        try {

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

+            springLoader.load(springImplementation, resolver);

+        } 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/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
new file mode 100644
index 0000000000..99e362fea4
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -0,0 +1,19 @@
+# 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. 

+

+# Implementation class for the artifact processor extension

+org.apache.tuscany.sca.implementation.spring.xml.SpringImplementationProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#implementation.spring,model=org.apache.tuscany.sca.implementation.spring.SpringImplementation

diff --git a/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.spring.ConfigurationPropertiesExtensionPoint b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.spring.ConfigurationPropertiesExtensionPoint
new file mode 100644
index 0000000000..efa3d5ed7c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.spring.ConfigurationPropertiesExtensionPoint
@@ -0,0 +1,18 @@
+# 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. 

+

+org.apache.tuscany.sca.implementation.spring.invocation.DefaultConfigurationPropertiesExtensionPoint

diff --git a/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
new file mode 100644
index 0000000000..41e20e531f
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
@@ -0,0 +1,19 @@
+# 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. 

+

+# Implementation class for the implementation extension

+org.apache.tuscany.sca.implementation.spring.invocation.SpringImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.spring.SpringImplementation

diff --git a/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties
new file mode 100644
index 0000000000..6fce02664a
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties
@@ -0,0 +1,23 @@
+#
+#
+#    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.
+#
+#
+LocationAttributeMissing = Reading implementation.spring - location attribute missing
+ContributionResolveException = ContributionResolveException occured due to:
+UnableToResolveComponentType = SpringArtifactProcessor: unable to resolve componentType for Spring component
\ No newline at end of file