svn commit: r945764 - /shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java

[li...@apache.org]

Author: lindner
Date: Tue May 18 17:16:06 2010
New Revision: 945764

URL: http://svn.apache.org/viewvc?rev=945764&view=rev
Log:
Revert "add securitytoken decoder here"

This reverts commit b84436cc4f07551ae74eddfe2c6312c1fb48a947.

Modified:
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java?rev=945764&r1=945763&r2=945764&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java Tue May 18 17:16:06 2010
@@ -21,7 +21,6 @@ import com.google.common.collect.Immutab
 
 import com.google.common.collect.Maps;
 import org.apache.commons.lang.StringUtils;
-import org.apache.shindig.auth.SecurityTokenDecoder;
 import org.apache.shindig.common.JsonSerializer;
 import org.apache.shindig.common.servlet.HttpUtil;
 import org.apache.shindig.common.servlet.InjectedServlet;
@@ -67,12 +66,6 @@ public class JsServlet extends InjectedS
     this.containerConfig = containerConfig;
   }
 
-  private SecurityTokenDecoder tokenCodec;
-  @Inject
-  public void setSecurityTokenCodec(SecurityTokenDecoder tokenCodec) {
-    this.tokenCodec = tokenCodec;
-  }
-
   @Override
   protected void doGet(HttpServletRequest req, HttpServletResponse resp)
       throws IOException {
@@ -138,7 +131,8 @@ public class JsServlet extends InjectedS
     }
 
     if (context == RenderingContext.CONTAINER) {
-      // Inject container data
+      // Append some container specific things
+
       Map<String, Object> features = containerConfig.getMap(ctx.getContainer(), "gadgets.features");
       Map<String, Object> config = Maps.newHashMapWithExpectedSize(features == null ? 2 : features.size() + 2);