Moving 1.x branches

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

14 files changed, 0 insertions, 1386 deletions

diff --git a/branches/sca-java-20080910/modules/implementation-web-runtime/LICENSE b/branches/sca-java-20080910/modules/implementation-web-runtime/LICENSE
deleted file mode 100644
index 6b0b1270ff..0000000000
--- a/branches/sca-java-20080910/modules/implementation-web-runtime/LICENSE
+++ /dev/null
@@ -1,203 +0,0 @@
-
-                                 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/branches/sca-java-20080910/modules/implementation-web-runtime/NOTICE b/branches/sca-java-20080910/modules/implementation-web-runtime/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/branches/sca-java-20080910/modules/implementation-web-runtime/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2008 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/branches/sca-java-20080910/modules/implementation-web-runtime/pom.xml b/branches/sca-java-20080910/modules/implementation-web-runtime/pom.xml
deleted file mode 100644
index ba296fefcd..0000000000
--- a/branches/sca-java-20080910/modules/implementation-web-runtime/pom.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
-
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>1.4-SNAPSHOT</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.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>1.4-SNAPSHOT</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.4-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>                                      
-            <artifactId>junit</artifactId>
-            <version>4.2</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/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ComponentContextServlet.java b/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ComponentContextServlet.java
deleted file mode 100644
index bf33f7ad9e..0000000000
--- a/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ComponentContextServlet.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.implementation.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/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ContextScriptProcessor.java b/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ContextScriptProcessor.java
deleted file mode 100644
index 02c99debb0..0000000000
--- a/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ContextScriptProcessor.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.implementation.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/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ContextScriptProcessorExtensionPoint.java b/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ContextScriptProcessorExtensionPoint.java
deleted file mode 100644
index 6d3f590309..0000000000
--- a/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ContextScriptProcessorExtensionPoint.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.implementation.web;
-
-
-public interface ContextScriptProcessorExtensionPoint {
-
-    void addContextScriptProcessor(ContextScriptProcessor csp);
-    
-}
diff --git a/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/DefaultContextScriptProcessorExtensionPoint.java b/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/DefaultContextScriptProcessorExtensionPoint.java
deleted file mode 100644
index 89b951e7d2..0000000000
--- a/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/DefaultContextScriptProcessorExtensionPoint.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.implementation.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/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/JSONRPCScripProcessor.java b/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/JSONRPCScripProcessor.java
deleted file mode 100644
index e4ec0d71f9..0000000000
--- a/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/JSONRPCScripProcessor.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

- */

-

-package org.apache.tuscany.sca.implementation.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/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ComponentContextProxy.java b/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ComponentContextProxy.java
deleted file mode 100644
index 59afe23fa4..0000000000
--- a/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ComponentContextProxy.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

- */

-

-package org.apache.tuscany.sca.implementation.web.runtime;

-

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

-    }

-

-}

diff --git a/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java b/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java
deleted file mode 100644
index 2518ba5381..0000000000
--- a/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

- */

-package org.apache.tuscany.sca.implementation.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/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/resources/META-INF/sca.tld b/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/resources/META-INF/sca.tld
deleted file mode 100644
index 4807ba517a..0000000000
--- a/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/resources/META-INF/sca.tld
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version = '1.0' encoding = 'ISO-8859-1'?>

-<!--

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

- -->

-

-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd">

-

-<taglib version="2.1">

-

-  <tlib-version>1.0</tlib-version>

-  <short-name>SCA-JSP</short-name>

-  <uri>http://www.osog.org/sca/sca.tld</uri>

-  <description>A tag library for integrating sca components with jsp</description>

-

-  <tag>

-

-    <name>reference</name>

-

-    <tag-class>org.apache.tuscany.sca.implementation.web.taglib.ReferenceTag</tag-class>

-    <tei-class>org.apache.tuscany.sca.implementation.web.taglib.ReferenceTEI</tei-class>

-    

-    <attribute>

-      <name>name</name>

-      <required>true</required>

-      <type>java.lang.String</type>

-    </attribute>

-

-    <attribute>

-      <name>type</name>

-      <required>true</required>

-      <type>java.lang.String</type>

-    </attribute>

-

-    <attribute>

-      <name>scope</name>

-      <required>false</required>

-      <type>java.lang.Integer</type>

-    </attribute>

-

-    <body-content>empty</body-content>

-

-  </tag>

-

-</taglib>

diff --git a/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.ContextScriptProcessorExtensionPoint b/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.ContextScriptProcessorExtensionPoint
deleted file mode 100644
index 960ae30552..0000000000
--- a/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.ContextScriptProcessorExtensionPoint
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one

-# or more contributor license agreements.  See the NOTICE file

-# distributed with this work for additional information

-# regarding copyright ownership.  The ASF licenses this file

-# to you under the Apache License, Version 2.0 (the

-# "License"); you may not use this file except in compliance

-# with the License.  You may obtain a copy of the License at

-# 

-#   http://www.apache.org/licenses/LICENSE-2.0

-# 

-# Unless required by applicable law or agreed to in writing,

-# software distributed under the License is distributed on an

-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-# KIND, either express or implied.  See the License for the

-# specific language governing permissions and limitations

-# under the License.

-# Implementation class for the ModuleActivator

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

-

diff --git a/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
deleted file mode 100644
index 9b769c9b10..0000000000
--- a/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one

-# or more contributor license agreements.  See the NOTICE file

-# distributed with this work for additional information

-# regarding copyright ownership.  The ASF licenses this file

-# to you under the Apache License, Version 2.0 (the

-# "License"); you may not use this file except in compliance

-# with the License.  You may obtain a copy of the License at

-# 

-#   http://www.apache.org/licenses/LICENSE-2.0

-# 

-# Unless required by applicable law or agreed to in writing,

-# software distributed under the License is distributed on an

-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-# KIND, either express or implied.  See the License for the

-# specific language governing permissions and limitations

-# under the License. 

-

-# 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/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/resources/jsonrpc.js b/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/resources/jsonrpc.js
deleted file mode 100644
index 8eb477c2e5..0000000000
--- a/branches/sca-java-20080910/modules/implementation-web-runtime/src/main/resources/jsonrpc.js
+++ /dev/null
@@ -1,493 +0,0 @@
-/*

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

-};

-