Start branch for 1.3.1, the only changes in this commit are for the version

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

10 files changed, 900 insertions, 0 deletions

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

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

+    </parent>

+

+    <artifactId>tuscany-binding-dwr</artifactId>

+    <name>Apache Tuscany SCA AJAX DWR Binding Extension</name>

+

+    <dependencies>

+

+        <dependency>

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

+            <artifactId>tuscany-extension-helper</artifactId>

+            <version>1.3.1-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

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

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

+            <version>1.3.1-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.directwebremoting</groupId>

+            <artifactId>dwr</artifactId>

+            <version>2.0.1</version>

+        </dependency>

+

+        <dependency>

+            <groupId>javax.servlet</groupId>

+            <artifactId>servlet-api</artifactId>

+            <version>2.4</version> <!-- to keep compatible with older servlet containers --> 

+            <scope>provided</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.binding.dwr</Bundle-SymbolicName>

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

+                        <Export-Package>org.apache.tuscany.sca.binding.dwr*</Export-Package>

+                    </instructions>

+                </configuration>

+            </plugin>

+        </plugins>

+    </build>

+

+</project>

diff --git a/branches/sca-java-1.3.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java b/branches/sca-java-1.3.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java
new file mode 100644
index 0000000000..ae5cf327ab
--- /dev/null
+++ b/branches/sca-java-1.3.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java
@@ -0,0 +1,31 @@
+/*
+ * 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.binding.dwr;
+
+/**
+ * The runtime representation of the <binding.dwr> SCDL
+ *
+ * @version $Rev$ $Date$
+ */
+public class DWRBinding {
+
+    // Empty as <binding.dwr> doesn't use any additional attributes or elements (yet).
+    
+}
diff --git a/branches/sca-java-1.3.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java b/branches/sca-java-1.3.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java
new file mode 100644
index 0000000000..d14751f235
--- /dev/null
+++ b/branches/sca-java-1.3.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java
@@ -0,0 +1,56 @@
+/*
+ * 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.binding.dwr;
+
+import org.apache.tuscany.sca.assembly.Binding;
+import org.apache.tuscany.sca.extension.helper.BindingActivator;
+import org.apache.tuscany.sca.extension.helper.ComponentLifecycle;
+import org.apache.tuscany.sca.extension.helper.InvokerFactory;
+import org.apache.tuscany.sca.host.http.ServletHost;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
+import org.apache.tuscany.sca.runtime.RuntimeComponentService;
+
+/**
+ * The Binding Activator for the DWR Binding.
+ *
+ * @version $Rev$ $Date$
+ */
+public class DWRBindingActivator implements BindingActivator<DWRBinding>{
+
+    private ServletHost servletHost;
+    
+    public DWRBindingActivator(ServletHost servletHost) {
+        this.servletHost = servletHost;
+    }
+
+    public Class<DWRBinding> getBindingClass() {
+        return DWRBinding.class;
+    }
+
+    public InvokerFactory createInvokerFactory(RuntimeComponent rc, RuntimeComponentReference rcr, Binding b, DWRBinding ab) {
+        return new DWRInvokerFactory(rc, rcr, b, ab, servletHost);
+    }
+
+    public ComponentLifecycle createService(RuntimeComponent rc, RuntimeComponentService rcs, Binding b, DWRBinding ab) {
+        return new DWRService(rc, rcs, b, ab, servletHost);
+    }
+
+}
diff --git a/branches/sca-java-1.3.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java b/branches/sca-java-1.3.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java
new file mode 100644
index 0000000000..24e6dbbcd4
--- /dev/null
+++ b/branches/sca-java-1.3.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java
@@ -0,0 +1,93 @@
+/*
+ * 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.binding.dwr;
+
+import java.util.Collection;
+
+import org.apache.tuscany.sca.core.invocation.MessageImpl;
+import org.apache.tuscany.sca.interfacedef.Operation;
+import org.apache.tuscany.sca.invocation.Invoker;
+import org.apache.tuscany.sca.invocation.Message;
+import org.directwebremoting.ScriptBuffer;
+import org.directwebremoting.WebContext;
+import org.directwebremoting.WebContextFactory;
+import org.directwebremoting.proxy.dwr.Util;
+
+/**
+ * The invoker for a DWR Binding.
+ *
+ * @version $Rev$ $Date$
+ */
+public class DWRInvoker implements Invoker {
+
+    private String referenceFunction;
+    
+    public DWRInvoker(String referenceName, Operation operation) {
+        this.referenceFunction = referenceName + "." + operation.getName();
+    }
+
+    public Message invoke(Message requestMsg) {
+
+        invoke((Object[])requestMsg.getBody());
+
+        // DWR references can not return anything 
+        return new MessageImpl();
+    }
+
+    public void invoke(Object[] args) {
+
+        // TODO: this only works if its the same thread as request
+        WebContext wctx = WebContextFactory.get();
+        String currentPage = wctx.getCurrentPage();
+
+        // Get a DWR Util proxy for all the browsers on the current page:
+        Collection sessions = wctx.getScriptSessionsByPage(currentPage);
+        Util utilAll = new Util(sessions);
+
+        ScriptBuffer referenceInvoke = getInvokeFragment(args, wctx);
+
+        // add the reference call to the Util proxy which will cause DWR to 
+        // asynchronously send it to be run on each active browser client
+        utilAll.addScript(referenceInvoke);
+    }
+
+    /**
+     * Creates a fragment of JavaScript code to invoke the reference function
+     * Eg: "<referenceName>.<operationName>(arg1, arg2,...);"
+     */
+    protected ScriptBuffer getInvokeFragment(Object[] args, WebContext wctx) {
+
+        ScriptBuffer sb = new ScriptBuffer();
+        sb.appendScript(referenceFunction);
+        sb.appendScript("(");
+        if (args != null) {
+            for (int i = 0; i < args.length; i++) {
+                sb.appendData(args[i]);
+                if (i < (args.length - 1)) {
+                    sb.appendScript(", ");
+                }
+            }
+        }
+        sb.appendScript(");");
+
+        return sb;
+    }
+
+}
diff --git a/branches/sca-java-1.3.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java b/branches/sca-java-1.3.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java
new file mode 100644
index 0000000000..1d073c9ecf
--- /dev/null
+++ b/branches/sca-java-1.3.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java
@@ -0,0 +1,67 @@
+/*
+ * 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.binding.dwr;
+
+import static org.apache.tuscany.sca.binding.dwr.DWRService.SERVLET_PATH;
+
+import org.apache.tuscany.sca.assembly.Binding;
+import org.apache.tuscany.sca.extension.helper.ComponentLifecycle;
+import org.apache.tuscany.sca.extension.helper.InvokerFactory;
+import org.apache.tuscany.sca.host.http.ServletHost;
+import org.apache.tuscany.sca.interfacedef.Operation;
+import org.apache.tuscany.sca.invocation.Invoker;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
+
+/**
+ * InvokerFactory for the DWRBinding.
+ *
+ * @version $Rev$ $Date$
+ */
+public class DWRInvokerFactory implements InvokerFactory, ComponentLifecycle {
+
+    private Binding binding;
+    private ServletHost servletHost;
+    
+    public DWRInvokerFactory(RuntimeComponent rc, RuntimeComponentReference rcr, Binding b, DWRBinding ab, ServletHost servletHost) {
+        this.binding = b;
+        this.servletHost = servletHost;
+    }
+
+    public Invoker createInvoker(Operation operation) {
+        return new DWRInvoker(binding.getName(), operation);
+    }
+
+    public void start() {
+
+        DWRServlet servlet = (DWRServlet) servletHost.getServletMapping(SERVLET_PATH);
+        if (servlet == null) {
+            servlet = new DWRServlet();
+            servletHost.addServletMapping(SERVLET_PATH, servlet);
+        }
+        
+        servlet.addReference(binding.getName());
+    }
+
+    public void stop() {
+        servletHost.removeServletMapping(SERVLET_PATH);
+    }
+
+}
diff --git a/branches/sca-java-1.3.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java b/branches/sca-java-1.3.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java
new file mode 100644
index 0000000000..7d5a7f1677
--- /dev/null
+++ b/branches/sca-java-1.3.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.binding.dwr;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
+import org.apache.tuscany.sca.assembly.Binding;
+import org.apache.tuscany.sca.extension.helper.ComponentLifecycle;
+import org.apache.tuscany.sca.host.http.ServletHost;
+import org.apache.tuscany.sca.interfacedef.Operation;
+import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
+import org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceUtil;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.runtime.RuntimeComponentService;
+import org.apache.tuscany.sca.runtime.RuntimeWire;
+
+/**
+ * DWR Service.
+ *
+ * @version $Rev$ $Date$
+ */
+public class DWRService implements ComponentLifecycle {
+
+    private RuntimeComponent rc;
+    private RuntimeComponentService rcs;
+    private Binding binding;
+    private ServletHost servletHost;
+    
+    static final String SERVLET_PATH = "/SCADomain/*";
+
+    public DWRService(RuntimeComponent rc, RuntimeComponentService rcs, Binding binding, DWRBinding ab, ServletHost servletHost) {
+        this.rc = rc;
+        this.rcs = rcs;
+        this.binding = binding;
+        this.servletHost = servletHost;
+    }
+
+    public void start() {
+        
+        DWRServlet servlet = (DWRServlet) servletHost.getServletMapping(SERVLET_PATH);
+        if (servlet == null) {
+            servlet = new DWRServlet();
+            servletHost.addServletMapping(SERVLET_PATH, servlet);
+        }
+        
+        // Create a Java proxy to the target service
+        Class<?> type = ((JavaInterface)rcs.getInterfaceContract().getInterface()).getJavaClass();
+        Object proxy = Proxy.newProxyInstance(type.getClassLoader(), new Class[]{type}, new InvocationHandler() {
+            public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+                RuntimeWire wire = rcs.getRuntimeWire(binding);
+                Operation op = JavaInterfaceUtil.findOperation(method, rcs.getInterfaceContract().getInterface().getOperations());
+                return wire.invoke(op, args);
+            }});
+
+        servlet.addService(binding.getName(), type, proxy);
+    }
+
+    public void stop() {
+        servletHost.removeServletMapping(SERVLET_PATH);
+    }
+
+}
diff --git a/branches/sca-java-1.3.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java b/branches/sca-java-1.3.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java
new file mode 100644
index 0000000000..3a2471d8f3
--- /dev/null
+++ b/branches/sca-java-1.3.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java
@@ -0,0 +1,247 @@
+/*
+ * 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.binding.dwr;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
+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.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.directwebremoting.Container;
+import org.directwebremoting.create.AbstractCreator;
+import org.directwebremoting.extend.CreatorManager;
+import org.directwebremoting.extend.Handler;
+import org.directwebremoting.extend.Remoter;
+import org.directwebremoting.servlet.DwrServlet;
+import org.directwebremoting.servlet.EngineHandler;
+import org.directwebremoting.servlet.PathConstants;
+import org.directwebremoting.servlet.UrlProcessor;
+
+/**
+ * Tuscany customized DWR Servlet to implement support for the DWR binding
+ * 
+ * Handles requests for SCA services and references that use <binding.dwr>,
+ * and also the HTTP GET for the Tuscany DWR system script "scaDomain.js"  
+ *
+ * @version $Rev$ $Date$
+ */
+public class DWRServlet extends DwrServlet {
+    private static final long serialVersionUID = 1L;
+
+    private transient Map<String, ServiceHolder> services;
+    private transient List<String> referenceNames;
+    private transient boolean initialized;
+    private transient Map<String, String> initParams;
+
+    private static final String SCADOMAIN_SCRIPT_PATH = "/scaDomain.js";
+
+    public DWRServlet() {
+        this.services = new HashMap<String, ServiceHolder>();
+        this.referenceNames = new ArrayList<String>();
+
+        this.initParams = new HashMap<String, String>();
+        // maybe use <binding.dwr> attributes to define the init params
+        initParams.put("activeReverseAjaxEnabled", "true");
+    }
+
+    @Override
+    public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException {
+        super.service(req, res);
+    }
+
+    /**
+     * Initialize the Servlet
+     * There is a single instance of this Servlet which is registered
+     * for multiple path mappings, but the init should only run once.
+     */
+    @Override
+    public void init(ServletConfig servletConfig) throws ServletException {
+        if (!initialized) {
+            super.init(patchConfig(servletConfig));
+            addScriptHandler();
+            initServices();
+            initialized = true;
+        }
+    }
+
+    /**
+     * Add in the handler to process the HTTP get for /sca/scaDomain.js
+     * 
+     * This wrappers the DWR Engine handler which returns the DWR engine.js script,
+     * this wrappers that handler so as to add Tuscany specific header and footer code
+     * to the DWR engine.js to define the Tuscany SCADomain control functions and
+     * functions for each SCA service and reference that use <binding.dwr>.
+     */
+    private void addScriptHandler() {
+
+        UrlProcessor urlProcessor = (UrlProcessor)getContainer().getBean(UrlProcessor.class.getName());
+
+        final EngineHandler engineHandler =
+            (EngineHandler)getContainer().getBean(PathConstants.URL_PREFIX + "/engine.js");
+
+        final Handler scaDomainScriptHandler = new Handler() {
+            public void handle(HttpServletRequest request, HttpServletResponse response) throws IOException {
+                PrintWriter out = response.getWriter();
+                out.println("/** Apache Tuscany scaDomain.js Header */");
+
+                engineHandler.handle(request, response);
+
+                tuscanyFooter(request, out);
+            }
+
+        };
+
+        // add the scaDomainScriptHandler to the urlProcessor
+        // bit of a hack, there's probably cleaner way to get it registered
+        urlProcessor.afterContainerSetup(new Container() {
+            public Object getBean(String name) {
+                return scaDomainScriptHandler;
+            }
+            public Collection getBeanNames() {
+                return Arrays.asList(new String[] {PathConstants.URL_PREFIX + SCADOMAIN_SCRIPT_PATH});
+            }
+        });
+    }
+
+    /**
+     * Adds the JavaScript defining SCADomain, its control functions,
+     * and functions for all the available SCA services and references.
+     */
+    private void tuscanyFooter(HttpServletRequest request, PrintWriter out) {
+        out.println("/** Apache Tuscany scaDomain.js Footer */");
+        out.println();
+        out.println("function scaDomain() { }");
+        out.println();
+        out.println("// SCA services");
+
+        // Use the DWR remoter to generate the JavaScipt function for each SCA service        
+        Remoter remoter = (Remoter)getContainer().getBean(Remoter.class.getName());
+
+        String path = request.getContextPath() + request.getServletPath();
+
+        for (String serviceName : services.keySet()) {
+            String serviceScript = remoter.generateInterfaceScript(serviceName, path);
+            out.println(serviceScript);
+        }
+        
+        if (referenceNames.size() > 0) {
+
+            out.println("// SCA reverse ajax control functions");
+            out.println();
+            out.println("scaDomain.open = function() { dwr.engine.setActiveReverseAjax(true); };");
+            out.println("scaDomain.close = function() { dwr.engine.setActiveReverseAjax(false); };");
+
+            out.println();
+            out.println("// SCA references");
+            out.println();
+           
+            // the JavaScript function for SCA references has an 
+            // empty impl as it uses DWR severside "push" 
+            for (String referenceName : referenceNames) {
+                out.println("function " + referenceName + "() { }");
+            }
+        }
+
+        out.println();
+        out.println("/** End of Apache Tuscany scaDomain.js */");
+        out.println();
+    }
+
+    /**
+     * Add an SCA reference to be added to the DWR runtime 
+     */
+    public void addReference(String name) {
+        referenceNames.add(name);
+    }
+
+    /**
+     * Add an SCA service to be added to the DWR runtime
+     */
+    public void addService(String name, final Class type, final Object instance) {
+        ServiceHolder holder = new ServiceHolder();
+        holder.name = name;
+        holder.type = type;
+        holder.instance = instance;
+        services.put(name, holder);
+    }
+
+    /**
+     * Defines each SCA service proxy instance to DWR 
+     */
+    private void initServices() {
+        CreatorManager creatorManager = (CreatorManager)getContainer().getBean(CreatorManager.class.getName());
+
+        for (final ServiceHolder holder : services.values()) {
+            creatorManager.addCreator(holder.name, new AbstractCreator() {
+                public Class getType() {
+                    return holder.type;
+                }
+
+                public Object getInstance() throws InstantiationException {
+                    return holder.instance;
+                }
+            });
+        }
+    }
+
+    // utility class to aid passing around services
+    private class ServiceHolder {
+        String name;
+        Class type;
+        Object instance;
+    }
+
+    /**
+     * Patch the ServletConfig to enable setting init params for DWR
+     * and so DWR can't see the Tuscany servlet's init params.
+     */
+    private ServletConfig patchConfig(final ServletConfig servletConfig) {
+        ServletConfig patchedContext = new ServletConfig() {
+            public String getInitParameter(String name) {
+                return initParams.get(name);
+            }
+            public Enumeration getInitParameterNames() {
+                return Collections.enumeration(initParams.keySet());
+            }
+            public ServletContext getServletContext() {
+                return servletConfig.getServletContext();
+            }
+            public String getServletName() {
+                return servletConfig.getServletName();
+            }
+        };
+        return patchedContext;
+    }
+
+}
diff --git a/branches/sca-java-1.3.1/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator b/branches/sca-java-1.3.1/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
new file mode 100644
index 0000000000..1a9f91fab2
--- /dev/null
+++ b/branches/sca-java-1.3.1/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
@@ -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 ExtensionActivator

+org.apache.tuscany.sca.binding.dwr.DWRBindingActivator

+