You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/05/18 18:57:54 UTC
svn commit: r945754 -
/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
Author: lindner
Date: Tue May 18 16:57:54 2010
New Revision: 945754
URL: http://svn.apache.org/viewvc?rev=945754&view=rev
Log:
add securitytoken decoder here
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=945754&r1=945753&r2=945754&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 16:57:54 2010
@@ -21,6 +21,7 @@ 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;
@@ -66,6 +67,12 @@ 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 {
@@ -131,8 +138,7 @@ public class JsServlet extends InjectedS
}
if (context == RenderingContext.CONTAINER) {
- // Append some container specific things
-
+ // Inject container data
Map<String, Object> features = containerConfig.getMap(ctx.getContainer(), "gadgets.features");
Map<String, Object> config = Maps.newHashMapWithExpectedSize(features == null ? 2 : features.size() + 2);