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 2012/06/05 03:01:22 UTC
svn commit: r1346202 - in /shindig/trunk: content/samplecontainer/examples/
features/src/main/javascript/features/
features/src/main/javascript/features/opensocial-0.6/
features/src/main/javascript/features/opensocial-0.7/
features/src/main/javascript/...
Author: hsaputra
Date: Tue Jun 5 01:01:21 2012
New Revision: 1346202
URL: http://svn.apache.org/viewvc?rev=1346202&view=rev
Log:
SHINDIG-1778 Remove the opensocial-0.6, opensocial-0.7, opensocial-0.8 features from Shindig trunk and add opensocial-2.0 and opensocial-2.5.
Added:
shindig/trunk/features/src/main/javascript/features/opensocial-2.0/
shindig/trunk/features/src/main/javascript/features/opensocial-2.0/feature.xml
shindig/trunk/features/src/main/javascript/features/opensocial-2.5/
shindig/trunk/features/src/main/javascript/features/opensocial-2.5/feature.xml
Removed:
shindig/trunk/content/samplecontainer/examples/getFriendsHasApp.xml
shindig/trunk/features/src/main/javascript/features/opensocial-0.6/
shindig/trunk/features/src/main/javascript/features/opensocial-0.7/
shindig/trunk/features/src/main/javascript/features/opensocial-0.8/
Modified:
shindig/trunk/content/samplecontainer/examples/SocialActivitiesWorld.xml
shindig/trunk/features/src/main/javascript/features/features.txt
shindig/trunk/java/server/src/test/resources/endtoend/cajaTest.xml
shindig/trunk/java/server/src/test/resources/endtoend/failCajaTest.xml
shindig/trunk/java/server/src/test/resources/endtoend/opensocial-templates/ost_test.xml
shindig/trunk/java/server/src/test/resources/endtoend/viewLevelElementsTest.xml
shindig/trunk/php/test/gadgets/GadgetFactoryTest.php
shindig/trunk/php/test/gadgets/GadgetHtmlRendererTest.php
shindig/trunk/php/test/gadgets/GadgetRewriterTest.php
shindig/trunk/php/test/gadgets/GadgetUrlRendererTest.php
shindig/trunk/php/test/misc/activity/activity.xml
shindig/trunk/php/test/misc/testGadget.xml
Modified: shindig/trunk/content/samplecontainer/examples/SocialActivitiesWorld.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/content/samplecontainer/examples/SocialActivitiesWorld.xml?rev=1346202&r1=1346201&r2=1346202&view=diff
==============================================================================
--- shindig/trunk/content/samplecontainer/examples/SocialActivitiesWorld.xml (original)
+++ shindig/trunk/content/samplecontainer/examples/SocialActivitiesWorld.xml Tue Jun 5 01:01:21 2012
@@ -20,7 +20,6 @@
<Module>
<ModulePrefs title="Social Activities World"
icon="http://localhost:8080/samplecontainer/examples/icon.png">
- <Require feature="opensocial-0.7"/>
<Require feature="settitle"/>
<Require feature="dynamic-height"/>
</ModulePrefs>
Modified: shindig/trunk/features/src/main/javascript/features/features.txt
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/features.txt?rev=1346202&r1=1346201&r2=1346202&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/features.txt (original)
+++ shindig/trunk/features/src/main/javascript/features/features.txt Tue Jun 5 01:01:21 2012
@@ -64,11 +64,10 @@ features/locked-domain/feature.xml
features/minimessage/feature.xml
features/oauthpopup/feature.xml
features/opensearch/feature.xml
-features/opensocial-0.6/feature.xml
-features/opensocial-0.7/feature.xml
-features/opensocial-0.8/feature.xml
features/opensocial-0.9/feature.xml
features/opensocial-1.0/feature.xml
+features/opensocial-2.0/feature.xml
+features/opensocial-2.5/feature.xml
features/opensocial-base/feature.xml
features/opensocial-current/feature.xml
features/opensocial-data-context/feature.xml
Added: shindig/trunk/features/src/main/javascript/features/opensocial-2.0/feature.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/opensocial-2.0/feature.xml?rev=1346202&view=auto
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/opensocial-2.0/feature.xml (added)
+++ shindig/trunk/features/src/main/javascript/features/opensocial-2.0/feature.xml Tue Jun 5 01:01:21 2012
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<feature>
+ <name>opensocial-2.0</name>
+ <dependency>opensocial</dependency>
+</feature>
Added: shindig/trunk/features/src/main/javascript/features/opensocial-2.5/feature.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/opensocial-2.5/feature.xml?rev=1346202&view=auto
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/opensocial-2.5/feature.xml (added)
+++ shindig/trunk/features/src/main/javascript/features/opensocial-2.5/feature.xml Tue Jun 5 01:01:21 2012
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<feature>
+ <name>opensocial-2.5</name>
+ <dependency>opensocial</dependency>
+</feature>
Modified: shindig/trunk/java/server/src/test/resources/endtoend/cajaTest.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/java/server/src/test/resources/endtoend/cajaTest.xml?rev=1346202&r1=1346201&r2=1346202&view=diff
==============================================================================
--- shindig/trunk/java/server/src/test/resources/endtoend/cajaTest.xml (original)
+++ shindig/trunk/java/server/src/test/resources/endtoend/cajaTest.xml Tue Jun 5 01:01:21 2012
@@ -20,7 +20,6 @@
<Module>
<ModulePrefs title="EndToEndTest">
<Require feature="caja" />
- <Require feature="opensocial-0.8" />
</ModulePrefs>
<Content type="html">
<![CDATA[
Modified: shindig/trunk/java/server/src/test/resources/endtoend/failCajaTest.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/java/server/src/test/resources/endtoend/failCajaTest.xml?rev=1346202&r1=1346201&r2=1346202&view=diff
==============================================================================
--- shindig/trunk/java/server/src/test/resources/endtoend/failCajaTest.xml (original)
+++ shindig/trunk/java/server/src/test/resources/endtoend/failCajaTest.xml Tue Jun 5 01:01:21 2012
@@ -19,7 +19,6 @@
-->
<Module>
<ModulePrefs title="EndToEndTest">
- <Require feature="opensocial-0.8" />
<Require feature="caja" />
</ModulePrefs>
<Content type="html">
Modified: shindig/trunk/java/server/src/test/resources/endtoend/opensocial-templates/ost_test.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/java/server/src/test/resources/endtoend/opensocial-templates/ost_test.xml?rev=1346202&r1=1346201&r2=1346202&view=diff
==============================================================================
--- shindig/trunk/java/server/src/test/resources/endtoend/opensocial-templates/ost_test.xml (original)
+++ shindig/trunk/java/server/src/test/resources/endtoend/opensocial-templates/ost_test.xml Tue Jun 5 01:01:21 2012
@@ -19,7 +19,6 @@
-->
<Module>
<ModulePrefs title="TemplatesEndToEndTest">
- <Require feature="opensocial-0.8"/>
<Require feature="opensocial-templates">
<Param name="disableAutoProcessing">true</Param>
</Require>
Modified: shindig/trunk/java/server/src/test/resources/endtoend/viewLevelElementsTest.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/java/server/src/test/resources/endtoend/viewLevelElementsTest.xml?rev=1346202&r1=1346201&r2=1346202&view=diff
==============================================================================
--- shindig/trunk/java/server/src/test/resources/endtoend/viewLevelElementsTest.xml (original)
+++ shindig/trunk/java/server/src/test/resources/endtoend/viewLevelElementsTest.xml Tue Jun 5 01:01:21 2012
@@ -20,7 +20,7 @@
<Module>
<ModulePrefs title="EndToEndTest">
<Require feature="views" />
- <Require feature="opensocial-0.8" views="blank"/>
+ <Require feature="opensocial" views="blank"/>
<Require feature="osapi">
<Param name="paramName">BAD_VALUE</Param>
</Require>
@@ -48,7 +48,7 @@
var expected = "GOOD_VALUE";
assertTrue('Should be GOOD_VALUE', expected == params["paramName"]);
assertTrue('Missing content-rewrite feature', gadgets.util.hasFeature("content-rewrite"));
- assertTrue('Should not have opensocial-0.8 loaded', !gadgets.util.hasFeature("opensocial-0.8"));
+ assertTrue('Should not have opensocial loaded', !gadgets.util.hasFeature("opensocial"));
finished();
},
Modified: shindig/trunk/php/test/gadgets/GadgetFactoryTest.php
URL: http://svn.apache.org/viewvc/shindig/trunk/php/test/gadgets/GadgetFactoryTest.php?rev=1346202&r1=1346201&r2=1346202&view=diff
==============================================================================
--- shindig/trunk/php/test/gadgets/GadgetFactoryTest.php (original)
+++ shindig/trunk/php/test/gadgets/GadgetFactoryTest.php Tue Jun 5 01:01:21 2012
@@ -48,7 +48,6 @@ class GadgetFactoryTest extends \PHPUnit
'rawxml' => '<?xml version="1.0" encoding="UTF-8" ?>
<Module>
<ModulePrefs title="title">
- <Require feature="opensocial-0.8" />
<Require feature="dynamic-height" />
<Require feature="flash" />
<Require feature="minimessage" />
@@ -75,7 +74,6 @@ class GadgetFactoryTest extends \PHPUnit
'rawxml' => '<?xml version="1.0" encoding="UTF-8" ?>
<Module>
<ModulePrefs title="title">
- <Require feature="opensocial-0.8" />
<Require feature="dynamic-height" />
<Require feature="flash" />
<Require feature="minimessage" />
@@ -101,7 +99,6 @@ class GadgetFactoryTest extends \PHPUnit
'rawxml' => '<?xml version="1.0" encoding="UTF-8" ?>
<Module>
<ModulePrefs title="title">
- <Require feature="opensocial-0.8" />
<Require feature="pubsub" views="canvas" />
<Require feature="flash" views="canvas,profile" />
<Optional feature="minimessage" />
@@ -119,7 +116,6 @@ class GadgetFactoryTest extends \PHPUnit
$gadgetFactory = new GadgetFactory($context, $this->token);
$gadget = $gadgetFactory->createGadget();
- $this->assertTrue(in_array('opensocial-0.8', $gadget->features));
$this->assertTrue(in_array('flash', $gadget->features));
$this->assertTrue(in_array('minimessage', $gadget->features));
$this->assertTrue(in_array('opensocial-data', $gadget->features));
Modified: shindig/trunk/php/test/gadgets/GadgetHtmlRendererTest.php
URL: http://svn.apache.org/viewvc/shindig/trunk/php/test/gadgets/GadgetHtmlRendererTest.php?rev=1346202&r1=1346201&r2=1346202&view=diff
==============================================================================
--- shindig/trunk/php/test/gadgets/GadgetHtmlRendererTest.php (original)
+++ shindig/trunk/php/test/gadgets/GadgetHtmlRendererTest.php Tue Jun 5 01:01:21 2012
@@ -36,7 +36,6 @@ class MockHtmlGadgetFactory extends Gadg
return '<?xml version="1.0" encoding="UTF-8" ?>
<Module>
<ModulePrefs title="title">
- <Require feature="opensocial-0.8" />
<Require feature="dynamic-height" />
<Require feature="flash" />
<Require feature="minimessage" />
Modified: shindig/trunk/php/test/gadgets/GadgetRewriterTest.php
URL: http://svn.apache.org/viewvc/shindig/trunk/php/test/gadgets/GadgetRewriterTest.php?rev=1346202&r1=1346201&r2=1346202&view=diff
==============================================================================
--- shindig/trunk/php/test/gadgets/GadgetRewriterTest.php (original)
+++ shindig/trunk/php/test/gadgets/GadgetRewriterTest.php Tue Jun 5 01:01:21 2012
@@ -33,7 +33,6 @@ class MockRewriterGadgetFactory extends
<?xml version="1.0" encoding="UTF-8" ?>
<Module>
<ModulePrefs title="title">
- <Require feature="opensocial-0.8" />
<Require feature="dynamic-height" />
</ModulePrefs>
<Content type="html" view="profile">
Modified: shindig/trunk/php/test/gadgets/GadgetUrlRendererTest.php
URL: http://svn.apache.org/viewvc/shindig/trunk/php/test/gadgets/GadgetUrlRendererTest.php?rev=1346202&r1=1346201&r2=1346202&view=diff
==============================================================================
--- shindig/trunk/php/test/gadgets/GadgetUrlRendererTest.php (original)
+++ shindig/trunk/php/test/gadgets/GadgetUrlRendererTest.php Tue Jun 5 01:01:21 2012
@@ -34,7 +34,6 @@ class MockUrlGadgetFactory extends Gadge
return '<?xml version="1.0" encoding="UTF-8" ?>
<Module>
<ModulePrefs title="title">
- <Require feature="opensocial-0.8" />
<Require feature="dynamic-height" />
</ModulePrefs>
<UserPref name="key" datatype="string" default_value="value" />
@@ -82,40 +81,6 @@ class GadgetUrlRendererTest extends \PHP
$this->assertTrue(true);
}
-// public function testGetUrl() {
-// $view = array(
-// 'href' => 'http://example.com/gadget.php',
-// );
-// $redirectUri = $this->gadgetUrlRenderer->getSubstitutedUrl($this->gadget, $view);
-// $parsedUrl = parse_url($redirectUri);
-// $queryParameters = array();
-// parse_str($parsedUrl['query'], $queryParameters);
-// $this->assertEquals('example.com', $parsedUrl['host']);
-// $this->assertEquals('/gadget.php', $parsedUrl['path']);
-// $this->assertEquals('dynamic-height:core:opensocial-0.8.js', $queryParameters['libs']);
-// $this->assertEquals('en', $queryParameters['lang']);
-// $this->assertEquals('US', $queryParameters['country']);
-// $this->assertEquals('value',$queryParameters['up_key']);
-// }
-//
-// public function testGetSubstitutedUrl() {
-// $view = array(
-// 'href' => 'http://example.com/gadget.php?foo=bar&mid=__MODULE_ID__',
-// );
-// $redirectUri = $this->gadgetUrlRenderer->getSubstitutedUrl($this->gadget, $view);
-// $parsedUrl = parse_url($redirectUri);
-// $queryParameters = array();
-// parse_str($parsedUrl['query'], $queryParameters);
-// $this->assertEquals('example.com', $parsedUrl['host']);
-// $this->assertEquals('/gadget.php', $parsedUrl['path']);
-// $this->assertEquals('dynamic-height:core:opensocial-0.8.js', $queryParameters['libs']);
-// $this->assertEquals('en', $queryParameters['lang']);
-// $this->assertEquals('US', $queryParameters['country']);
-// $this->assertEquals('bar',$queryParameters['foo']);
-// $this->assertEquals('value',$queryParameters['up_key']);
-// $this->assertEquals('0',$queryParameters['mid']);
-// }
-
/**
* Cleans up the environment after running a test.
*/
Modified: shindig/trunk/php/test/misc/activity/activity.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/php/test/misc/activity/activity.xml?rev=1346202&r1=1346201&r2=1346202&view=diff
==============================================================================
--- shindig/trunk/php/test/misc/activity/activity.xml (original)
+++ shindig/trunk/php/test/misc/activity/activity.xml Tue Jun 5 01:01:21 2012
@@ -19,7 +19,7 @@
-->
<Module>
<ModulePrefs title="ACTIVITY" author_email="lipengage@gmail.com">
- <Require feature="opensocial-0.8"></Require>
+ <Require feature="opensocial-1.0"></Require>
<Require feature="dynamic-height"></Require>
</ModulePrefs>
<Content type="html">
Modified: shindig/trunk/php/test/misc/testGadget.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/php/test/misc/testGadget.xml?rev=1346202&r1=1346201&r2=1346202&view=diff
==============================================================================
--- shindig/trunk/php/test/misc/testGadget.xml (original)
+++ shindig/trunk/php/test/misc/testGadget.xml Tue Jun 5 01:01:21 2012
@@ -31,7 +31,6 @@
<Icon>http://example.org/favicon.ico</Icon>
- <Require feature="opensocial-0.7" />
<Require feature="dynamic-height" />
<Require feature="views" />
<Require feature="tabs" />