You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by lr...@apache.org on 2008/08/22 18:38:38 UTC
svn commit: r688114 - in /incubator/shindig/trunk: config/container.js
features/opensocial-current/feature.xml
Author: lryan
Date: Fri Aug 22 09:38:38 2008
New Revision: 688114
URL: http://svn.apache.org/viewvc?rev=688114&view=rev
Log:
Inroduce container config flag to control which JS API implementation to use. Options are "rest" and "rpc". See config/container.js for impl.
PHP folks will need to load a modified version of this file and set "rest" as the option in the interim.
Modified:
incubator/shindig/trunk/config/container.js
incubator/shindig/trunk/features/opensocial-current/feature.xml
Modified: incubator/shindig/trunk/config/container.js
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/config/container.js?rev=688114&r1=688113&r2=688114&view=diff
==============================================================================
--- incubator/shindig/trunk/config/container.js (original)
+++ incubator/shindig/trunk/config/container.js Fri Aug 22 09:38:38 2008
@@ -109,6 +109,7 @@
"opensocial-0.8" : {
// Path to fetch opensocial data from
// Must be on the same domain as the gadget rendering server
+ "impl" : "rpc", //Use "rpc" to enable JSON-RPC, "rest' for REST
"path" : "/social",
"domain" : "shindig",
"enableCaja" : false,
Modified: incubator/shindig/trunk/features/opensocial-current/feature.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-current/feature.xml?rev=688114&r1=688113&r2=688114&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-current/feature.xml (original)
+++ incubator/shindig/trunk/features/opensocial-current/feature.xml Fri Aug 22 09:38:38 2008
@@ -25,10 +25,11 @@
<!-- gadgets when "use caja" is checked -->
<gadget>
<script src="jsonperson.js"></script>
- <!--
<script src="restfulcontainer.js"></script>
+ <script src="jsonrpccontainer.js"></script>
<script>
var requiredConfig = {
+ "impl": gadgets.config.NonEmptyStringValidator,
"path": gadgets.config.NonEmptyStringValidator,
"domain": gadgets.config.NonEmptyStringValidator,
"enableCaja": gadgets.config.BooleanValidator,
@@ -39,39 +40,19 @@
function(config) {
var configParams = config["opensocial-0.8"];
- ShindigContainer = function() {
- RestfulContainer.call(this, configParams.path,
- configParams.domain, configParams.supportedFields);
- };
- ShindigContainer.inherits(RestfulContainer);
-
- opensocial.Container.setContainer(new ShindigContainer());
-
- if (window['caja']) {
- opensocial.Container.get().enableCaja();
+ if (configParams.impl == "rpc") {
+ ShindigContainer = function() {
+ JsonRpcContainer.call(this, configParams.path,
+ configParams.domain, configParams.supportedFields);
+ };
+ ShindigContainer.inherits(JsonRpcContainer);
+ } else {
+ ShindigContainer = function() {
+ RestfulContainer.call(this, configParams.path,
+ configParams.domain, configParams.supportedFields);
+ };
+ ShindigContainer.inherits(RestfulContainer);
}
- });
-
- </script>
- -->
- <script src="jsonrpccontainer.js" inline="false"></script>
- <script>
- var requiredConfig = {
- "path": gadgets.config.NonEmptyStringValidator,
- "domain": gadgets.config.NonEmptyStringValidator,
- "enableCaja": gadgets.config.BooleanValidator,
- "supportedFields": gadgets.config.ExistsValidator
- };
-
- gadgets.config.register("opensocial-0.8", requiredConfig,
- function(config) {
- var configParams = config["opensocial-0.8"];
-
- ShindigContainer = function() {
- JsonRpcContainer.call(this, configParams.path,
- configParams.domain, configParams.supportedFields);
- };
- ShindigContainer.inherits(JsonRpcContainer);
opensocial.Container.setContainer(new ShindigContainer());