svn commit: r613041 - /incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java

[et...@apache.org]

Author: etnu
Date: Thu Jan 17 18:20:11 2008
New Revision: 613041

URL: http://svn.apache.org/viewvc?rev=613041&view=rev
Log:
Fixed a bug for type=url gadgets that was resulting in a leading colon on the libs parameter. This parameter should probably be modified to not include the base (js/) portion of the path or the file extension, or to include the fully qualified url of the js servlet. Right now this is not fully compatible with existing type=url gadgets.


Modified:
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java

Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java?rev=613041&r1=613040&r2=613041&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java Thu Jan 17 18:20:11 2008
@@ -154,7 +154,7 @@
     if (getUseCaja(req)) {
       contentFilters.add(new CajaContentFilter(uri));
     }
-    
+
     Gadget gadget = null;
     try {
       gadget = gadgetServer.processGadget(gadgetId,
@@ -204,7 +204,7 @@
     StringBuilder externJs = new StringBuilder();
     StringBuilder inlineJs = new StringBuilder();
     String externFmt = "<script src=\"%s\"></script>\n";
-    
+
     for (JsLibrary library : gadget.getJsLibraries()) {
       if (library.getType() == JsLibrary.Type.URL) {
         externJs.append(String.format(externFmt, library.getContent()));
@@ -212,16 +212,16 @@
         inlineJs.append(library.getContent()).append("\n");
       }
     }
-    
+
     if (inlineJs.length() > 0) {
       markup.append("<script><!--\n").append(inlineJs)
             .append("\n-->\n</script>");
     }
-    
+
     if (externJs.length() > 0) {
       markup.append(externJs);
     }
-    
+
     List<GadgetException> gadgetExceptions = new LinkedList<GadgetException>();
     String content = gadget.getContentData();
     for (GadgetContentFilter filter : contentFilters) {
@@ -234,7 +234,7 @@
     if (gadgetExceptions.size() > 0) {
       throw new GadgetServer.GadgetProcessException(gadgetExceptions);
     }
-    
+
     markup.append(content);
     markup.append("<script>gadgets.util.runOnLoadHandlers();</script>");
     markup.append("</body></html>");
@@ -326,7 +326,7 @@
     if (features.size() == 0) {
       buf.append("core");
     } else {
-      boolean first = false;
+      boolean first = true;
       for (String feature : features) {
         if (first) {
           first = false;
@@ -340,7 +340,7 @@
 
     return buf.toString();
   }
-  
+
   protected boolean getIgnoreCache(HttpServletRequest req) {
     String noCacheParam = req.getParameter("nocache");
     if (noCacheParam == null) {
@@ -348,7 +348,7 @@
     }
     return noCacheParam != null && noCacheParam.equals("1");
   }
-  
+
   protected boolean getUseCaja(HttpServletRequest req) {
     String cajaParam = req.getParameter(CAJA_PARAM);
     return cajaParam != null && cajaParam.equals("1");