1 files changed, 9 insertions, 12 deletions

diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptServlet.java b/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptServlet.java
index 819159d553..45cb86bf4d 100644
--- a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptServlet.java
+++ b/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptServlet.java
@@ -20,17 +20,16 @@
 package org.apache.tuscany.sca.implementation.widget.provider;
 
 import java.io.IOException;
-import java.net.URISyntaxException;
+import java.io.PrintWriter;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
 
-import org.apache.tuscany.sca.core.web.JavascriptProxyFactoryExtensionPoint;
-
 
 /**
  * Servlet to handle requests for the widget component .js script.
@@ -40,7 +39,7 @@ import org.apache.tuscany.sca.core.web.JavascriptProxyFactoryExtensionPoint;
 public class WidgetComponentScriptServlet extends HttpServlet {
     private static final long serialVersionUID = 2454705532282398190L;
     
-    private transient JavascriptProxyFactoryExtensionPoint javascriptProxyFactories;
+    private transient ComponentJavaScriptGenerator javaScriptgenerator;
     private transient RuntimeComponent component;
     
     
@@ -48,18 +47,16 @@ public class WidgetComponentScriptServlet extends HttpServlet {
      * Constructor receiving the runtimeComponent reference that is going to be used to generate the widget client js
      * @param component
      */
-    public WidgetComponentScriptServlet(RuntimeComponent component, JavascriptProxyFactoryExtensionPoint javascriptProxyFactories) {
+    public WidgetComponentScriptServlet(RuntimeComponent component, ComponentJavaScriptGenerator javaScriptgenerator) {
         this.component = component;
-        this.javascriptProxyFactories = javascriptProxyFactories;
+        this.javaScriptgenerator = javaScriptgenerator;
     }
     
     @Override
     public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
-        try {
-            ServletOutputStream os = response.getOutputStream();
-            WidgetComponentScriptGenerator.generateWidgetCode(component, javascriptProxyFactories, os);
-        }catch(URISyntaxException e) {
-            throw new IOException("Invalid uri creating JavaScript resource");
-        }
+        ServletOutputStream os = response.getOutputStream();
+        PrintWriter pw = new PrintWriter(os);
+
+        javaScriptgenerator.generateJavaScriptCode(component, pw);
     }
 }