28 files changed, 2781 insertions, 0 deletions

diff --git a/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/LICENSE b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/LICENSE
new file mode 100644
index 0000000000..6e42c7155c
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/LICENSE
@@ -0,0 +1,247 @@
+
+                                 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.
+
+
+================================================================================
+
+APACHE TUSCANY SCA SUBCOMPONENTS:
+
+Apache Tuscany SCA for Java includes a number of subcomponents with
+separate copyright notices and license terms. Your use of these subcomponents
+is subject to the terms and conditions of the following licenses.
+
+================================================================================
+
+This module implementation-web-runtime includes the file jsonrpc.js under the
+following copyright and license:
+
+/*
+ * JSON-RPC JavaScript client
+ *
+ * $Id: jsonrpc.js,v 1.36.2.3 2006/03/08 15:09:37 mclark Exp $
+ *
+ * Copyright (c) 2003-2004 Jan-Klaas Kollhof
+ * Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
+ *
+ * This code is based on Jan-Klaas' JavaScript o lait library (jsolait).
+ *
+ * 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.
+ *
+ */
+
+/*
+ * Modifications for Apache Tuscany:
+ * - JSONRpcClient_createMethod changed so callback is last arg
+ */
+
+================================================================================
diff --git a/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/NOTICE b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/NOTICE
new file mode 100644
index 0000000000..ad2ba40961
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/NOTICE
@@ -0,0 +1,6 @@
+${pom.name}
+Copyright (c) 2005 - 2010 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/tags/1.6.1-RC1/modules/implementation-web-runtime/pom.xml b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/pom.xml
new file mode 100644
index 0000000000..a523fbc5f0
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/pom.xml
@@ -0,0 +1,116 @@
+<?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.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>tuscany-implementation-web-runtime</artifactId>
+    <name>Apache Tuscany SCA implementation.web Extension</name>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-web</artifactId>
+            <version>1.6.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.6.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-http</artifactId>
+            <version>1.6.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jsp_2.1_spec</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>1.6.1</version>
+            <scope>compile</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api-extension</artifactId>
+            <version>1.6.1</version>
+            <scope>compile</scope>
+        </dependency>        
+
+        <dependency>
+            <groupId>junit</groupId>                                      
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <version>2.2</version>
+            <scope>test</scope>
+        </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.web.runtime</Bundle-SymbolicName>
+                        <Bundle-Description>${pom.name}</Bundle-Description>
+                        <Export-Package>org.apache.tuscany.sca.implementation.web.runtime*</Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ComponentContextServlet.java b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ComponentContextServlet.java
new file mode 100644
index 0000000000..bf33f7ad9e
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ComponentContextServlet.java
@@ -0,0 +1,156 @@
+/*
+ * 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.web;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.tuscany.sca.assembly.ComponentReference;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+
+/**
+ * Servlet that handles the GET request for the componentContext.js script
+ * 
+ * The script is generated by calling ScriptProcessors to output the code 
+ * for the SCA references, properties etc.
+ */
+public class ComponentContextServlet extends HttpServlet {
+    private static final long serialVersionUID = 1L;
+
+    protected static final String HEADER = "/** --- Apache Tuscany componentContext.js --- */\n";
+    protected static final String FOOTER = "/** --- Apache Tuscany componentContext.js EOF --- */\n";
+
+    public static final String COMPONENT_CONTEXT_SCRIPT_URI = "org.apache.tuscany.sca.componentContext.js";
+    
+    protected transient Map<String, Object> attributes = new HashMap<String, Object>();
+    protected transient ServletContext servletContext;
+    private transient List<ContextScriptProcessor> contextScriptProcessors = new ArrayList<ContextScriptProcessor>();
+
+    public ComponentContextServlet() {
+        contextScriptProcessors.add(new JSONRPCScripProcessor());
+    }
+
+    @Override
+    public void init(ServletConfig servletConfig) throws ServletException {
+        this.servletContext = servletConfig.getServletContext();
+        if (attributes.size() > 0) {
+            for (String name : attributes.keySet()) {
+                servletContext.setAttribute(name, attributes.get(name));
+            }
+        }
+    }
+
+    @Override
+    public void doGet(HttpServletRequest req, HttpServletResponse response) throws IOException  {
+        response.setContentType("text/plain;charset=utf-8");
+        PrintWriter out = response.getWriter();
+
+        out.write(HEADER);
+
+        doScriptInit(req, response);
+
+        doScriptReferences(req, response);
+
+        out.write(FOOTER);
+
+        out.flush();
+        out.close();
+    }
+
+    /**
+     * Calls each ContextScriptProcessor once to insert any required initilization code into componentContext.js  
+     */
+    protected void doScriptInit(HttpServletRequest req, HttpServletResponse response) throws IOException, UnsupportedEncodingException {
+
+        PrintWriter out = response.getWriter();
+        
+        out.println("if (SCA == undefined) var SCA = new Object();");
+        out.println("if (SCA.componentContext == undefined) {");
+        out.println("   SCA.componentContext = new Object();");
+        out.println("   SCA.componentContext.serviceNames = [];");
+        out.println("   SCA.componentContext.serviceProxys = [];");
+        out.println("   SCA.componentContext.getService = function(serviceName){");
+        out.println("      var i = SCA.componentContext.serviceNames.indexOf(serviceName);");
+        out.println("      return SCA.componentContext.serviceProxys[i];");
+        out.println("   };");
+        out.println("   if (componentContext == undefined) var componentContext = SCA.componentContext;");
+        out.println("}");
+
+        for (ContextScriptProcessor csp : contextScriptProcessors) {
+            csp.scriptInit(req, response);
+        }
+    }
+
+    /**
+     * Calls each ContextScriptProcessor for each SCA reference to insert code for the reference into componentContext.js  
+     */
+    protected void doScriptReferences(HttpServletRequest req, HttpServletResponse response) throws IOException, UnsupportedEncodingException {
+
+        PrintWriter out = response.getWriter();
+
+        out.write("// SCA References\n");
+        
+        RuntimeComponent component = (RuntimeComponent)servletContext.getAttribute("org.apache.tuscany.sca.implementation.web.RuntimeComponent");
+        
+        for (ComponentReference cr : component.getReferences()) {
+            String ref = "// SCA Reference " + cr.getName() + "\n";
+            out.write(ref);
+            for (ContextScriptProcessor csp : contextScriptProcessors) {
+                csp.scriptReference(cr, req, response);
+            }
+        }
+
+        out.write("\n// SCA References end.\n");
+    }
+
+    /**
+     * Calls each ContextScriptProcessor for each SCA property to insert code for the property into componentContext.js  
+     */
+    protected void doScriptProperties(HttpServletRequest req, HttpServletResponse response) throws IOException, UnsupportedEncodingException {
+        // TODO: support properties
+    }
+
+    /**
+     * Set an attribute on the ServletContext
+     */
+    public void setAttribute(String name, Object value) {
+        if (servletContext != null) {
+            servletContext.setAttribute(name, value);
+        } else {
+            attributes.put(name, value);
+        }
+    }
+
+    public void addContextScriptProcessor(ContextScriptProcessor csp) {
+        contextScriptProcessors.add(csp);
+    }
+}
diff --git a/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ContextScriptProcessor.java b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ContextScriptProcessor.java
new file mode 100644
index 0000000000..02c99debb0
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ContextScriptProcessor.java
@@ -0,0 +1,32 @@
+/*
+ * 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.web;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.tuscany.sca.assembly.ComponentReference;
+
+public interface ContextScriptProcessor {
+    void scriptInit(HttpServletRequest req, HttpServletResponse response)  throws IOException;
+    void scriptReference(ComponentReference cr, HttpServletRequest req, HttpServletResponse response) throws IOException;
+}
diff --git a/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ContextScriptProcessorExtensionPoint.java b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ContextScriptProcessorExtensionPoint.java
new file mode 100644
index 0000000000..6d3f590309
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ContextScriptProcessorExtensionPoint.java
@@ -0,0 +1,27 @@
+/*
+ * 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.web;
+
+
+public interface ContextScriptProcessorExtensionPoint {
+
+    void addContextScriptProcessor(ContextScriptProcessor csp);
+    
+}
diff --git a/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/DefaultContextScriptProcessorExtensionPoint.java b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/DefaultContextScriptProcessorExtensionPoint.java
new file mode 100644
index 0000000000..89b951e7d2
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/DefaultContextScriptProcessorExtensionPoint.java
@@ -0,0 +1,51 @@
+/*
+ * 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.web;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class DefaultContextScriptProcessorExtensionPoint implements ContextScriptProcessorExtensionPoint {
+
+    protected ComponentContextServlet componentContextServlet;
+    protected List<ContextScriptProcessor> tempCSPHolder = new ArrayList<ContextScriptProcessor>();
+    
+    public DefaultContextScriptProcessorExtensionPoint() {
+    }
+
+    public void addContextScriptProcessor(ContextScriptProcessor csp) {
+        if (componentContextServlet != null) {
+            componentContextServlet.addContextScriptProcessor(csp);
+        } else {
+            tempCSPHolder.add(csp); 
+        }
+    }
+    
+    public void setComponentContextServlet(ComponentContextServlet servlet) {
+        componentContextServlet = servlet;
+        if (tempCSPHolder.size() > 0) {
+            for (ContextScriptProcessor csp : tempCSPHolder) {
+                componentContextServlet.addContextScriptProcessor(csp);
+            }
+        }
+    }
+
+}
diff --git a/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/JSONRPCScripProcessor.java b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/JSONRPCScripProcessor.java
new file mode 100644
index 0000000000..e4ec0d71f9
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/JSONRPCScripProcessor.java
@@ -0,0 +1,57 @@
+/*

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

+

+import java.io.IOException;

+import java.io.InputStream;

+import java.io.PrintWriter;

+

+import javax.servlet.http.HttpServletRequest;

+import javax.servlet.http.HttpServletResponse;

+

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

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

+

+public class JSONRPCScripProcessor implements ContextScriptProcessor {

+

+    public void scriptInit(HttpServletRequest req, HttpServletResponse response) throws IOException {

+        PrintWriter out = response.getWriter();

+        InputStream is = getClass().getClassLoader().getResourceAsStream("jsonrpc.js");

+        if (is != null) {

+            int i;

+            while ((i = is.read()) != -1) {

+                out.write(i);

+            }           

+        }

+        

+        out.println();

+    }

+

+    public void scriptReference(ComponentReference cr, HttpServletRequest req, HttpServletResponse response) throws IOException {

+        for (Binding b : cr.getBindings()) {

+            if ("org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBinding".equals(b.getClass().getName())) {

+               PrintWriter out = response.getWriter();

+               out.println("SCA.componentContext.serviceNames.push('" + cr.getName() + "');");

+               out.println("SCA.componentContext.serviceProxys.push(new JSONRpcClient('" + cr.getReference().getTargets().get(0).getName() + "').Service);");

+            }

+        }

+    }

+

+}

diff --git a/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ComponentContextProxy.java b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ComponentContextProxy.java
new file mode 100644
index 0000000000..c4f39bded8
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ComponentContextProxy.java
@@ -0,0 +1,88 @@
+/*

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

+

+import java.util.Collection;

+

+import org.apache.tuscany.sca.api.ComponentContextExtension;

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

+import org.osoa.sca.CallableReference;

+import org.osoa.sca.ComponentContext;

+import org.osoa.sca.RequestContext;

+import org.osoa.sca.ServiceReference;

+

+/**

+ * Proxy ComponentContext wrappering a RuntimeComponent as the

+ * RuntimeComponent ComponentContext has not been created till later 

+ */

+public class ComponentContextProxy implements ComponentContext {

+

+    protected RuntimeComponent runtimeComponent;

+    

+    public ComponentContextProxy(RuntimeComponent runtimeComponent) {

+        this.runtimeComponent = runtimeComponent;

+    }

+    

+    protected ComponentContext getComponentContext() {

+        return runtimeComponent.getComponentContext();

+    }

+    

+    @SuppressWarnings("unchecked")

+    public <B, R extends CallableReference<B>> R cast(B arg0) throws IllegalArgumentException {

+        return (R) getComponentContext().cast(arg0);

+    }

+

+    public <B> ServiceReference<B> createSelfReference(Class<B> arg0) {

+        return getComponentContext().createSelfReference(arg0);

+    }

+

+    public <B> ServiceReference<B> createSelfReference(Class<B> arg0, String arg1) {

+        return getComponentContext().createSelfReference(arg0, arg1);

+    }

+

+    public <B> B getProperty(Class<B> arg0, String arg1) {

+        return getComponentContext().getProperty(arg0, arg1);

+    }

+

+    public RequestContext getRequestContext() {

+        return getComponentContext().getRequestContext();

+    }

+

+    public <B> B getService(Class<B> arg0, String arg1) {

+        return getComponentContext().getService(arg0, arg1);

+    }

+

+    public <B> ServiceReference<B> getServiceReference(Class<B> arg0, String arg1) {

+        return getComponentContext().getServiceReference(arg0, arg1);

+    }

+

+    public String getURI() {

+        return getComponentContext().getURI();

+    }

+

+    public <B> Collection<ServiceReference<B>> getServiceReferences(Class<B> businessInterface, String referenceName) {

+        return ((ComponentContextExtension)getComponentContext()).getServiceReferences(businessInterface, referenceName);

+    }

+

+    public <B> Collection<B> getServices(Class<B> businessInterface, String referenceName) {

+        return ((ComponentContextExtension)getComponentContext()).getServices(businessInterface, referenceName);

+    }

+

+}

diff --git a/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java
new file mode 100644
index 0000000000..2518ba5381
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.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.web.runtime;

+

+import java.util.List;

+

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

+import org.apache.tuscany.sca.host.http.ServletHost;

+import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;

+import org.apache.tuscany.sca.implementation.web.ComponentContextServlet;

+import org.apache.tuscany.sca.implementation.web.ContextScriptProcessorExtensionPoint;

+import org.apache.tuscany.sca.implementation.web.DefaultContextScriptProcessorExtensionPoint;

+import org.apache.tuscany.sca.implementation.web.WebImplementation;

+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.provider.ImplementationProviderFactory;

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

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

+public class WebImplementationProviderFactory implements ImplementationProviderFactory<WebImplementation> {

+

+    private ServletHost servletHost;

+    private ComponentContextServlet contextServlet;

+

+    public WebImplementationProviderFactory(ExtensionPointRegistry extensionPoints) {

+        ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class);

+        List<ServletHost> hosts = servletHosts.getServletHosts();

+        if (!hosts.isEmpty()) {

+            this.servletHost = hosts.get(0);

+        }

+

+        contextServlet = new ComponentContextServlet();

+

+        DefaultContextScriptProcessorExtensionPoint dcspep = (DefaultContextScriptProcessorExtensionPoint)extensionPoints.getExtensionPoint(ContextScriptProcessorExtensionPoint.class);

+        dcspep.setComponentContextServlet(contextServlet);

+    }

+

+    public ImplementationProvider createImplementationProvider(RuntimeComponent component, WebImplementation implementation) {

+

+        servletHost.addServletMapping("org.osoa.sca.componentContext.js", contextServlet);

+        contextServlet.setAttribute("org.osoa.sca.ComponentContext", new ComponentContextProxy(component));

+        contextServlet.setAttribute("org.apache.tuscany.sca.implementation.web.RuntimeComponent", component);

+

+        return new ImplementationProvider() {

+            public Invoker createInvoker(RuntimeComponentService arg0, Operation arg1) {

+                throw new UnsupportedOperationException("Components using implementation.web have no services");

+            }

+            public void start() {

+            }

+            public void stop() {

+            }

+            public boolean supportsOneWayInvocation() {

+                return false;

+            }

+        };

+    }

+    

+    public Class<WebImplementation> getModelType() {

+        return WebImplementation.class;

+    }

+    

+}

diff --git a/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.ContextScriptProcessorExtensionPoint b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.ContextScriptProcessorExtensionPoint
new file mode 100644
index 0000000000..960ae30552
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.ContextScriptProcessorExtensionPoint
@@ -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 ModuleActivator

+org.apache.tuscany.sca.implementation.web.DefaultContextScriptProcessorExtensionPoint

+

diff --git a/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
new file mode 100644
index 0000000000..9b769c9b10
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/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.web.runtime.WebImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.web.WebImplementation

diff --git a/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/src/main/resources/jsonrpc.js b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/src/main/resources/jsonrpc.js
new file mode 100644
index 0000000000..8eb477c2e5
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web-runtime/src/main/resources/jsonrpc.js
@@ -0,0 +1,493 @@
+/*

+ * JSON-RPC JavaScript client

+ *

+ * $Id: jsonrpc.js,v 1.36.2.3 2006/03/08 15:09:37 mclark Exp $

+ *

+ * Copyright (c) 2003-2004 Jan-Klaas Kollhof

+ * Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd

+ *

+ * This code is based on Jan-Klaas' JavaScript o lait library (jsolait).

+ *

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

+ *

+ */

+

+/*

+ * Modifications for Apache Tuscany:

+ * - JSONRpcClient_createMethod changed so callback is last arg

+ */

+

+/* escape a character */

+

+escapeJSONChar =

+function escapeJSONChar(c)

+{

+    if(c == "\"" || c == "\\") return "\\" + c;

+    else if (c == "\b") return "\\b";

+    else if (c == "\f") return "\\f";

+    else if (c == "\n") return "\\n";

+    else if (c == "\r") return "\\r";

+    else if (c == "\t") return "\\t";

+    var hex = c.charCodeAt(0).toString(16);

+    if(hex.length == 1) return "\\u000" + hex;

+    else if(hex.length == 2) return "\\u00" + hex;

+    else if(hex.length == 3) return "\\u0" + hex;

+    else return "\\u" + hex;

+};

+

+

+/* encode a string into JSON format */

+

+escapeJSONString =

+function escapeJSONString(s)

+{

+    /* The following should suffice but Safari's regex is b0rken

+       (doesn't support callback substitutions)

+       return "\"" + s.replace(/([^\u0020-\u007f]|[\\\"])/g,

+       escapeJSONChar) + "\"";

+    */

+

+    /* Rather inefficient way to do it */

+    var parts = s.split("");

+    for(var i=0; i < parts.length; i++) {

+	var c =parts[i];

+	if(c == '"' ||

+	   c == '\\' ||

+	   c.charCodeAt(0) < 32 ||

+	   c.charCodeAt(0) >= 128)

+	    parts[i] = escapeJSONChar(parts[i]);

+    }

+    return "\"" + parts.join("") + "\"";

+};

+

+

+/* Marshall objects to JSON format */

+

+toJSON = function toJSON(o)

+{

+    if(o == null) {

+	return "null";

+    } else if(o.constructor == String) {

+	return escapeJSONString(o);

+    } else if(o.constructor == Number) {

+	return o.toString();

+    } else if(o.constructor == Boolean) {

+	return o.toString();

+    } else if(o.constructor == Date) {

+	return '{javaClass: "java.util.Date", time: ' + o.valueOf() +'}';

+    } else if(o.constructor == Array) {

+	var v = [];

+	for(var i = 0; i < o.length; i++) v.push(toJSON(o[i]));

+	return "[" + v.join(", ") + "]";

+    } else {

+	var v = [];

+	for(attr in o) {

+	    if(o[attr] == null) v.push("\"" + attr + "\": null");

+	    else if(typeof o[attr] == "function"); /* skip */

+	    else v.push(escapeJSONString(attr) + ": " + toJSON(o[attr]));

+	}

+	return "{" + v.join(", ") + "}";

+    }

+};

+

+

+/* JSONRpcClient constructor */

+

+JSONRpcClient =

+function JSONRpcClient_ctor(serverURL, user, pass, objectID)

+{

+    this.serverURL = serverURL;

+    this.user = user;

+    this.pass = pass;

+    this.objectID = objectID;

+

+    /* Add standard methods */

+    if(this.objectID) {

+	this._addMethods(["listMethods"]);

+	var req = this._makeRequest("listMethods", []);

+    } else {

+	this._addMethods(["system.listMethods"]);

+	var req = this._makeRequest("system.listMethods", []);

+    }

+    var m = this._sendRequest(req);

+    this._addMethods(m);

+};

+

+

+/* JSONRpcCLient.Exception */

+

+JSONRpcClient.Exception =

+function JSONRpcClient_Exception_ctor(code, message, javaStack)

+{

+    this.code = code;

+    var name;

+    if(javaStack) {

+	this.javaStack = javaStack;

+	var m = javaStack.match(/^([^:]*)/);

+	if(m) name = m[0];

+    }

+    if(name) this.name = name;

+    else this.name = "JSONRpcClientException";

+    this.message = message;

+};

+

+JSONRpcClient.Exception.CODE_REMOTE_EXCEPTION = 490;

+JSONRpcClient.Exception.CODE_ERR_CLIENT = 550;

+JSONRpcClient.Exception.CODE_ERR_PARSE = 590;

+JSONRpcClient.Exception.CODE_ERR_NOMETHOD = 591;

+JSONRpcClient.Exception.CODE_ERR_UNMARSHALL = 592;

+JSONRpcClient.Exception.CODE_ERR_MARSHALL = 593;

+

+JSONRpcClient.Exception.prototype = new Error();

+

+JSONRpcClient.Exception.prototype.toString =

+function JSONRpcClient_Exception_toString(code, msg)

+{

+    return this.name + ": " + this.message;

+};

+

+

+/* Default top level exception handler */

+

+JSONRpcClient.default_ex_handler =

+function JSONRpcClient_default_ex_handler(e) { alert(e); };

+

+

+/* Client settable variables */

+

+JSONRpcClient.toplevel_ex_handler = JSONRpcClient.default_ex_handler;

+JSONRpcClient.profile_async = false;

+JSONRpcClient.max_req_active = 1;

+JSONRpcClient.requestId = 1;

+

+

+/* JSONRpcClient implementation */

+

+JSONRpcClient.prototype._createMethod =

+function JSONRpcClient_createMethod(methodName)

+{

+    var fn=function()

+    {

+	var args = [];

+	var callback = null;

+	for(var i=0;i<arguments.length;i++) args.push(arguments[i]);

+

+/*	TUSCANY change callback to be last arg instead of first to match binding.ajax

+	if(typeof args[0] == "function") callback = args.shift();

+*/

+	if(typeof args[arguments.length-1] == "function") callback = args.pop();

+

+	var req = fn.client._makeRequest.call(fn.client, fn.methodName,

+					      args, callback);

+	if(callback == null) {

+	    return fn.client._sendRequest.call(fn.client, req);

+	} else {

+	    JSONRpcClient.async_requests.push(req);

+	    JSONRpcClient.kick_async();

+	    return req.requestId;

+	}

+    };

+    fn.client = this;

+    fn.methodName = methodName;

+    return fn;

+};

+

+JSONRpcClient.prototype._addMethods =

+function JSONRpcClient_addMethods(methodNames)

+{

+    for(var i=0; i<methodNames.length; i++) {

+	var obj = this;

+	var names = methodNames[i].split(".");

+	for(var n=0; n<names.length-1; n++) {

+	    var name = names[n];

+	    if(obj[name]) {

+		obj = obj[name];

+	    } else {

+		obj[name]  = new Object();

+		obj = obj[name];

+	    }

+	}

+	var name = names[names.length-1];

+	if(!obj[name]) {

+	    var method = this._createMethod(methodNames[i]);

+	    obj[name] = method;

+	}

+    }

+};

+

+JSONRpcClient._getCharsetFromHeaders =

+function JSONRpcClient_getCharsetFromHeaders(http)

+{

+    try {

+	var contentType = http.getResponseHeader("Content-type");

+	var parts = contentType.split(/\s*;\s*/);

+	for(var i =0; i < parts.length; i++) {

+	    if(parts[i].substring(0, 8) == "charset=")

+		return parts[i].substring(8, parts[i].length);

+	}

+    } catch (e) {}

+    return "UTF-8"; /* default */

+};

+

+/* Async queue globals */

+JSONRpcClient.async_requests = [];

+JSONRpcClient.async_inflight = {};

+JSONRpcClient.async_responses = [];

+JSONRpcClient.async_timeout = null;

+JSONRpcClient.num_req_active = 0;

+

+JSONRpcClient._async_handler =

+function JSONRpcClient_async_handler()

+{

+    JSONRpcClient.async_timeout = null;

+

+    while(JSONRpcClient.async_responses.length > 0) {

+	var res = JSONRpcClient.async_responses.shift();

+	if(res.canceled) continue;

+	if(res.profile) res.profile.dispatch = new Date();

+	try {

+	    res.cb(res.result, res.ex, res.profile);

+	} catch(e) {

+	    JSONRpcClient.toplevel_ex_handler(e);

+	}

+    }

+

+    while(JSONRpcClient.async_requests.length > 0 &&

+	  JSONRpcClient.num_req_active < JSONRpcClient.max_req_active) {

+	var req = JSONRpcClient.async_requests.shift();

+	if(req.canceled) continue;

+	req.client._sendRequest.call(req.client, req);

+    }

+};

+

+JSONRpcClient.kick_async =

+function JSONRpcClient_kick_async()

+{

+    if(JSONRpcClient.async_timeout == null)

+	JSONRpcClient.async_timeout =

+	    setTimeout(JSONRpcClient._async_handler, 0);

+};

+

+JSONRpcClient.cancelRequest =

+function JSONRpcClient_cancelRequest(requestId)

+{

+    /* If it is in flight then mark it as canceled in the inflight map

+       and the XMLHttpRequest callback will discard the reply. */

+    if(JSONRpcClient.async_inflight[requestId]) {

+	JSONRpcClient.async_inflight[requestId].canceled = true;

+	return true;

+    }

+

+    /* If its not in flight yet then we can just mark it as canceled in

+       the the request queue and it will get discarded before being sent. */

+    for(var i in JSONRpcClient.async_requests) {

+	if(JSONRpcClient.async_requests[i].requestId == requestId) {

+	    JSONRpcClient.async_requests[i].canceled = true;

+	    return true;

+	}

+    }

+

+    /* It may have returned from the network and be waiting for its callback

+       to be dispatched, so mark it as canceled in the response queue

+       and the response will get discarded before calling the callback. */

+    for(var i in JSONRpcClient.async_responses) {

+	if(JSONRpcClient.async_responses[i].requestId == requestId) {

+	    JSONRpcClient.async_responses[i].canceled = true;

+	    return true;

+	}

+    }

+

+    return false;

+};

+

+JSONRpcClient.prototype._makeRequest =

+function JSONRpcClient_makeRequest(methodName, args, cb)

+{

+    var req = {};

+    req.client = this;

+    req.requestId = JSONRpcClient.requestId++;

+

+    var obj = {};

+    obj.id = req.requestId;

+    if (this.objectID)

+	obj.method = ".obj#" + this.objectID + "." + methodName;

+    else

+	obj.method = methodName;

+    obj.params = args;

+

+    if (cb) req.cb = cb;

+    if (JSONRpcClient.profile_async)

+	req.profile = { "submit": new Date() };

+    req.data = toJSON(obj);

+

+    return req;

+};

+

+JSONRpcClient.prototype._sendRequest =

+function JSONRpcClient_sendRequest(req)

+{

+    if(req.profile) req.profile.start = new Date();

+

+    /* Get free http object from the pool */

+    var http = JSONRpcClient.poolGetHTTPRequest();

+    JSONRpcClient.num_req_active++;

+

+    /* Send the request */

+    if (typeof(this.user) == "undefined") {

+	http.open("POST", this.serverURL, (req.cb != null));

+    } else {

+	http.open("POST", this.serverURL, (req.cb != null), this.user, this.pass);

+    }

+

+    /* setRequestHeader is missing in Opera 8 Beta */

+    try { http.setRequestHeader("Content-type", "text/plain"); } catch(e) {}

+

+    /* Construct call back if we have one */

+    if(req.cb) {

+	var self = this;

+	http.onreadystatechange = function() {

+	    if(http.readyState == 4) {

+		http.onreadystatechange = function () {};

+		var res = { "cb": req.cb, "result": null, "ex": null};

+		if (req.profile) {

+		    res.profile = req.profile;

+		    res.profile.end = new Date();

+		}

+		try { res.result = self._handleResponse(http); }

+		catch(e) { res.ex = e; }

+		if(!JSONRpcClient.async_inflight[req.requestId].canceled)

+		    JSONRpcClient.async_responses.push(res);

+		delete JSONRpcClient.async_inflight[req.requestId];

+		JSONRpcClient.kick_async();

+	    }

+	};

+    } else {

+	http.onreadystatechange = function() {};

+    }

+

+    JSONRpcClient.async_inflight[req.requestId] = req;

+	

+    try {

+	http.send(req.data);

+    } catch(e) {

+	JSONRpcClient.poolReturnHTTPRequest(http);

+	JSONRpcClient.num_req_active--;

+	throw new JSONRpcClient.Exception

+	    (JSONRpcClient.Exception.CODE_ERR_CLIENT, "Connection failed");

+    }

+

+    if(!req.cb) return this._handleResponse(http);

+};

+

+JSONRpcClient.prototype._handleResponse =

+function JSONRpcClient_handleResponse(http)

+{

+    /* Get the charset */

+    if(!this.charset) {

+	this.charset = JSONRpcClient._getCharsetFromHeaders(http);

+    }

+

+    /* Get request results */

+    var status, statusText, data;

+    try {

+	status = http.status;

+	statusText = http.statusText;

+	data = http.responseText;

+    } catch(e) {

+	JSONRpcClient.poolReturnHTTPRequest(http);

+	JSONRpcClient.num_req_active--;

+	JSONRpcClient.kick_async();

+	throw new JSONRpcClient.Exception

+	    (JSONRpcClient.Exception.CODE_ERR_CLIENT, "Connection failed");

+    }

+

+    /* Return http object to the pool; */

+    JSONRpcClient.poolReturnHTTPRequest(http);

+    JSONRpcClient.num_req_active--;

+

+    /* Unmarshall the response */

+    if(status != 200) {

+	throw new JSONRpcClient.Exception(status, statusText);

+    }

+    var obj;

+    try {

+	eval("obj = " + data);

+    } catch(e) {

+	throw new JSONRpcClient.Exception(550, "error parsing result");

+    }

+    if(obj.error)

+	throw new JSONRpcClient.Exception(obj.error.code, obj.error.msg,

+					  obj.error.trace);

+    var res = obj.result;

+

+    /* Handle CallableProxy */

+    if(res && res.objectID && res.JSONRPCType == "CallableReference")

+	return new JSONRpcClient(this.serverURL, this.user,

+				 this.pass, res.objectID);

+

+    return res;

+};

+

+

+/* XMLHttpRequest wrapper code */

+

+/* XMLHttpRequest pool globals */

+JSONRpcClient.http_spare = [];

+JSONRpcClient.http_max_spare = 8;

+

+JSONRpcClient.poolGetHTTPRequest =

+function JSONRpcClient_pool_getHTTPRequest()

+{

+    if(JSONRpcClient.http_spare.length > 0) {

+	return JSONRpcClient.http_spare.pop();

+    }

+    return JSONRpcClient.getHTTPRequest();

+};

+

+JSONRpcClient.poolReturnHTTPRequest =

+function JSONRpcClient_poolReturnHTTPRequest(http)

+{

+    if(JSONRpcClient.http_spare.length >= JSONRpcClient.http_max_spare)

+	delete http;

+    else

+	JSONRpcClient.http_spare.push(http);

+};

+

+JSONRpcClient.msxmlNames = [ "MSXML2.XMLHTTP.5.0",

+			     "MSXML2.XMLHTTP.4.0",

+			     "MSXML2.XMLHTTP.3.0",

+			     "MSXML2.XMLHTTP",

+			     "Microsoft.XMLHTTP" ];

+

+JSONRpcClient.getHTTPRequest =

+function JSONRpcClient_getHTTPRequest()

+{

+    /* Mozilla XMLHttpRequest */

+    try {

+	JSONRpcClient.httpObjectName = "XMLHttpRequest";

+	return new XMLHttpRequest();

+    } catch(e) {}

+

+    /* Microsoft MSXML ActiveX */

+    for (var i=0;i < JSONRpcClient.msxmlNames.length; i++) {

+	try {

+	    JSONRpcClient.httpObjectName = JSONRpcClient.msxmlNames[i];

+	    return new ActiveXObject(JSONRpcClient.msxmlNames[i]);

+	} catch (e) {}

+    }

+

+    /* None found */

+    JSONRpcClient.httpObjectName = null;

+    throw new JSONRpcClient.Exception(0, "Can't create XMLHttpRequest object");

+};

+

diff --git a/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/LICENSE b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/LICENSE
new file mode 100644
index 0000000000..6e529a25c4
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/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/tags/1.6.1-RC1/modules/implementation-web/NOTICE b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/NOTICE
new file mode 100644
index 0000000000..9ddba06a32
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/NOTICE
@@ -0,0 +1,6 @@
+${pom.name}

+Copyright (c) 2005 - 2010 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/tags/1.6.1-RC1/modules/implementation-web/pom.xml b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/pom.xml
new file mode 100644
index 0000000000..8594b21110
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/pom.xml
@@ -0,0 +1,100 @@
+<?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.1</version>

+        <relativePath>../pom.xml</relativePath>

+    </parent>

+

+    <artifactId>tuscany-implementation-web</artifactId>

+    <name>Apache Tuscany SCA Web Implementation Model</name>

+

+    <dependencies>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-assembly</artifactId>

+            <version>1.6.1</version>

+        </dependency>

+ 

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-assembly-xml</artifactId>

+            <version>1.6.1</version>

+        </dependency>

+ 

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-contribution-jee</artifactId>

+            <version>1.6.1</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-contribution-xml</artifactId>

+            <version>1.6.1</version>

+            <scope>test</scope> 

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-host-embedded</artifactId>

+            <version>1.6.1</version>

+            <scope>test</scope> 

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-implementation-java</artifactId>

+            <version>1.6.1</version>

+        </dependency>

+

+        <dependency>

+            <groupId>junit</groupId>

+            <artifactId>junit</artifactId>

+            <version>4.5</version>

+            <scope>test</scope>

+        </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.web</Bundle-SymbolicName>

+                        <Bundle-Description>${pom.name}</Bundle-Description>

+                        <Export-Package>org.apache.tuscany.sca.implementation.web*</Export-Package>

+                    </instructions>

+                </configuration>

+            </plugin>

+        </plugins>

+    </build>

+

+</project>

diff --git a/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java
new file mode 100644
index 0000000000..2aef3477ba
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java
@@ -0,0 +1,71 @@
+/*

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

+

+import java.util.Map;

+

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

+import org.apache.tuscany.sca.contribution.jee.InjectionTarget;

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

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

+

+

+

+/**

+ * The model representing an Web implementation in an SCA assembly model.

+ */

+public interface WebImplementation extends Implementation {

+    

+    /**

+     * Returns the webapp URI.

+     * @return the webapp URI

+     */

+    String getWebURI();

+    

+    /**

+     * Sets the Webapp URI.

+     * @param uri the webapp URI

+     */

+    void setWebURI(String webappURI);

+

+    /**

+     * Returns the injection points for SCA references

+     * 

+     * @return Map with injection points for SCA references

+     */

+    Map<String, JavaElementImpl> getReferenceInjectionPoints();

+    

+    /**

+     * Returns the injection points for SCA properties

+     * 

+     * @return Map with injection points for SCA properties

+     */

+    Map<String, JavaElementImpl> getPropertyInjectionPoints();

+

+    /**

+     * Returns the injection points for SCA resources like component context, component name, etc.

+     * 

+     * @return Map with injection points for SCA resources

+     */

+    Map<String, JavaResourceImpl> getResourceInjectionPoints();

+    

+    Map<InjectionTarget, Class<?>> getOptExtensionReferenceInjectionPoints();

+

+    Map<String, String> getOptExtensionPropertyInjectionPoints();

+}

diff --git a/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementationFactory.java b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementationFactory.java
new file mode 100644
index 0000000000..0cb80de03e
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementationFactory.java
@@ -0,0 +1,34 @@
+/*

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

+

+

+/**

+ * Factory for the Web implementation model.

+ */

+public interface WebImplementationFactory {

+    

+    /**

+     * Creates a new Web implementation.

+     * @return a new Web implementation

+     */

+    WebImplementation createWebImplementation();

+

+}

diff --git a/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationFactoryImpl.java b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationFactoryImpl.java
new file mode 100644
index 0000000000..744fefc39b
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationFactoryImpl.java
@@ -0,0 +1,37 @@
+/*

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

+

+import org.apache.tuscany.sca.implementation.web.WebImplementation;

+import org.apache.tuscany.sca.implementation.web.WebImplementationFactory;

+

+/**

+ * Factory for the Web implementation model.

+ */

+public class WebImplementationFactoryImpl implements WebImplementationFactory {

+    

+    public WebImplementationFactoryImpl() {

+    }

+

+    public WebImplementation createWebImplementation() {

+        return new WebImplementationImpl();

+    }

+

+}

diff --git a/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java
new file mode 100644
index 0000000000..7764d45693
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java
@@ -0,0 +1,168 @@
+/*

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

+

+import java.util.Collections;

+import java.util.HashMap;

+import java.util.List;

+import java.util.Map;

+

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

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

+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.contribution.jee.InjectionTarget;

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

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

+import org.apache.tuscany.sca.implementation.web.WebImplementation;

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

+

+

+/**

+ * The model representing an Web implementation in an SCA assembly model.

+ */

+class WebImplementationImpl extends ImplementationImpl implements WebImplementation, ComponentPreProcessor {

+

+    private String webURI;

+

+    private Map<String, JavaElementImpl> propertyInjectionPoints = new HashMap<String, JavaElementImpl>();

+

+    private Map<String, JavaElementImpl> referenceInjectionPoints = new HashMap<String, JavaElementImpl>();

+

+    private Map<String, JavaResourceImpl> resourceInjectionPoints = new HashMap<String, JavaResourceImpl>();

+    

+    private Map<InjectionTarget, Class<?>> optExtReferenceInjectionPoints = new HashMap<InjectionTarget, Class<?>>();

+    

+    private Map<String, String> optExtPropertyInjectionPoints = new HashMap<String, String>();

+    /**

+     * Constructs a new Web implementation.

+     */

+    WebImplementationImpl() {

+        super();

+    }

+

+    @Override

+    public ConstrainingType getConstrainingType() {

+        // The Web implementation does not support constrainingTypes

+        return null;

+    }

+

+    @Override

+    public List<Service> getServices() {

+        // The Web implementation does not offer services

+        return Collections.emptyList();

+    }

+    

+    @Override

+    public void setConstrainingType(ConstrainingType constrainingType) {

+        // The Web implementation does not support constrainingTypes

+    }

+

+    public String getWebURI() {

+        return webURI;

+    }

+

+    public void setWebURI(String webURI) {

+        this.webURI = webURI;

+    }

+

+    /**

+     * Use preProcess to add any references and properties dynamically

+     * TODO: also support introspection and handle WEB-INF/web.componentType (spec line 503) 

+     */

+    public void preProcess(Component component) {

+        if (!(component instanceof RuntimeComponent)) {

+            return;

+        }

+        RuntimeComponent rtc = (RuntimeComponent) component;

+        

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

+            if (getReference(reference.getName()) == null) {

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

+            }

+        }

+

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

+            if (getProperty(property.getName()) == null) {

+                getProperties().add(createProperty(property));

+            }

+        }

+    }

+

+    protected Reference getReference(String name) {

+        for (Reference reference : getReferences()) {

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

+                return reference;

+            }

+        }

+        return null;

+    }

+

+    protected Reference createReference(Reference reference) {

+        Reference newReference;

+        try {

+            newReference = (Reference)reference.clone();

+        } catch (CloneNotSupportedException e) {

+            throw new AssertionError(e); // should not ever happen

+        }

+        return newReference;

+    }

+

+    protected Property getProperty(String name) {

+        for (Property property : getProperties()) {

+            if (property.getName().equals(name)) {

+                return property;

+            }

+        }

+        return null;

+    }

+

+    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 Map<String, JavaElementImpl> getPropertyInjectionPoints() {

+        return propertyInjectionPoints;

+    }

+

+    public Map<String, JavaElementImpl> getReferenceInjectionPoints() {

+        return referenceInjectionPoints;

+    }

+

+    public Map<String, JavaResourceImpl> getResourceInjectionPoints() {

+        return resourceInjectionPoints;

+    }

+

+    public Map<InjectionTarget, Class<?>> getOptExtensionReferenceInjectionPoints() {

+        return optExtReferenceInjectionPoints;

+    }

+

+    public Map<String, String> getOptExtensionPropertyInjectionPoints() {

+        return optExtPropertyInjectionPoints;

+    }

+}

diff --git a/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/PropertyProcessor.java b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/PropertyProcessor.java
new file mode 100644
index 0000000000..4bf53e8336
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/PropertyProcessor.java
@@ -0,0 +1,150 @@
+/*
+ * 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.web.introspect;
+
+import java.lang.annotation.ElementType;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.Property;
+import org.apache.tuscany.sca.implementation.java.IntrospectionException;
+import org.apache.tuscany.sca.implementation.java.JavaImplementation;
+import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl;
+import org.apache.tuscany.sca.implementation.java.impl.JavaParameterImpl;
+import org.apache.tuscany.sca.implementation.java.introspect.impl.BaseJavaClassVisitor;
+import org.apache.tuscany.sca.implementation.java.introspect.impl.DuplicatePropertyException;
+import org.apache.tuscany.sca.implementation.java.introspect.impl.IllegalPropertyException;
+import org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper;
+import org.apache.tuscany.sca.interfacedef.util.JavaXMLMapper;
+
+/**
+ * Class to handle annotations that add Properties.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class PropertyProcessor extends BaseJavaClassVisitor {
+    public PropertyProcessor(AssemblyFactory assemblyFactory) {
+        super(assemblyFactory);
+    }
+    
+    private boolean removeProperty(JavaElementImpl prop, JavaImplementation type) {
+        if(prop==null) {
+            return false;
+        }
+        List<Property> props = type.getProperties();
+        for(int i=0;i<props.size();i++) {
+            if(props.get(i).getName().equals(prop.getName())) {
+                props.remove(i);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public void visitMethod(Method method, JavaImplementation type) throws IntrospectionException {
+        org.osoa.sca.annotations.Property annotation = method.getAnnotation(org.osoa.sca.annotations.Property.class);
+        if (annotation == null) {
+            return;
+        }
+
+        if (!JavaIntrospectionHelper.isSetter(method)) {
+            throw new IllegalPropertyException("Annotated method is not a setter: " + method, method);
+        }
+
+        String name = annotation.name();
+        if (name == null || "".equals(name)) {
+            name = method.getName();
+            if (name.startsWith("set")) {
+                name = JavaIntrospectionHelper.toPropertyName(method.getName());
+            }
+        }
+
+        Map<String, JavaElementImpl> properties = type.getPropertyMembers();
+        JavaElementImpl prop = properties.get(name);
+        // Setter override field
+        if (prop != null && prop.getElementType() != ElementType.FIELD) {
+            throw new DuplicatePropertyException(name);
+        }
+
+        removeProperty(prop, type);
+        
+        JavaElementImpl element = new JavaElementImpl(method, 0);
+        Property property = createProperty(name, element);
+
+        property.setMustSupply(annotation.required());
+        type.getProperties().add(property);
+        properties.put(name, element);
+    }
+
+    @Override
+    public void visitField(Field field, JavaImplementation type) throws IntrospectionException {
+
+        org.osoa.sca.annotations.Property annotation = field.getAnnotation(org.osoa.sca.annotations.Property.class);
+        if (annotation == null) {
+            return;
+        }
+
+        String name = annotation.name();
+        if (name == null) {
+            name = "";
+        }
+        if ("".equals(name) || name.equals(field.getType().getName())) {
+            name = field.getName();
+        }
+
+        Map<String, JavaElementImpl> properties = type.getPropertyMembers();
+        JavaElementImpl prop = properties.get(name);
+        // Setter override field
+        if (prop != null && prop.getElementType() == ElementType.FIELD) {
+            throw new DuplicatePropertyException(name);
+        }
+
+        if (prop == null) {
+            JavaElementImpl element = new JavaElementImpl(field);
+            Property property = createProperty(name, element);
+            property.setMustSupply(annotation.required());
+            type.getProperties().add(property);
+            properties.put(name, element);
+        }
+    }
+
+    @Override
+    public void visitConstructorParameter(JavaParameterImpl parameter, JavaImplementation type)
+        throws IntrospectionException {
+    }
+
+    protected Property createProperty(String name, JavaElementImpl element) throws IntrospectionException {
+
+        Property property = assemblyFactory.createProperty();
+        property.setName(name);
+        Class<?> baseType = JavaIntrospectionHelper.getBaseType(element.getType(), element.getGenericType());
+        property.setXSDType(JavaXMLMapper.getXMLType(baseType));
+
+        Class<?> javaType = element.getType();
+        if (javaType.isArray() || Collection.class.isAssignableFrom(javaType)) {
+            property.setMany(true);
+        }
+        return property;
+    }
+}
diff --git a/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/ReferenceProcessor.java b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/ReferenceProcessor.java
new file mode 100644
index 0000000000..c68693f2e4
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/ReferenceProcessor.java
@@ -0,0 +1,177 @@
+/*
+ * 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.web.introspect;
+
+import static org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper.getBaseType;
+
+import java.lang.annotation.ElementType;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.Multiplicity;
+import org.apache.tuscany.sca.implementation.java.IntrospectionException;
+import org.apache.tuscany.sca.implementation.java.JavaImplementation;
+import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl;
+import org.apache.tuscany.sca.implementation.java.impl.JavaParameterImpl;
+import org.apache.tuscany.sca.implementation.java.introspect.impl.BaseJavaClassVisitor;
+import org.apache.tuscany.sca.implementation.java.introspect.impl.DuplicateReferenceException;
+import org.apache.tuscany.sca.implementation.java.introspect.impl.IllegalReferenceException;
+import org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper;
+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.osoa.sca.CallableReference;
+import org.osoa.sca.annotations.Reference;
+
+/**
+ * Class to handle annotations that add References.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class ReferenceProcessor extends BaseJavaClassVisitor {
+    private JavaInterfaceFactory javaFactory;
+
+    public ReferenceProcessor(AssemblyFactory assemblyFactory, JavaInterfaceFactory javaFactory) {
+        super(assemblyFactory);
+        this.javaFactory = javaFactory;
+    }
+
+    @Override
+    public void visitMethod(Method method, JavaImplementation type) throws IntrospectionException {
+        Reference annotation = method.getAnnotation(Reference.class);
+        if (annotation == null) {
+            return; // Not a reference annotation.
+        }
+        if (!JavaIntrospectionHelper.isSetter(method)) {
+            throw new IllegalReferenceException("Annotated method is not a setter: " + method, method);
+        }
+        String name = annotation.name();
+        if ("".equals(name)) {
+            name = JavaIntrospectionHelper.toPropertyName(method.getName());
+        }
+        JavaElementImpl ref = type.getReferenceMembers().get(name);
+        // Setter override field
+        if (ref != null && ref.getElementType() != ElementType.FIELD) {
+            throw new DuplicateReferenceException(name);
+        }
+        removeReference(ref, type);
+
+        JavaElementImpl element = new JavaElementImpl(method, 0);
+        org.apache.tuscany.sca.assembly.Reference reference = createReference(element, name);
+        type.getReferences().add(reference);
+        type.getReferenceMembers().put(name, element);
+    }
+
+    private boolean removeReference(JavaElementImpl ref, JavaImplementation type) {
+        if (ref == null) {
+            return false;
+        }
+        List<org.apache.tuscany.sca.assembly.Reference> refs = type.getReferences();
+        for (int i = 0; i < refs.size(); i++) {
+            if (refs.get(i).getName().equals(ref.getName())) {
+                refs.remove(i);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public void visitField(Field field, JavaImplementation type) throws IntrospectionException {
+        Reference annotation = field.getAnnotation(Reference.class);
+        if (annotation == null) {
+            return;
+        }
+        String name = annotation.name();
+        if ("".equals(name)) {
+            name = field.getName();
+        }
+        JavaElementImpl ref = type.getReferenceMembers().get(name);
+        if (ref != null && ref.getElementType() == ElementType.FIELD) {
+            throw new DuplicateReferenceException(name);
+        }
+
+        // Setter method override field
+        if (ref == null) {
+            JavaElementImpl element = new JavaElementImpl(field);
+            org.apache.tuscany.sca.assembly.Reference reference = createReference(element, name);
+            type.getReferences().add(reference);
+            type.getReferenceMembers().put(name, element);
+        }
+    }
+
+    @Override
+    public void visitConstructorParameter(JavaParameterImpl parameter, JavaImplementation type)
+        throws IntrospectionException {
+    }
+
+    private org.apache.tuscany.sca.assembly.Reference createReference(JavaElementImpl element, String name)
+        throws IntrospectionException {
+        org.apache.tuscany.sca.assembly.Reference reference = assemblyFactory.createReference();
+        JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();
+        reference.setInterfaceContract(interfaceContract);
+
+        // reference.setMember((Member)element.getAnchor());
+        boolean required = true;
+        Reference ref = element.getAnnotation(Reference.class);
+        if (ref != null) {
+            required = ref.required();
+        }
+        // reference.setRequired(required);
+        reference.setName(name);
+        Class<?> rawType = element.getType();
+        if (rawType.isArray() || Collection.class.isAssignableFrom(rawType)) {
+            if (required) {
+                reference.setMultiplicity(Multiplicity.ONE_N);
+            } else {
+                reference.setMultiplicity(Multiplicity.ZERO_N);
+            }
+        } else {
+            if (required) {
+                reference.setMultiplicity(Multiplicity.ONE_ONE);
+            } else {
+                reference.setMultiplicity(Multiplicity.ZERO_ONE);
+            }
+        }
+        Type genericType = element.getGenericType();
+        Class<?> baseType = getBaseType(rawType, genericType);
+        if (CallableReference.class.isAssignableFrom(baseType)) {
+            if (Collection.class.isAssignableFrom(rawType)) {
+                genericType = JavaIntrospectionHelper.getParameterType(genericType);
+            }
+            baseType = JavaIntrospectionHelper.getBusinessInterface(baseType, genericType);
+        }
+        try {
+            JavaInterface callInterface = javaFactory.createJavaInterface(baseType);
+            reference.getInterfaceContract().setInterface(callInterface);
+            if (callInterface.getCallbackClass() != null) {
+                JavaInterface callbackInterface = javaFactory.createJavaInterface(callInterface.getCallbackClass());
+                reference.getInterfaceContract().setCallbackInterface(callbackInterface);
+            }
+        } catch (InvalidInterfaceException e) {
+            throw new IntrospectionException(e);
+        }
+        return reference;
+    }
+}
diff --git a/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java
new file mode 100644
index 0000000000..7c9af0fee5
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java
@@ -0,0 +1,230 @@
+/*

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

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

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

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

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

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

+ * 

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

+ * 

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

+ * software distributed under the License is distributed on an

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

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

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package org.apache.tuscany.sca.implementation.web.xml;

+

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

+

+import java.net.URI;

+import java.util.ArrayList;

+import java.util.List;

+import java.util.Map;

+

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

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

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

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

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

+import org.apache.tuscany.sca.contribution.jee.EjbReferenceInfo;

+import org.apache.tuscany.sca.contribution.jee.EnvEntryInfo;

+import org.apache.tuscany.sca.contribution.jee.JspReferenceTagInfo;

+import org.apache.tuscany.sca.contribution.jee.WebModuleInfo;

+import org.apache.tuscany.sca.contribution.jee.JavaEEExtension;

+import org.apache.tuscany.sca.contribution.jee.JavaEEOptionalExtension;

+import org.apache.tuscany.sca.contribution.jee.impl.WebModuleInfoImpl;

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

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

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

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

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

+import org.apache.tuscany.sca.implementation.web.WebImplementation;

+import org.apache.tuscany.sca.implementation.web.WebImplementationFactory;

+import org.apache.tuscany.sca.implementation.web.introspect.PropertyProcessor;

+import org.apache.tuscany.sca.implementation.web.introspect.ReferenceProcessor;

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

+

+

+/**

+ * Implements a StAX artifact processor for Web implementations.

+ */

+public class WebImplementationProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<WebImplementation> {

+    private static final QName IMPLEMENTATION_WEB = new QName(Constants.SCA10_NS, "implementation.web");

+    

+    private AssemblyFactory assemblyFactory;

+    private WebImplementationFactory implementationFactory;

+    private Monitor monitor;

+    private JavaEEExtension jeeExtension;

+    private JavaEEOptionalExtension jeeOptionalExtension;

+    private JavaImplementationFactory javaImplementationFactory;

+    private JavaInterfaceFactory javaInterfaceFactory;

+    

+    public WebImplementationProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {

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

+        this.implementationFactory = modelFactories.getFactory(WebImplementationFactory.class);

+        this.jeeExtension = modelFactories.getFactory(JavaEEExtension.class);

+        this.jeeOptionalExtension = modelFactories.getFactory(JavaEEOptionalExtension.class);

+        this.monitor = monitor;

+        

+        this.javaImplementationFactory = new DefaultJavaImplementationFactory();

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

+        javaImplementationFactory.addClassVisitor(new ReferenceProcessor(assemblyFactory, javaInterfaceFactory));

+        javaImplementationFactory.addClassVisitor(new PropertyProcessor(assemblyFactory));

+        javaImplementationFactory.addClassVisitor(new ComponentNameProcessor(assemblyFactory));

+        javaImplementationFactory.addClassVisitor(new ContextProcessor(assemblyFactory));

+    }

+

+    public QName getArtifactType() {

+        // Returns the QName of the XML element processed by this processor

+        return IMPLEMENTATION_WEB;

+    }

+

+    public Class<WebImplementation> getModelType() {

+        // Returns the type of model processed by this processor

+        return WebImplementation.class;

+    }

+

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

+        

+        // Read an <implementation.web> element

+        WebImplementation implementation = implementationFactory.createWebImplementation();

+        implementation.setUnresolved(true);

+

+        // Read the webapp uri attribute

+        String webURI = getString(reader, "web-uri");

+        if (webURI != null) {

+            implementation.setWebURI(webURI);

+

+            // Set the URI of the component type

+            // TODO: This should point to the base uri of the WAR file

+            implementation.setURI(webURI);

+        }

+

+        // Skip to end element

+        while (reader.hasNext()) {

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

+                break;

+            }

+        }

+        

+        return implementation;

+    }

+

+    public void resolve(WebImplementation implementation, ModelResolver resolver) throws ContributionResolveException {

+        

+        // Resolve the component type

+        String uri = implementation.getURI();

+        if (uri != null) {

+            WebModuleInfo webModuleInfo = new WebModuleInfoImpl();

+            webModuleInfo.setUri(URI.create(uri));

+            webModuleInfo = resolver.resolveModel(WebModuleInfo.class, webModuleInfo);

+            if(jeeOptionalExtension != null) {

+                ComponentType ct = jeeOptionalExtension.createImplementationWebComponentType(webModuleInfo);

+                implementation.getReferences().addAll(ct.getReferences());

+                implementation.getProperties().addAll(ct.getProperties());

+                List<String> propertyNames = new ArrayList<String>();

+                for(Property prop : ct.getProperties()) {

+                    propertyNames.add(prop.getName());

+                }

+                // Injection points from optional extension

+                for(Map.Entry<String, EjbReferenceInfo> entry : webModuleInfo.getEjbReferences().entrySet()) {

+                    EjbReferenceInfo ejbRef = entry.getValue();

+                    implementation.getOptExtensionReferenceInjectionPoints().put(ejbRef.injectionTarget, ejbRef.businessInterface);

+                }

+                for(Map.Entry<String, EnvEntryInfo> entry : webModuleInfo.getEnvEntries().entrySet()) {

+                    EnvEntryInfo envEntry = entry.getValue();

+                    if(propertyNames.contains(envEntry.name.replace("/", "_"))) {

+                        implementation.getOptExtensionPropertyInjectionPoints().put(envEntry.name, envEntry.type);

+                    }

+                }

+            }

+            

+            // Introspection of classes

+            List<Class<?>> webArtifacts = new ArrayList<Class<?>>();

+            webArtifacts.addAll(webModuleInfo.getServletClasses());

+            webArtifacts.addAll(webModuleInfo.getFilterClasses());

+            webArtifacts.addAll(webModuleInfo.getListenerClasses());

+            webArtifacts.addAll(webModuleInfo.getJSFClasses());

+            JavaImplementation ji = javaImplementationFactory.createJavaImplementation();

+            for(Class<?> clazz : webArtifacts) {

+                try {

+                    javaImplementationFactory.createJavaImplementation(ji, clazz);

+                } catch (IntrospectionException e) {

+                    // TODO Auto-generated catch block

+                    e.printStackTrace();

+                }

+            }

+            implementation.getReferences().addAll(ji.getReferences());

+            implementation.getProperties().addAll(ji.getProperties());

+            for(Map.Entry<String, JavaElementImpl> entry : ji.getReferenceMembers().entrySet()) { 

+                implementation.getReferenceInjectionPoints().put(entry.getKey(), entry.getValue());

+            }

+            for(Map.Entry<String, JavaElementImpl> entry : ji.getPropertyMembers().entrySet()) { 

+                implementation.getPropertyInjectionPoints().put(entry.getKey(), entry.getValue());

+            }

+            for(Map.Entry<String, JavaResourceImpl> entry : ji.getResources().entrySet()) { 

+                implementation.getResourceInjectionPoints().put(entry.getKey(), entry.getValue());

+            }

+

+            // SCA References in JSP Tags

+            for(JspReferenceTagInfo jspRefTag : webModuleInfo.getJspReferenceTags()) {

+                ComponentReference ref = assemblyFactory.createComponentReference();

+                ref.setName(jspRefTag.name);

+                JavaInterfaceContract intfContract = javaInterfaceFactory.createJavaInterfaceContract();

+                try {

+                    intfContract.setInterface(javaInterfaceFactory.createJavaInterface(jspRefTag.type));

+                } catch (InvalidInterfaceException e) {

+                    // TODO Auto-generated catch block

+                    e.printStackTrace();

+                }

+                ref.setInterfaceContract(intfContract);

+                implementation.getReferences().add(ref);

+            }

+            

+            // Process componentType side file

+            ComponentType componentType = assemblyFactory.createComponentType();

+            componentType.setURI("WEB-INF/web.componentType");

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

+            if (!componentType.isUnresolved()) {

+                

+                // Initialize the implementation's services, references and properties

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

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

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

+            }

+        }

+        implementation.setUnresolved(false);

+    }

+

+    public void write(WebImplementation implementation, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {

+        

+        // Write <implementation.web>

+        writeStart(writer, IMPLEMENTATION_WEB.getNamespaceURI(), IMPLEMENTATION_WEB.getLocalPart(),

+                   new XAttr("web-uri", implementation.getWebURI()));

+        

+        writeEnd(writer);

+    }

+}

diff --git a/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
new file mode 100644
index 0000000000..3f1e888e16
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/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.web.xml.WebImplementationProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#implementation.web,model=org.apache.tuscany.sca.implementation.web.WebImplementation,factory=org.apache.tuscany.sca.implementation.web.WebImplementationFactory
diff --git a/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.WebImplementationFactory b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.WebImplementationFactory
new file mode 100644
index 0000000000..d54fe9fcee
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.WebImplementationFactory
@@ -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 model factory
+org.apache.tuscany.sca.implementation.web.impl.WebImplementationFactoryImpl
diff --git a/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java
new file mode 100644
index 0000000000..10a7df7ae5
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java
@@ -0,0 +1,81 @@
+/*

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

+

+import java.io.InputStream;

+

+import javax.xml.stream.XMLInputFactory;

+import javax.xml.stream.XMLStreamReader;

+

+import junit.framework.TestCase;

+

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

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

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

+import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;

+import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;

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

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

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

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

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

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

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

+import org.apache.tuscany.sca.implementation.web.WebImplementation;

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

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

+

+/**

+ * Test reading Web implementations.

+ */

+public class ReadTestCase extends TestCase {

+

+    private XMLInputFactory inputFactory;

+    private StAXArtifactProcessor<Object> staxProcessor;

+    private CompositeBuilder compositeBuilder;

+

+    @Override

+    public void setUp() throws Exception {

+        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();

+        inputFactory = XMLInputFactory.newInstance();

+        StAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(extensionPoints);

+        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null);

+        

+        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);

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

+        SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class);

+        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);

+        InterfaceContractMapper mapper = utilities.getUtility(InterfaceContractMapper.class);

+        IntentAttachPointTypeFactory attachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);

+        compositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, mapper, null);

+    }

+

+    public void testReadComposite() throws Exception {

+        InputStream is = getClass().getResourceAsStream("TestWeb.composite");

+        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);

+        Composite composite = (Composite) staxProcessor.read(reader);

+        assertNotNull(composite);

+

+        compositeBuilder.build(composite);

+        

+        assertTrue(((WebImplementation) composite.getComponents().get(0).getImplementation()).getWebURI().equals("MyWebapp"));

+    }

+

+}

diff --git a/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/WriteTestCase.java b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/WriteTestCase.java
new file mode 100644
index 0000000000..723672270d
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/WriteTestCase.java
@@ -0,0 +1,66 @@
+/*

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

+

+import java.io.ByteArrayOutputStream;

+import java.io.InputStream;

+

+import javax.xml.stream.XMLInputFactory;

+import javax.xml.stream.XMLOutputFactory;

+

+import junit.framework.TestCase;

+

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

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

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

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

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

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

+

+/**

+ * Test reading/write Web implementations.

+ */

+public class WriteTestCase extends TestCase {

+

+    private XMLInputFactory inputFactory;

+    private XMLOutputFactory outputFactory;

+    private StAXArtifactProcessor<Object> staxProcessor;

+

+    @Override

+    public void setUp() throws Exception {

+        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();

+        inputFactory = XMLInputFactory.newInstance();

+        outputFactory = XMLOutputFactory.newInstance();

+        StAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(extensionPoints);

+        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, outputFactory, null);

+    }

+

+    public void testReadWriteComposite() throws Exception {

+        InputStream is = getClass().getResourceAsStream("TestWeb.composite");

+        Composite composite = (Composite) staxProcessor.read(inputFactory.createXMLStreamReader(is));

+        assertNotNull(composite);

+        ByteArrayOutputStream bos = new ByteArrayOutputStream();

+        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));

+        

+        assertTrue(bos.toString().contains("web-uri=\"MyWebapp\""));

+

+    }

+

+}

diff --git a/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite
new file mode 100644
index 0000000000..181de3772b
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-RC1/modules/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite
@@ -0,0 +1,29 @@
+<?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.    

+-->

+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"

+	targetNamespace="http://sample/web"

+	xmlns:sc="http://sample/composite"

+	name="TestWeb">

+

+    <component name="TestWeb">

+        <implementation.web web-uri="MyWebapp"/>

+    </component>

+

+</composite>