TUSCANY-2878 - Changes to support new JavaScript Generator extension point and new generators for tuscany specific scripts and dojo toolkit

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

1 files changed, 6 insertions, 6 deletions

diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java b/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
index 8f1511f483..81341ac1d6 100644
--- a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
+++ b/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
@@ -23,7 +23,7 @@ import java.net.URI;
 import javax.servlet.Servlet;
 
 import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.core.web.JavascriptProxyFactoryExtensionPoint;
+import org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator;
 import org.apache.tuscany.sca.host.http.ServletHost;
 import org.apache.tuscany.sca.implementation.widget.WidgetImplementation;
 import org.apache.tuscany.sca.interfacedef.Operation;
@@ -42,7 +42,7 @@ class WidgetImplementationProvider implements ImplementationProvider {
     
     private RuntimeComponent component;
     
-    private JavascriptProxyFactoryExtensionPoint javascriptProxyFactories;
+    private ComponentJavaScriptGenerator javaScriptGenerator;
     private ServletHost servletHost;
     
     private String widgetLocationURL;
@@ -56,11 +56,11 @@ class WidgetImplementationProvider implements ImplementationProvider {
      */
     WidgetImplementationProvider(RuntimeComponent component, 
                                  WidgetImplementation implementation, 
-                                 JavascriptProxyFactoryExtensionPoint javascriptProxyFactories, 
+                                 ComponentJavaScriptGenerator javaScriptGenerator, 
                                  ServletHost servletHost) {
         this.component = component;
         
-        this.javascriptProxyFactories = javascriptProxyFactories;
+        this.javaScriptGenerator = javaScriptGenerator;
         this.servletHost = servletHost;
         
         widgetLocationURL = implementation.getLocationURL().toString();
@@ -71,7 +71,7 @@ class WidgetImplementationProvider implements ImplementationProvider {
     }
 
     public Invoker createInvoker(RuntimeComponentService service, Operation operation) {
-        WidgetImplementationInvoker invoker = new WidgetImplementationInvoker(component, javascriptProxyFactories, widgetName, widgetFolderURL, widgetLocationURL);
+        WidgetImplementationInvoker invoker = new WidgetImplementationInvoker(component, javaScriptGenerator, widgetName, widgetFolderURL, widgetLocationURL);
         return invoker;
     }
     
@@ -88,7 +88,7 @@ class WidgetImplementationProvider implements ImplementationProvider {
         Servlet servlet = servletHost.getServletMapping(scriptURI);
         if (servlet == null /*|| servlet instanceof HTTPGetListenerServlet*/) {
             WidgetComponentScriptServlet widgetScriptServlet;
-            widgetScriptServlet = new WidgetComponentScriptServlet(this.component, javascriptProxyFactories);
+            widgetScriptServlet = new WidgetComponentScriptServlet(this.component, javaScriptGenerator);
             servletHost.addServletMapping(scriptURI, widgetScriptServlet);
         } else {
             System.out.println(">>>Servlet::" + servlet.getClass().toString());