Added complete javadoc.

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

1 files changed, 16 insertions, 11 deletions

diff --git a/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptResource.java b/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptResource.java
index 7360a77494..675b9838ae 100644
--- a/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptResource.java
+++ b/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptResource.java
@@ -23,30 +23,34 @@ import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.SequenceInputStream;
 
-import javax.servlet.ServletContext;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.PathSegment;
-
-import org.apache.tuscany.sca.binding.comet.runtime.ServletFactory;
 
+/**
+ * Class serving the calls performed to retrieve the Javascript toolkit. 
+ */
 @Path("/")
 @Produces("text/javascript")
 public class JavascriptResource {
 
+	/**
+	 * Dependencies for the Tuscany Comet Javascript API.
+	 */
     private static final String[] DEPENDENCIES = {"/jquery-1.4.2.min.js", "/jquery.atmosphere.js",
                                                   "/jquery.json-2.2.min.js", "/cometComponentContext.js"};
 
-    @Context
-    private ServletContext sc;
-
+    /**
+     * Method called when the Javascript toolkit is requested.
+     * 
+     * @return InputStream containing the Javascript code.
+     */
     @GET
-    public InputStream getJavascript(@PathParam("file") PathSegment fileName) {
+    public InputStream getJavascript() {
+    	// add namespace for embedded libraries
         InputStream stream =
             new ByteArrayInputStream(("var " + JavascriptGenerator.JS_NAMESPACE + " = new function() {\n").getBytes());
+        // add dependencies in the specified order
         for (String dependency : DEPENDENCIES) {
             if (stream == null) {
                 stream = getClass().getResourceAsStream(dependency);
@@ -54,7 +58,8 @@ public class JavascriptResource {
                 stream = new SequenceInputStream(stream, getClass().getResourceAsStream(dependency));
             }
         }
-        String generatedJs = ((StringBuffer)sc.getAttribute(ServletFactory.JS_KEY)).toString() + "\n}";
+        // add generated proxies
+        String generatedJs = JavascriptGenerator.getJavascript().toString() + "\n}";
         return new SequenceInputStream(stream, new ByteArrayInputStream(generatedJs.getBytes()));
     }
 }