svn commit: r991641 - in /shindig/trunk: config/container.js php/src/gadgets/ContainerConfig.php php/test/gadgets/ContainerConfigTest.php

[li...@apache.org]

Author: lindner
Date: Wed Sep  1 18:33:52 2010
New Revision: 991641

URL: http://svn.apache.org/viewvc?rev=991641&view=rev
Log:
SHINDIG-1415 | Patch from Jesse Ciancetta |  Invalid container configuration property name is breaking OAuth 1.0a client support in Java Shindig

Modified:
    shindig/trunk/config/container.js
    shindig/trunk/php/src/gadgets/ContainerConfig.php
    shindig/trunk/php/test/gadgets/ContainerConfigTest.php

Modified: shindig/trunk/config/container.js
URL: http://svn.apache.org/viewvc/shindig/trunk/config/container.js?rev=991641&r1=991640&r2=991641&view=diff
==============================================================================
--- shindig/trunk/config/container.js (original)
+++ shindig/trunk/config/container.js Wed Sep  1 18:33:52 2010
@@ -87,7 +87,7 @@
 	
 	
 // Callback URL.  Scheme relative URL for easy switch between https/http.
-"gadgets.oauthGadgetCallbackTemplate" : "//%host%/gadgets/oauthcallback",
+"gadgets.uri.oauth.callbackTemplate" : "//%host%/gadgets/oauthcallback",
 
 // Use an insecure security token by default
 "gadgets.securityTokenType" : "insecure",

Modified: shindig/trunk/php/src/gadgets/ContainerConfig.php
URL: http://svn.apache.org/viewvc/shindig/trunk/php/src/gadgets/ContainerConfig.php?rev=991641&r1=991640&r2=991641&view=diff
==============================================================================
--- shindig/trunk/php/src/gadgets/ContainerConfig.php (original)
+++ shindig/trunk/php/src/gadgets/ContainerConfig.php Wed Sep  1 18:33:52 2010
@@ -67,7 +67,7 @@ class ContainerConfig {
     // remove /* */ style comments
     $str = preg_replace('@/\\*.*?\\*/@s', '', $str);
     // remove // style comments, but keep 'http://' 'https://' and '"//'
-    // for example: "gadgets.oauthGadgetCallbackTemplate" : "//%host%/gadgets/oauthcallback"
+    // for example: "gadgets.uri.oauth.callbackTemplate" : "//%host%/gadgets/oauthcallback"
     $str = preg_replace('/(?<!http:|https:|")\/\/.*$/m', '', $str);
     return $str;
   }

Modified: shindig/trunk/php/test/gadgets/ContainerConfigTest.php
URL: http://svn.apache.org/viewvc/shindig/trunk/php/test/gadgets/ContainerConfigTest.php?rev=991641&r1=991640&r2=991641&view=diff
==============================================================================
--- shindig/trunk/php/test/gadgets/ContainerConfigTest.php (original)
+++ shindig/trunk/php/test/gadgets/ContainerConfigTest.php Wed Sep  1 18:33:52 2010
@@ -66,7 +66,7 @@ class ContainerConfigTest extends PHPUni
 "gadgets.lockedDomainSuffix" : "-a.example.com:8080",
 "gadgets.iframeBaseUri" : "/gadgets/ifr",
 "gadgets.jsUriTemplate" : "http://%host%/gadgets/js/%js%",
-"gadgets.oauthGadgetCallbackTemplate" : "//%host%/gadgets/oauthcallback"
+"gadgets.uri.oauth.callbackTemplate" : "//%host%/gadgets/oauthcallback"
 }
 EOD;
     $containerConfig = new ContainerConfig(Config::get('container_path'));
@@ -78,6 +78,6 @@ EOD;
     $this->assertEquals("-a.example.com:8080", $jsonObj["gadgets.lockedDomainSuffix"]);
     $this->assertEquals("/gadgets/ifr", $jsonObj["gadgets.iframeBaseUri"]);
     $this->assertEquals("http://%host%/gadgets/js/%js%", $jsonObj["gadgets.jsUriTemplate"]);
-    $this->assertEquals("//%host%/gadgets/oauthcallback", $jsonObj["gadgets.oauthGadgetCallbackTemplate"]);
+    $this->assertEquals("//%host%/gadgets/oauthcallback", $jsonObj["gadgets.uri.oauth.callbackTemplate"]);
   }
 }