Author: doll
Date: Fri Jul 18 09:26:56 2008
New Revision: 677964
URL: http://svn.apache.org/viewvc?rev=677964&view=rev
Log:
Deleted the useRestful config param because weno longer support the old wire
format on the main trunk.
Because of this change, I also deleted jsoncontainer and batchrequest two newly
unused js files.
Removed:
incubator/shindig/trunk/features/opensocial-current/batchrequest.js
incubator/shindig/trunk/features/opensocial-current/batchrequesttest.js
incubator/shindig/trunk/features/opensocial-current/jsoncontainer.js
Modified:
incubator/shindig/trunk/config/container.js
incubator/shindig/trunk/features/opensocial-current/feature.xml
incubator/shindig/trunk/features/pom.xml
incubator/shindig/trunk/java/server/src/test/resources/endtoend/testframework.js
Modified: incubator/shindig/trunk/config/container.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/config/container.js?rev=677964&r1=677963&r2=677964&view=diff
==============================================================================
--- incubator/shindig/trunk/config/container.js (original)
+++ incubator/shindig/trunk/config/container.js Fri Jul 18 09:26:56 2008
@@ -104,12 +104,7 @@
"supportedFields" : {
"person" : ["id", "name", "thumbnailUrl", "profileUrl"],
"activity" : ["id", "title"]
- },
- // If true, the restful wire format will be used.
- // Otherwise, uses the json wire format.
- // If you are using the default Shindig setup and want to use rest, don't
- // forget to change the "path" config to /social/rest
- "useRestful" : true
+ }
}
}}
Modified: incubator/shindig/trunk/features/opensocial-current/feature.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-current/feature.xml?rev=677964&r1=677963&r2=677964&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-current/feature.xml (original)
+++ incubator/shindig/trunk/features/opensocial-current/feature.xml Fri Jul 18
09:26:56 2008
@@ -26,16 +26,13 @@
<gadget>
<script src="jsonperson.js"></script>
<script src="jsonactivity.js"></script>
- <script src="jsoncontainer.js"></script>
- <script src="batchrequest.js"></script>
<script src="restfulcontainer.js"></script>
<script>
var requiredConfig = {
"path": gadgets.config.NonEmptyStringValidator,
"domain": gadgets.config.NonEmptyStringValidator,
"enableCaja": gadgets.config.BooleanValidator,
- "supportedFields": gadgets.config.ExistsValidator,
- "useRestful": gadgets.config.BooleanValidator
+ "supportedFields": gadgets.config.ExistsValidator
};
gadgets.config.register("opensocial-0.8", requiredConfig,
@@ -43,22 +40,12 @@
var configParams = config["opensocial-0.8"];
ShindigContainer = function() {
- JsonContainer.call(this, configParams.path,
- configParams.domain, configParams.supportedFields);
- };
- ShindigContainer.inherits(JsonContainer);
-
- RestfulShindigContainer = function() {
RestfulContainer.call(this, configParams.path,
configParams.domain, configParams.supportedFields);
};
- RestfulShindigContainer.inherits(RestfulContainer);
+ ShindigContainer.inherits(RestfulContainer);
- if (configParams.useRestful) {
- opensocial.Container.setContainer(new RestfulShindigContainer());
- } else {
- opensocial.Container.setContainer(new ShindigContainer());
- }
+ opensocial.Container.setContainer(new ShindigContainer());
if (window['caja']) {
opensocial.Container.get().enableCaja();
Modified: incubator/shindig/trunk/features/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/pom.xml?rev=677964&r1=677963&r2=677964&view=diff
==============================================================================
--- incubator/shindig/trunk/features/pom.xml (original)
+++ incubator/shindig/trunk/features/pom.xml Fri Jul 18 09:26:56 2008
@@ -115,10 +115,9 @@
<source>opensocial-reference/phone.js</source>
<source>opensocial-reference/responseitem.js</source>
<source>opensocial-reference/url.js</source>
- <source>opensocial-current/batchrequest.js</source>
<source>opensocial-current/jsonactivity.js</source>
<source>opensocial-current/jsonperson.js</source>
- <source>opensocial-current/jsoncontainer.js</source>
+ <source>opensocial-current/restfulcontainer.js</source>
</sources>
<testSourceDirectory>${basedir}</testSourceDirectory>
<testSuites>
Modified:
incubator/shindig/trunk/java/server/src/test/resources/endtoend/testframework.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/test/resources/endtoend/testframework.js?rev=677964&r1=677963&r2=677964&view=diff
==============================================================================
---
incubator/shindig/trunk/java/server/src/test/resources/endtoend/testframework.js
(original)
+++
incubator/shindig/trunk/java/server/src/test/resources/endtoend/testframework.js
Fri Jul 18 09:26:56 2008
@@ -47,10 +47,6 @@
/** Executes the test identifed by the testMethod URL parameter */
function executeTest() {
- // Force the installation of the Restful container
- // TODO: delete this hack if restful is flipped on by default
- opensocial.Container.setContainer(new RestfulShindigContainer());
-
var params = gadgets.util.getUrlParameters();
var testMethod = params["testMethod"];
if (!testMethod) {
