Simplifying modules structure by merging *-js-dojo into the binding-runtime specific modules

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

3 files changed, 111 insertions, 9 deletions

diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml
index 9601c4ef05..fe30619242 100644
--- a/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml
@@ -98,6 +98,12 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-web-javascript</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>jsr311-api</artifactId>
             <version>1.1.1</version>
@@ -115,15 +121,15 @@
                 <exclusion>
                     <groupId>com.sun.xml.bind</groupId>
                     <artifactId>jaxb-impl</artifactId>
-                </exclusion>                
+                </exclusion>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-api</artifactId>
-                </exclusion>                
+                </exclusion>
                 <exclusion>
                     <groupId>javax.activation</groupId>
                     <artifactId>activation</artifactId>
-                </exclusion>                
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -139,18 +145,18 @@
                 <exclusion>
                     <groupId>com.sun.xml.bind</groupId>
                     <artifactId>jaxb-impl</artifactId>
-                </exclusion>                
+                </exclusion>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-api</artifactId>
-                </exclusion>                
+                </exclusion>
                 <exclusion>
                     <groupId>javax.activation</groupId>
                     <artifactId>activation</artifactId>
-                </exclusion>                
-            </exclusions>                        
+                </exclusion>
+            </exclusions>
         </dependency>
-        
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -164,7 +170,7 @@
             <version>1.6.1</version>
             <scope>runtime</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/js/dojo/RESTBindingJavascriptProxyFactory.java b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/js/dojo/RESTBindingJavascriptProxyFactory.java
new file mode 100644
index 0000000000..68cd6fa0e3
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/js/dojo/RESTBindingJavascriptProxyFactory.java
@@ -0,0 +1,77 @@
+/*
+ * 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.rest.js.dojo;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sca.assembly.Binding;
+import org.apache.tuscany.sca.assembly.ComponentReference;
+import org.apache.tuscany.sca.assembly.Endpoint;
+import org.apache.tuscany.sca.assembly.EndpointReference;
+import org.apache.tuscany.sca.binding.rest.RESTBinding;
+import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;
+import org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory;
+
+public class RESTBindingJavascriptProxyFactory implements JavascriptProxyFactory {
+    private static final QName NAME = RESTBinding.TYPE;
+
+    public Class<?> getModelType() {
+        return RESTBinding.class;
+    }
+
+    public QName getQName() {
+        return NAME;
+    }
+
+    public String getJavascriptProxyFile() {
+        return null;
+    }
+
+    public InputStream getJavascriptProxyFileAsStream() throws IOException {
+        return null;
+    }
+
+    public String createJavascriptHeader(ComponentReference componentReference) throws IOException {
+        return "dojo.require('tuscany.RestService');";
+    }
+
+    public String createJavascriptReference(ComponentReference componentReference) throws IOException {
+        EndpointReference epr = componentReference.getEndpointReferences().get(0);
+        Endpoint targetEndpoint = epr.getTargetEndpoint();
+        if (targetEndpoint.isUnresolved()) {
+            //force resolution and targetEndpoint binding calculations
+            //by calling the getInvocationChain
+            ((RuntimeEndpointReference) epr).getInvocationChains();
+            targetEndpoint = epr.getTargetEndpoint();
+        }
+
+        Binding binding = targetEndpoint.getBinding();
+
+        URI targetURI = URI.create(binding.getURI());
+        String targetPath = targetURI.getPath();
+
+        return "tuscany.RestService(\"" + targetPath + "\")";
+    }
+
+}
diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory
new file mode 100644
index 0000000000..4d81632bda
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory
@@ -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 Javascript Proxy Factory
+org.apache.tuscany.sca.binding.rest.js.dojo.RESTBindingJavascriptProxyFactory;qname=http://tuscany.apache.org/xmlns/sca/1.1#binding.rest,model=org.apache.tuscany.sca.binding.rest.RESTBinding
\ No newline at end of file