You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by aw...@apache.org on 2009/04/16 19:26:08 UTC

svn commit: r765693 - in /incubator/shindig/trunk: config/ features/ features/src/main/javascript/features/ features/src/main/javascript/features/opensocial-current/ features/src/main/javascript/features/opensocial-rest/

Author: awiner
Date: Thu Apr 16 17:26:07 2009
New Revision: 765693

URL: http://svn.apache.org/viewvc?rev=765693&view=rev
Log:
Remove obsolete and broken JS-to-REST shim

Removed:
    incubator/shindig/trunk/features/src/main/javascript/features/opensocial-rest/
Modified:
    incubator/shindig/trunk/config/container.js
    incubator/shindig/trunk/features/pom.xml
    incubator/shindig/trunk/features/src/main/javascript/features/features.txt
    incubator/shindig/trunk/features/src/main/javascript/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=765693&r1=765692&r2=765693&view=diff
==============================================================================
--- incubator/shindig/trunk/config/container.js (original)
+++ incubator/shindig/trunk/config/container.js Thu Apr 16 17:26:07 2009
@@ -133,7 +133,6 @@
   "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" : "http://%host%/social",
     "domain" : "shindig",
     "enableCaja" : false,

Modified: incubator/shindig/trunk/features/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/pom.xml?rev=765693&r1=765692&r2=765693&view=diff
==============================================================================
--- incubator/shindig/trunk/features/pom.xml (original)
+++ incubator/shindig/trunk/features/pom.xml Thu Apr 16 17:26:07 2009
@@ -125,7 +125,6 @@
                 <source>opensocial-base/fieldtranslations.js</source>
                 <source>opensocial-base/jsonactivity.js</source>
                 <source>opensocial-base/jsonperson.js</source>
-                <source>opensocial-rest/restfulcontainer.js</source>
                 <source>opensocial-jsonrpc/jsonrpccontainer.js</source>
                 <source>osapi.activities/activities.js</source>
                 <source>osapi.appdata/appdata.js</source>

Modified: incubator/shindig/trunk/features/src/main/javascript/features/features.txt
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/main/javascript/features/features.txt?rev=765693&r1=765692&r2=765693&view=diff
==============================================================================
--- incubator/shindig/trunk/features/src/main/javascript/features/features.txt (original)
+++ incubator/shindig/trunk/features/src/main/javascript/features/features.txt Thu Apr 16 17:26:07 2009
@@ -20,7 +20,6 @@
 features/opensocial-data-context/feature.xml
 features/opensocial-jsonrpc/feature.xml
 features/opensocial-reference/feature.xml
-features/opensocial-rest/feature.xml
 features/opensocial-templates/feature.xml
 features/pubsub/feature.xml
 features/osapi/feature.xml

Modified: incubator/shindig/trunk/features/src/main/javascript/features/opensocial-current/feature.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/main/javascript/features/opensocial-current/feature.xml?rev=765693&r1=765692&r2=765693&view=diff
==============================================================================
--- incubator/shindig/trunk/features/src/main/javascript/features/opensocial-current/feature.xml (original)
+++ incubator/shindig/trunk/features/src/main/javascript/features/opensocial-current/feature.xml Thu Apr 16 17:26:07 2009
@@ -20,14 +20,12 @@
 <feature>
   <name>opensocial-0.9</name>
   <dependency>opensocial-jsonrpc</dependency>
-  <dependency>opensocial-rest</dependency>
   <!-- <dependency>caja</dependency> -->
   <!-- Must include the "caja" feature to display samplecontainer -->
   <!-- gadgets when "use caja" is checked -->
   <gadget>    
     <script>
       var requiredConfig = {
-        "impl": gadgets.config.NonEmptyStringValidator,
         "path": gadgets.config.NonEmptyStringValidator,
         "domain": gadgets.config.NonEmptyStringValidator,
         "enableCaja": gadgets.config.BooleanValidator,
@@ -40,19 +38,11 @@
           var path = configParams.path;
           path = path.replace("%host%", document.location.host);
 
-          if (configParams.impl == "rpc") {
-            ShindigContainer = function() {
-              JsonRpcContainer.call(this, path,
-              configParams.domain, configParams.supportedFields);
-            };
-            ShindigContainer.inherits(JsonRpcContainer);
-          } else {
-            ShindigContainer = function() {
-              RestfulContainer.call(this, path,
-              configParams.domain, configParams.supportedFields);
-            };
-            ShindigContainer.inherits(RestfulContainer);
-          }
+          ShindigContainer = function() {
+            JsonRpcContainer.call(this, path,
+            configParams.domain, configParams.supportedFields);
+          };
+          ShindigContainer.inherits(JsonRpcContainer);
 
           opensocial.Container.setContainer(new ShindigContainer());
       });