Author: awiner
Date: Wed Aug 5 16:36:01 2009
New Revision: 801287
URL: http://svn.apache.org/viewvc?rev=801287&view=rev
Log:
SHINDIG-1145: opensocial-0.9 feature is broken
- Introduce an "opensocial" feature; make opensocial-0.9 depend on it trivially
- Move config from "opensocial-0.8" to "opensocial", so it'll be picked up
whatever version of opensocial is used
- Update end-to-end tests to refer to opensocial-0.9
- NOTE: this requires all clients of Shindig to update their config to update
"opensocial" instead of "opensocial-0.8"
Added:
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-0.9/
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-0.9/feature.xml
(with props)
Modified:
incubator/shindig/trunk/config/container.js
incubator/shindig/trunk/features/src/main/javascript/features/features.txt
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-current/feature.xml
incubator/shindig/trunk/java/server/src/test/resources/endtoend/errorTest.xml
incubator/shindig/trunk/java/server/src/test/resources/endtoend/fetchPeopleTest.xml
incubator/shindig/trunk/java/server/src/test/resources/endtoend/fetchPersonTest.xml
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
incubator/shindig/trunk/php/test/gadgets/ContainerConfigTest.php
Modified: incubator/shindig/trunk/config/container.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/config/container.js?rev=801287&r1=801286&r2=801287&view=diff
==============================================================================
--- incubator/shindig/trunk/config/container.js (original)
+++ incubator/shindig/trunk/config/container.js Wed Aug 5 16:36:01 2009
@@ -133,7 +133,7 @@
"ANCHOR_COLOR": ""
}
},
- "opensocial-0.8" : {
+ "opensocial" : {
// Path to fetch opensocial data from
// Must be on the same domain as the gadget rendering server
"path" : "http://%host%/social/rpc";,
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=801287&r1=801286&r2=801287&view=diff
==============================================================================
--- incubator/shindig/trunk/features/src/main/javascript/features/features.txt
(original)
+++ incubator/shindig/trunk/features/src/main/javascript/features/features.txt
Wed Aug 5 16:36:01 2009
@@ -34,6 +34,7 @@
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-base/feature.xml
features/opensocial-current/feature.xml
features/opensocial-data-context/feature.xml
Added:
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-0.9/feature.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/main/javascript/features/opensocial-0.9/feature.xml?rev=801287&view=auto
==============================================================================
---
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-0.9/feature.xml
(added)
+++
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-0.9/feature.xml
Wed Aug 5 16:36:01 2009
@@ -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-0.9</name>
+ <dependency>opensocial</dependency>
+</feature>
Propchange:
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-0.9/feature.xml
------------------------------------------------------------------------------
svn:eol-style = native
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=801287&r1=801286&r2=801287&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
Wed Aug 5 16:36:01 2009
@@ -18,7 +18,7 @@
under the License.
-->
<feature>
- <name>opensocial-0.9</name>
+ <name>opensocial</name>
<dependency>opensocial-jsonrpc</dependency>
<!-- <dependency>caja</dependency> -->
<!-- Must include the "caja" feature to display samplecontainer -->
@@ -27,15 +27,16 @@
<script>
var requiredConfig = {
"path": gadgets.config.NonEmptyStringValidator,
+ "invalidatePath": gadgets.config.NonEmptyStringValidator,
"domain": gadgets.config.NonEmptyStringValidator,
"enableCaja": gadgets.config.BooleanValidator,
"supportedFields": gadgets.config.ExistsValidator
};
- gadgets.config.register("opensocial-0.8", requiredConfig,
+ gadgets.config.register("opensocial", requiredConfig,
function(config) {
ShindigContainer = function() {
- JsonRpcContainer.call(this, config["opensocial-0.8"]);
+ JsonRpcContainer.call(this, config["opensocial"]);
};
ShindigContainer.inherits(JsonRpcContainer);
Modified:
incubator/shindig/trunk/java/server/src/test/resources/endtoend/errorTest.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/test/resources/endtoend/errorTest.xml?rev=801287&r1=801286&r2=801287&view=diff
==============================================================================
---
incubator/shindig/trunk/java/server/src/test/resources/endtoend/errorTest.xml
(original)
+++
incubator/shindig/trunk/java/server/src/test/resources/endtoend/errorTest.xml
Wed Aug 5 16:36:01 2009
@@ -19,7 +19,7 @@
-->
<Module>
<ModulePrefs title="EndToEndTest">
- <Require feature="opensocial-0.8" />
+ <Require feature="opensocial-0.9" />
<Require feature="views" />
<Optional feature="content-rewrite">
<Param name="exclude-urls">.*</Param>
Modified:
incubator/shindig/trunk/java/server/src/test/resources/endtoend/fetchPeopleTest.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/test/resources/endtoend/fetchPeopleTest.xml?rev=801287&r1=801286&r2=801287&view=diff
==============================================================================
---
incubator/shindig/trunk/java/server/src/test/resources/endtoend/fetchPeopleTest.xml
(original)
+++
incubator/shindig/trunk/java/server/src/test/resources/endtoend/fetchPeopleTest.xml
Wed Aug 5 16:36:01 2009
@@ -19,7 +19,7 @@
-->
<Module>
<ModulePrefs title="EndToEndTest">
- <Require feature="opensocial-0.8"/>
+ <Require feature="opensocial-0.9"/>
<Require feature="views"/>
<Optional feature="content-rewrite">
<Param name="exclude-urls">.*</Param>
Modified:
incubator/shindig/trunk/java/server/src/test/resources/endtoend/fetchPersonTest.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/test/resources/endtoend/fetchPersonTest.xml?rev=801287&r1=801286&r2=801287&view=diff
==============================================================================
---
incubator/shindig/trunk/java/server/src/test/resources/endtoend/fetchPersonTest.xml
(original)
+++
incubator/shindig/trunk/java/server/src/test/resources/endtoend/fetchPersonTest.xml
Wed Aug 5 16:36:01 2009
@@ -19,7 +19,7 @@
-->
<Module>
<ModulePrefs title="EndToEndTest">
- <Require feature="opensocial-0.8" />
+ <Require feature="opensocial-0.9" />
<Require feature="views" />
<Optional feature="content-rewrite">
<Param name="exclude-urls">.*</Param>
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java?rev=801287&r1=801286&r2=801287&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java
Wed Aug 5 16:36:01 2009
@@ -144,7 +144,7 @@
// TODO: Would be nice if name in config matched name of service.
String container = firstNonNull(request.getToken().getContainer(),
ContainerConfig.DEFAULT_CONTAINER);
return config.getList(container,
-
"${Cur['gadgets.features']['opensocial-0.8'].supportedFields.activity}");
+ "${Cur['gadgets.features'].opensocial.supportedFields.activity}");
}
private static <T> T firstNonNull(T first, T second) {
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java?rev=801287&r1=801286&r2=801287&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java
Wed Aug 5 16:36:01 2009
@@ -114,7 +114,7 @@
// TODO: Would be nice if name in config matched name of service.
String container = firstNonNull(request.getToken().getContainer(),
"default");
return config.getList(container,
- "${Cur['gadgets.features']['opensocial-0.8'].supportedFields.person}");
+ "${Cur['gadgets.features'].opensocial.supportedFields.person}");
}
private static <T> T firstNonNull(T first, T second) {
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java?rev=801287&r1=801286&r2=801287&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java
Wed Aug 5 16:36:01 2009
@@ -77,7 +77,7 @@
activityService = mock(ActivityService.class);
JSONObject config = new JSONObject("{" +
ContainerConfig.DEFAULT_CONTAINER + ":" +
- "{'gadgets.features':{'opensocial-0.8':" +
+ "{'gadgets.features':{opensocial:" +
"{supportedFields: {activity: ['id', 'title']}}" +
"}}}");
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java?rev=801287&r1=801286&r2=801287&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
Wed Aug 5 16:36:01 2009
@@ -86,7 +86,7 @@
converter = mock(BeanJsonConverter.class);
personService = mock(PersonService.class);
JSONObject config = new JSONObject("{" +
ContainerConfig.DEFAULT_CONTAINER + ":" +
- "{'gadgets.features':{'opensocial-0.8':" +
+ "{'gadgets.features':{opensocial:" +
"{supportedFields: {person: ['id', {name: 'familyName'}]}}" +
"}}}");
Modified: incubator/shindig/trunk/php/test/gadgets/ContainerConfigTest.php
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/test/gadgets/ContainerConfigTest.php?rev=801287&r1=801286&r2=801287&view=diff
==============================================================================
--- incubator/shindig/trunk/php/test/gadgets/ContainerConfigTest.php (original)
+++ incubator/shindig/trunk/php/test/gadgets/ContainerConfigTest.php Wed Aug 5
16:36:01 2009
@@ -47,8 +47,8 @@
$this->assertArrayHasKey('views', $config);
$this->assertArrayHasKey('rpc', $config);
$this->assertArrayHasKey('skins', $config);
- $this->assertArrayHasKey('opensocial-0.8', $config);
- $this->assertArrayHasKey('path', $config['opensocial-0.8']);
+ $this->assertArrayHasKey('opensocial', $config);
+ $this->assertArrayHasKey('path', $config['opensocial']);
}
/**
