Move Tuscany from Incubator to top level.

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

15 files changed, 1503 insertions, 0 deletions

diff --git a/branches/sca-java-1.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java b/branches/sca-java-1.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java
new file mode 100644
index 0000000000..27a600fe08
--- /dev/null
+++ b/branches/sca-java-1.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java
@@ -0,0 +1,38 @@
+/*
+ * 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.widget;
+
+import java.net.URL;
+
+/**
+ * The service interface of resource implementations.
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface Widget {
+    
+    /**
+     * Returns the resource location URL.
+     * 
+     * @return
+     */
+    public URL getLocationURL();
+
+}
diff --git a/branches/sca-java-1.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetComponentServlet.java b/branches/sca-java-1.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetComponentServlet.java
new file mode 100644
index 0000000000..19a186ea8a
--- /dev/null
+++ b/branches/sca-java-1.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetComponentServlet.java
@@ -0,0 +1,149 @@
+/*
+ * 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.widget;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URL;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.tuscany.sca.assembly.Binding;
+import org.apache.tuscany.sca.assembly.ComponentReference;
+import org.apache.tuscany.sca.assembly.OptimizableBinding;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+
+/**
+ * Servlet to handle requests for ..
+ * 
+ * @version $Rev$ $Date$
+ */
+public class WidgetComponentServlet extends HttpServlet {
+    private static final long serialVersionUID = -2996033426789721509L;
+    
+    private transient RuntimeComponent component;
+    private transient URI servletURI;
+
+    public WidgetComponentServlet(RuntimeComponent component, String servletURI) {
+        this.component = component;
+        this.servletURI = URI.create(servletURI);
+    }
+
+    @Override
+    public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
+
+        ServletOutputStream os = response.getOutputStream();
+
+        os.println();
+        os.println("/* Apache Tuscany - SCA Web Widget */");
+        os.println();
+
+        writeSCAWidgetCode(os, request.getServletPath());
+    }
+
+    /**
+     */
+    private void writeSCAWidgetCode(ServletOutputStream out, String path) throws IOException {
+        out.println();
+        out.println("/* Apache Tuscany SCA Widget header */");
+        out.println();
+        
+        // remove the leading slash '/' character
+        path = path.substring(1);
+
+        for(ComponentReference reference : component.getReferences()) {
+            for(Binding binding : reference.getBindings()) {
+                String bindingProxyName = WidgetProxyHelper.getJavaScriptProxyFile(binding.getClass().getName());
+                if(bindingProxyName != null) {
+                    writeJavaScriptBindingProxy(out,bindingProxyName);
+                }
+            }
+        }
+        
+        writeJavaScriptReferenceFunction(out);
+        
+       
+        out.println();
+        out.println("/** End of Apache Tuscany SCA Widget */");
+        out.println();
+    }
+
+    /**
+     * Retrieve the binding proxy based on the bind name
+     * and embedded the javascript into this js
+     */
+    private void writeJavaScriptBindingProxy(ServletOutputStream os, String bindingProxyName) throws IOException {
+        
+        URL url = getClass().getClassLoader().getResource(bindingProxyName); //Thread.currentThread().getContextClassLoader().getResource(bindingProxyName);
+        InputStream is = url.openStream();
+        int i;
+        while ((i = is.read()) != -1) {
+            os.write(i);
+        }
+        os.println();
+        os.println();
+    }
+    
+    private void writeJavaScriptReferenceFunction (ServletOutputStream os) throws IOException {
+        
+        os.println("var referenceMap = new Object();");
+        for(ComponentReference reference : component.getReferences()) {
+            String referenceName = reference.getName();
+            Binding binding = reference.getBindings().get(0);
+            if (binding != null) {
+                
+                String proxyClient = WidgetProxyHelper.getJavaScriptProxyClient(binding.getClass().getName());
+                if(proxyClient != null) {
+                    
+                    //FIXME Eventually the binding URI should be initialized from the SCA domain
+                    // for now point to the target binding model directly, assuming that it's available
+                    // in the same node
+                    String targetURI = null;
+                    if (binding instanceof OptimizableBinding) {
+                        Binding targetBinding = ((OptimizableBinding)binding).getTargetBinding();
+                        if (targetBinding != null) {
+                            targetURI = URI.create(targetBinding.getURI()).getPath();
+                        }
+                    }
+                    if (targetURI == null) {
+                        targetURI = URI.create(binding.getURI()).getPath();
+                        if (!targetURI.startsWith("/")) {
+                            targetURI = "/" + targetURI;
+                        }
+                    }
+                    
+                    if(proxyClient.equals("JSONRpcClient")) {
+                        os.println("referenceMap." + referenceName + " = new " + proxyClient + "(\"" + targetURI + "\").Service;");
+                    } else {
+                        os.println("referenceMap." + referenceName + " = new " + proxyClient + "(\"" + targetURI + "\");");
+                    }
+                }                
+            }
+        }
+        
+        os.println("function Reference(name) {");
+        os.println("    return referenceMap[name];");
+        os.println("}");
+    }
+
+}
diff --git a/branches/sca-java-1.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java b/branches/sca-java-1.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java
new file mode 100644
index 0000000000..6f7ffdee09
--- /dev/null
+++ b/branches/sca-java-1.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java
@@ -0,0 +1,134 @@
+/*
+ * 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.widget;
+
+import java.net.URL;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.ConstrainingType;
+import org.apache.tuscany.sca.assembly.Implementation;
+import org.apache.tuscany.sca.assembly.Property;
+import org.apache.tuscany.sca.assembly.Reference;
+import org.apache.tuscany.sca.assembly.Service;
+import org.apache.tuscany.sca.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;
+
+
+/**
+ * The model representing a widget implementation in an SCA assembly model.
+ */
+public class WidgetImplementation implements Implementation {
+    private AssemblyFactory assemblyFactory;
+    
+    private Service widgetService;
+    private List<Reference> references = null;
+    
+    private String location;
+    private URL url;
+    private boolean unresolved;
+
+    /**
+     * Constructs a new resource implementation.
+     */
+    WidgetImplementation(AssemblyFactory assemblyFactory,
+                         JavaInterfaceFactory javaFactory) {
+
+        this.assemblyFactory = assemblyFactory;
+        
+        // Resource implementation always provide a single service exposing
+        // the Resource interface, and have no references and properties
+        widgetService = assemblyFactory.createService();
+        widgetService.setName("Widget");
+        
+        // Create the Java interface contract for the Resource service
+        JavaInterface javaInterface;
+        try {
+            javaInterface = javaFactory.createJavaInterface(Widget.class);
+        } catch (InvalidInterfaceException e) {
+            throw new IllegalArgumentException(e);
+        }
+        JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();
+        interfaceContract.setInterface(javaInterface);
+        widgetService.setInterfaceContract(interfaceContract);
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
+    public URL getLocationURL() {
+        return url;
+    }
+    
+    public void setLocationURL(URL url) {
+        this.url = url;
+    }
+    
+    public ConstrainingType getConstrainingType() {
+        // The resource implementation does not support constrainingTypes
+        return null;
+    }
+
+    public List<Property> getProperties() {
+        // The resource implementation does not support properties
+        return Collections.emptyList();
+    }
+
+    public List<Service> getServices() {
+        // The resource implementation does not support services
+        return Collections.singletonList(widgetService);
+    }
+    
+    public List<Reference> getReferences() {
+        if(this.references == null) {
+            WidgetImplementationIntrospector widgetIntrospector = new WidgetImplementationIntrospector(assemblyFactory, this);
+            references = widgetIntrospector.getReferences();
+        }
+        return references;
+    }
+
+    public String getURI() {
+        return location;
+    }
+
+    public void setConstrainingType(ConstrainingType constrainingType) {
+        // The resource implementation does not support constrainingTypes
+    }
+
+    public void setURI(String uri) {
+        this.location = uri;
+    }
+
+
+    public boolean isUnresolved() {
+        return unresolved;
+    }
+
+    public void setUnresolved(boolean unresolved) {
+        this.unresolved = unresolved;
+    }    
+}
diff --git a/branches/sca-java-1.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java b/branches/sca-java-1.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java
new file mode 100644
index 0000000000..2493b97f5c
--- /dev/null
+++ b/branches/sca-java-1.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java
@@ -0,0 +1,45 @@
+/*
+ * 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.widget;
+
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
+
+/**
+ * Factory for the widget implementation model.
+ *
+ * @version $Rev$ $Date$
+ */
+public class WidgetImplementationFactory {
+    
+    private AssemblyFactory assemblyFactory;
+    private JavaInterfaceFactory javaFactory;
+    
+    public WidgetImplementationFactory(ModelFactoryExtensionPoint modelFactories) {
+        assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
+        javaFactory = modelFactories.getFactory(JavaInterfaceFactory.class);
+    }
+
+    public WidgetImplementation createWidgetImplementation() {
+        return new WidgetImplementation(assemblyFactory, javaFactory);
+    }
+
+}
diff --git a/branches/sca-java-1.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java b/branches/sca-java-1.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
new file mode 100644
index 0000000000..c0e008dec5
--- /dev/null
+++ b/branches/sca-java-1.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
@@ -0,0 +1,105 @@
+/*
+ * 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.widget;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Scanner;
+
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.Reference;
+
+public class WidgetImplementationIntrospector {
+    private static final String WEB_REFERENCE_ANNOTATION = "//@Reference";
+    
+    private AssemblyFactory assemblyFactory;
+    private WidgetImplementation widgetImplementation;
+    
+    public WidgetImplementationIntrospector(AssemblyFactory assemblyFactory, WidgetImplementation widgetImplementation) {
+        this.widgetImplementation = widgetImplementation;
+        this.assemblyFactory = assemblyFactory;
+    }
+    
+    
+    /**
+     * Introspect the References of a given htmlWidget
+     * @return
+     */
+    public List<Reference> getReferences() {
+        List<Reference> references = new ArrayList<Reference>();
+        URL htmlWidget = widgetImplementation.getLocationURL();
+        
+        try {
+            Scanner scanner = new Scanner(htmlWidget.openStream());
+            while(scanner.hasNextLine()) {
+                String line = scanner.nextLine();
+                if(line.contains(WEB_REFERENCE_ANNOTATION)) {
+                    //process the next line, as it has the reference info
+                    if(scanner.hasNextLine()) {
+                        Reference reference = processReferenceScript(scanner.nextLine());
+                        if(reference != null){
+                            references.add(reference);
+                        }
+                        
+                    }
+                }
+            }
+            
+        } catch(Exception e) {
+            
+        }
+        
+        return references;
+        
+    }
+    
+    /**
+     * Process Reference declaration in JavaScript code
+     * Supported ways :
+     *    //@Reference
+     *    var catalog = new Reference("catalog");
+     *    
+     *    //@Reference
+     *    catalog = new Reference("catalog");
+     *    
+     * @param scriptContent
+     * @return
+     */
+    private Reference processReferenceScript(String scriptContent) {
+        Reference reference = null;
+        String referenceName = null;
+        
+        String tokens[] = scriptContent.split("=");
+        tokens = tokens[0].split(" ");
+        referenceName = tokens[tokens.length -1];
+        
+        if(referenceName != null) {
+            reference = assemblyFactory.createReference();
+            reference.setName(referenceName);            
+        }
+        
+        return reference;
+    }
+    
+    
+
+
+}
diff --git a/branches/sca-java-1.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java b/branches/sca-java-1.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
new file mode 100644
index 0000000000..7f396e95b5
--- /dev/null
+++ b/branches/sca-java-1.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
@@ -0,0 +1,119 @@
+/*
+ * 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.widget;
+
+import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
+
+import java.io.IOException;
+import java.net.URL;
+
+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.xml.Constants;
+import org.apache.tuscany.sca.contribution.ContributionFactory;
+import org.apache.tuscany.sca.contribution.DeployedArtifact;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.contribution.service.ContributionReadException;
+import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
+import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
+
+
+/**
+ * Implements a STAX artifact processor for resource implementations.
+ */
+public class WidgetImplementationProcessor implements StAXArtifactProcessor<WidgetImplementation> {
+    private static final QName IMPLEMENTATION_WIDGET = new QName(Constants.SCA10_TUSCANY_NS, "implementation.widget");
+    
+    private ContributionFactory contributionFactory;
+    private WidgetImplementationFactory implementationFactory;
+    
+    public WidgetImplementationProcessor(ModelFactoryExtensionPoint modelFactories) {
+        contributionFactory = modelFactories.getFactory(ContributionFactory.class);
+        implementationFactory = new WidgetImplementationFactory(modelFactories); //modelFactories.getFactory(WidgetImplementationFactory.class);
+    }
+
+    public QName getArtifactType() {
+        // Returns the qname of the XML element processed by this processor
+        return IMPLEMENTATION_WIDGET;
+    }
+
+    public Class<WidgetImplementation> getModelType() {
+        // Returns the type of model processed by this processor
+        return WidgetImplementation.class;
+    }
+
+    public WidgetImplementation read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
+        
+        // Read an <implementation.resource> element
+
+        // Read the location attribute specifying the location of the
+        // resources
+        String location = reader.getAttributeValue(null, "location");
+
+        // Create an initialize the resource implementationmodel
+        WidgetImplementation implementation = implementationFactory.createWidgetImplementation();
+        implementation.setLocation(location);
+        implementation.setUnresolved(true);
+        
+        // Skip to end element
+        while (reader.hasNext()) {
+            if (reader.next() == END_ELEMENT && IMPLEMENTATION_WIDGET.equals(reader.getName())) {
+                break;
+            }
+        }
+        
+        return implementation;
+    }
+
+    public void resolve(WidgetImplementation implementation, ModelResolver resolver) throws ContributionResolveException {
+        
+        // Resolve the resource directory location
+        DeployedArtifact artifact = contributionFactory.createDeployedArtifact();
+        artifact.setURI(implementation.getLocation());
+        DeployedArtifact resolved = resolver.resolveModel(DeployedArtifact.class, artifact);
+        if (resolved.getLocation() != null) {
+            try {
+                implementation.setLocationURL(new URL(resolved.getLocation()));
+                implementation.setUnresolved(false);
+            } catch (IOException e) {
+                throw new ContributionResolveException(e);
+            }
+        }
+    }
+
+    public void write(WidgetImplementation implementation, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
+        
+        // Write <implementation.resource>
+        writer.setPrefix("widget",IMPLEMENTATION_WIDGET.getNamespaceURI());
+        writer.writeStartElement(IMPLEMENTATION_WIDGET.getNamespaceURI(), IMPLEMENTATION_WIDGET.getLocalPart());
+        writer.writeNamespace("widget",IMPLEMENTATION_WIDGET.getNamespaceURI());
+      
+        
+        if (implementation.getLocation() != null) {
+            writer.writeAttribute("location", implementation.getLocation());
+        }
+        
+        writer.writeEndElement();
+    }
+}
diff --git a/branches/sca-java-1.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetProxyHelper.java b/branches/sca-java-1.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetProxyHelper.java
new file mode 100644
index 0000000000..da37b01e1e
--- /dev/null
+++ b/branches/sca-java-1.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetProxyHelper.java
@@ -0,0 +1,44 @@
+/*
+ * 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.widget;
+
+import java.util.HashMap;
+import java.util.Map;
+
+class WidgetProxyHelper {
+    private static Map<String, String> proxyFileRegistry = new HashMap<String, String>();
+    private static Map<String, String> proxyClient = new HashMap<String, String>();
+
+    static {
+        proxyFileRegistry.put("org.apache.tuscany.sca.binding.feed.impl.AtomBindingImpl", "binding-atom.js");
+        proxyClient.put("org.apache.tuscany.sca.binding.feed.impl.AtomBindingImpl", "AtomClient");
+        
+        proxyFileRegistry.put("org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBinding", "binding-jsonrpc.js");
+        proxyClient.put("org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBinding", "JSONRpcClient");
+    }
+    
+    static String getJavaScriptProxyFile(String bindingClass) {
+        return proxyFileRegistry.get(bindingClass);
+    }
+    
+    static String getJavaScriptProxyClient(String bindingClass) {
+        return proxyClient.get(bindingClass);
+    }
+}
diff --git a/branches/sca-java-1.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java b/branches/sca-java-1.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java
new file mode 100644
index 0000000000..e336df9241
--- /dev/null
+++ b/branches/sca-java-1.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java
@@ -0,0 +1,43 @@
+/*
+ * 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.widget.provider;
+
+import java.net.URL;
+
+import org.apache.tuscany.sca.invocation.Invoker;
+import org.apache.tuscany.sca.invocation.Message;
+
+/**
+ * Implements an invoker for resource component implementations.
+ */
+class WidgetImplementationInvoker implements Invoker {
+    private URL locationURL;
+    
+    WidgetImplementationInvoker(URL locationURL) {
+        this.locationURL = locationURL;
+    }
+    
+    public Message invoke(Message msg) {
+        // Return the location URL
+        msg.setBody(locationURL);
+        return msg;
+    }
+
+}
diff --git a/branches/sca-java-1.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java b/branches/sca-java-1.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
new file mode 100644
index 0000000000..bff8c99a45
--- /dev/null
+++ b/branches/sca-java-1.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
@@ -0,0 +1,91 @@
+/*
+ * 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.widget.provider;
+
+import org.apache.tuscany.sca.assembly.Binding;
+import org.apache.tuscany.sca.assembly.ComponentService;
+import org.apache.tuscany.sca.host.http.ServletHost;
+import org.apache.tuscany.sca.implementation.widget.WidgetImplementation;
+import org.apache.tuscany.sca.implementation.widget.WidgetComponentServlet;
+import org.apache.tuscany.sca.interfacedef.Operation;
+import org.apache.tuscany.sca.invocation.Invoker;
+import org.apache.tuscany.sca.provider.ImplementationProvider;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.runtime.RuntimeComponentService;
+import org.osoa.sca.ServiceRuntimeException;
+
+
+/**
+ * The model representing a resource implementation in an SCA assembly model.
+ */
+class WidgetImplementationProvider implements ImplementationProvider {
+    private RuntimeComponent component;
+    private WidgetImplementation implementation;
+    private ServletHost servletHost;
+    private String servletMapping;
+
+    /**
+     * Constructs a new resource implementation provider.
+     */
+    WidgetImplementationProvider(RuntimeComponent component, WidgetImplementation implementation, ServletHost servletHost) {
+        this.component = component;
+        this.implementation = implementation;
+        
+        this.servletHost = servletHost;
+    }
+
+    public Invoker createInvoker(RuntimeComponentService service, Operation operation) {
+        WidgetImplementationInvoker invoker = new WidgetImplementationInvoker(implementation.getLocationURL());
+        return invoker;
+    }
+    
+    public boolean supportsOneWayInvocation() {
+        return false;
+    }
+
+    public void start() {
+
+        // Determine the widget URI
+        String widgetURI = null;
+        for (ComponentService componentService: component.getServices()) {
+            if (componentService.getName().equals("Widget")) {
+                if (componentService.getBindings().size() != 0) {
+                    widgetURI = componentService.getBindings().get(0).getURI();
+                }
+                break;
+            }
+        }
+        if (widgetURI == null) {
+            throw new ServiceRuntimeException("Could not find Widget service");
+        }
+        
+        // Register the widget's ComponentServlet under the same URI as the widget
+        String widgetArtifact = implementation.getLocation();
+        widgetArtifact = widgetArtifact.substring(0, widgetArtifact.lastIndexOf('.'));
+        widgetArtifact = widgetArtifact.substring(widgetArtifact.lastIndexOf('/') + 1);
+        servletMapping = widgetURI + "/" + widgetArtifact + ".js";
+        WidgetComponentServlet widgetComponentServlet = new WidgetComponentServlet(component, servletMapping);
+        servletHost.addServletMapping(servletMapping, widgetComponentServlet);        
+    }
+
+    public void stop() {
+        servletHost.removeServletMapping(servletMapping);
+    }
+
+}
diff --git a/branches/sca-java-1.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java b/branches/sca-java-1.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java
new file mode 100644
index 0000000000..9d1dac7751
--- /dev/null
+++ b/branches/sca-java-1.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.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.widget.provider;
+
+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.widget.WidgetImplementation;
+import org.apache.tuscany.sca.provider.ImplementationProvider;
+import org.apache.tuscany.sca.provider.ImplementationProviderFactory;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+
+/**
+ * The model representing a resource implementation in an SCA assembly model.
+ */
+public class WidgetImplementationProviderFactory implements ImplementationProviderFactory<WidgetImplementation> {
+
+    private ServletHost servletHost;
+    
+    /**
+     * Constructs a resource implementation.
+     */
+    public WidgetImplementationProviderFactory(ExtensionPointRegistry extensionPoints) {
+        ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class);
+        this.servletHost = servletHosts.getServletHosts().get(0);
+    }
+
+    public ImplementationProvider createImplementationProvider(RuntimeComponent component, WidgetImplementation implementation) {
+        return new WidgetImplementationProvider(component, implementation, servletHost);
+    }
+    
+    public Class<WidgetImplementation> getModelType() {
+        return WidgetImplementation.class;
+    }
+}
diff --git a/branches/sca-java-1.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/branches/sca-java-1.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
new file mode 100644
index 0000000000..6c167a6b31
--- /dev/null
+++ b/branches/sca-java-1.1/modules/implementation-widget/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.widget.WidgetImplementationProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#implementation.widget,model=org.apache.tuscany.sca.implementation.widget.WidgetImplementation
diff --git a/branches/sca-java-1.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory b/branches/sca-java-1.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory
new file mode 100644
index 0000000000..fc45baa16d
--- /dev/null
+++ b/branches/sca-java-1.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory
@@ -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.widget.WidgetImplementationFactory
diff --git a/branches/sca-java-1.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/branches/sca-java-1.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
new file mode 100644
index 0000000000..d0f73cbdbb
--- /dev/null
+++ b/branches/sca-java-1.1/modules/implementation-widget/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.widget.provider.WidgetImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.widget.WidgetImplementation

diff --git a/branches/sca-java-1.1/modules/implementation-widget/src/main/resources/binding-atom.js b/branches/sca-java-1.1/modules/implementation-widget/src/main/resources/binding-atom.js
new file mode 100644
index 0000000000..ce991f08f7
--- /dev/null
+++ b/branches/sca-java-1.1/modules/implementation-widget/src/main/resources/binding-atom.js
@@ -0,0 +1,135 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+	
+function AtomClient(uri) {
+
+	this.msxmlNames = [ "MSXML2.XMLHTTP.5.0",
+                        "MSXML2.XMLHTTP.4.0",
+                        "MSXML2.XMLHTTP.3.0",
+                        "MSXML2.XMLHTTP",
+                        "Microsoft.XMLHTTP" ];
+			            
+	this.uri=uri;
+	
+	this.get = function(id, responseFunction) {
+		var xhr = this.createXMLHttpRequest();
+		xhr.onreadystatechange = function() {
+			if (xhr.readyState == 4) {
+				if (xhr.status == 200) {
+				    var strDocument = xhr.responseText;
+				    var xmlDocument = xhr.responseXML;
+				    if(!xmlDocument || xmlDocument.childNodes.length==0){ 
+                        xmlDocument = (new DOMParser()).parseFromString(strDocument, "text/xml");
+                    } 
+                    if (responseFunction != null) responseFunction(xmlDocument);
+				} else {
+                    alert("get - Error getting data from the server");
+				}
+			}
+		}
+		xhr.open("GET", uri + id, true);
+		xhr.send(null);
+	}	
+	this.post = function (entry, responseFunction) {
+		var xhr = this.createXMLHttpRequest();
+		xhr.onreadystatechange = function() {
+			if (xhr.readyState == 4) {
+				if (xhr.status == 201) {
+				    var strDocument = xhr.responseText;
+				    var xmlDocument = xhr.responseXML;
+				    if(!xmlDocument || xmlDocument.childNodes.length==0){ 
+                        xmlDocument = (new DOMParser()).parseFromString(strDocument, "text/xml");
+                    } 
+					if (responseFunction != null) responseFunction(xmlDocument);
+				} else {
+					alert("post - Error getting data from the server");
+				}
+			}
+		}
+		xhr.open("POST", uri, true);
+		xhr.setRequestHeader("Content-Type", "application/atom+xml");
+		xhr.send(entry);
+	}	
+	this.put = function (id, entry, responseFunction) {
+		var xhr = this.createXMLHttpRequest();
+		xhr.onreadystatechange = function() {
+			if (xhr.readyState == 4) {
+				if (xhr.status == 200) {
+				    var strDocument = xhr.responseText;
+				    var xmlDocument = xhr.responseXML;
+				    if(!xmlDocument || xmlDocument.childNodes.length==0){ 
+                        xmlDocument = (new DOMParser()).parseFromString(strDocument, "text/xml");
+                    } 
+					if (responseFunction != null) responseFunction(xmlDocument);
+				} else {
+					alert("put - Error getting data from the server");
+				}
+			}
+		}
+		xhr.open("PUT", uri + id, true);
+		xhr.setRequestHeader("Content-Type", "application/atom+xml");
+		xhr.send(entry);
+	}	
+	this.del = function (id, responseFunction) {       
+		var xhr = this.createXMLHttpRequest();
+		xhr.onreadystatechange = function() {
+			if (xhr.readyState == 4) {
+				if (xhr.status == 200) {
+					if (responseFunction != null) responseFunction();
+				} else {
+					alert("delete - Error getting data from the server");
+				}
+			}
+		}
+		xhr.open("DELETE", uri + id, true);		
+		xhr.send(null);
+	}
+	this.createXMLHttpRequest = function () {
+        /* Mozilla XMLHttpRequest */
+        try {return new XMLHttpRequest();} catch(e) {}      
+		
+        /* Microsoft MSXML ActiveX */
+        for (var i=0;i < this.msxmlNames.length; i++) {
+            try {return new ActiveXObject(this.msxmlNames[i]);} catch (e) {}
+        }
+        alert("XML http request not supported");
+        return null;
+	}
+	if (typeof DOMParser == "undefined") {
+	   DOMParser = function () {}
+	
+	   DOMParser.prototype.parseFromString = function (str, contentType) {
+	      if (typeof ActiveXObject != "undefined") {
+	         var d = new ActiveXObject("MSXML.DomDocument");
+	         d.loadXML(str);
+	         return d;
+	      } else if (typeof XMLHttpRequest != "undefined") {
+	         var req = new XMLHttpRequest;
+	         req.open("GET", "data:" + (contentType || "application/xml") +
+	                         ";charset=utf-8," + encodeURIComponent(str), false);
+	         if (req.overrideMimeType) {
+	            req.overrideMimeType(contentType);
+	         }
+	         req.send(null);
+	         return req.responseXML;
+	      }
+      }
+   }
+}
+bindingatom = "loaded";
\ No newline at end of file
diff --git a/branches/sca-java-1.1/modules/implementation-widget/src/main/resources/binding-jsonrpc.js b/branches/sca-java-1.1/modules/implementation-widget/src/main/resources/binding-jsonrpc.js
new file mode 100644
index 0000000000..ca3c2a8605
--- /dev/null
+++ b/branches/sca-java-1.1/modules/implementation-widget/src/main/resources/binding-jsonrpc.js
@@ -0,0 +1,492 @@
+/*
+ * 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");
+};