You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by hs...@apache.org on 2011/07/12 04:18:40 UTC
svn commit: r1145429 - in /shindig/trunk:
content/samplecontainer/examples/commoncontainer/
java/server/src/main/java/org/apache/shindig/sample/commoncontainer/auth/
java/server/src/main/webapp/WEB-INF/
Author: hsaputra
Date: Tue Jul 12 02:18:40 2011
New Revision: 1145429
URL: http://svn.apache.org/viewvc?rev=1145429&view=rev
Log:
SHINDIG-1556 | Set DefaultSecurityTokenCodec for common container example to fix OAuth gadget error with common container sample page. CR: https://reviews.apache.org/r/1067/
Removed:
shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/commoncontainer/auth/CommonContainerAuthGuiceModule.java
shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/commoncontainer/auth/CommonContainerSecurityTokenCodec.java
shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/commoncontainer/auth/TestSecurityTokenCodec.java
Modified:
shindig/trunk/content/samplecontainer/examples/commoncontainer/assembler.js
shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml
Modified: shindig/trunk/content/samplecontainer/examples/commoncontainer/assembler.js
URL: http://svn.apache.org/viewvc/shindig/trunk/content/samplecontainer/examples/commoncontainer/assembler.js?rev=1145429&r1=1145428&r2=1145429&view=diff
==============================================================================
--- shindig/trunk/content/samplecontainer/examples/commoncontainer/assembler.js (original)
+++ shindig/trunk/content/samplecontainer/examples/commoncontainer/assembler.js Tue Jul 12 02:18:40 2011
@@ -28,6 +28,10 @@ testConfig[osapi.container.ContainerConf
// Create the new CommonContainer
var CommonContainer = new osapi.container.Container(testConfig);
+// Default the security token for the container. Using this example security token requires enabling
+// the DefaultSecurityTokenCodec to let UrlParameterAuthenticationHandler create valid security token.
+shindig.auth.updateSecurityToken('john.doe:john.doe:appid:cont:url:0:default');
+
// Need to pull these from values supplied in the dialog
CommonContainer.init = function() {
//Create my new managed hub
Modified: shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml?rev=1145429&r1=1145428&r2=1145429&view=diff
==============================================================================
--- shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml (original)
+++ shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml Tue Jul 12 02:18:40 2011
@@ -38,8 +38,7 @@
org.apache.shindig.common.cache.ehcache.EhCacheModule:
org.apache.shindig.sample.shiro.ShiroGuiceModule:
org.apache.shindig.sample.container.SampleContainerGuiceModule:
- org.apache.shindig.extras.ShindigExtrasGuiceModule:
- org.apache.shindig.sample.commoncontainer.auth.CommonContainerAuthGuiceModule
+ org.apache.shindig.extras.ShindigExtrasGuiceModule
</param-value>
</context-param>