Author: mfranklin
Date: Sat Apr 14 02:58:25 2012
New Revision: 1326051
URL: http://svn.apache.org/viewvc?rev=1326051&view=rev
Log:
Upgraded to Shindig 2.5 Beta 1 (Fixes RAVE-560)
Modified:
rave/trunk/pom.xml
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/repository/impl/ShindigGadgetMetadataRepository.java
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/repository/ShindigGadgetMetadataRepositoryTest.java
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultPersonService.java
Modified: rave/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/pom.xml?rev=1326051&r1=1326050&r2=1326051&view=diff
==============================================================================
--- rave/trunk/pom.xml (original)
+++ rave/trunk/pom.xml Sat Apr 14 02:58:25 2012
@@ -44,7 +44,7 @@
</scm>
<properties>
- <apache.shindig.version>3.0.0-beta4</apache.shindig.version>
+ <apache.shindig.version>2.5.0-beta1</apache.shindig.version>
<apache.wookie.version>0.9.2-incubating</apache.wookie.version>
<org.springframework.version>3.1.0.RELEASE</org.springframework.version>
<org.springframework.mobile.version>1.0.0.M3</org.springframework.mobile.version>
Modified:
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/repository/impl/ShindigGadgetMetadataRepository.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/repository/impl/ShindigGadgetMetadataRepository.java?rev=1326051&r1=1326050&r2=1326051&view=diff
==============================================================================
---
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/repository/impl/ShindigGadgetMetadataRepository.java
(original)
+++
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/repository/impl/ShindigGadgetMetadataRepository.java
Sat Apr 14 02:58:25 2012
@@ -64,10 +64,8 @@ public class ShindigGadgetMetadataReposi
.put("id", "gadgets.metadata")
.put("params", new JSONObject()
.put("container", "default")
-
.append("ids", gadgetUrl)
-
- .append("fields", "iframeUrl")
+ .append("fields", "iframeUrls")
.append("fields", "modulePrefs.*")
.append("fields", "needsTokenRefresh")
.append("fields", "userPrefs.*")
@@ -75,7 +73,6 @@ public class ShindigGadgetMetadataReposi
.append("fields", "views.preferredWidth")
.append("fields", "expireTimeMs")
.append("fields", "responseTimeMs")
-
.put("userId", "@viewer")
.put("groupId", "@self")
);
Modified:
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/repository/ShindigGadgetMetadataRepositoryTest.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/repository/ShindigGadgetMetadataRepositoryTest.java?rev=1326051&r1=1326050&r2=1326051&view=diff
==============================================================================
---
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/repository/ShindigGadgetMetadataRepositoryTest.java
(original)
+++
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/repository/ShindigGadgetMetadataRepositoryTest.java
Sat Apr 14 02:58:25 2012
@@ -51,7 +51,7 @@ public class ShindigGadgetMetadataReposi
private static final String VALID_SHINDIG_METADATA_RPC_REQUEST =
"[{\"id\":\"gadgets.metadata\"," +
"\"method\":\"gadgets.metadata\",\"params\":{\"groupId\":\"@self\"," +
"\"ids\":[\"http://www.example.com/gadget.xml\"],\"container\":\"default\",\"userId\":\"@viewer\",";
+
-
"\"fields\":[\"iframeUrl\",\"modulePrefs.*\",\"needsTokenRefresh\",\"userPrefs.*\",\"views.preferredHeight\","
+
+
"\"fields\":[\"iframeUrls\",\"modulePrefs.*\",\"needsTokenRefresh\",\"userPrefs.*\",\"views.preferredHeight\","
+
"\"views.preferredWidth\",\"expireTimeMs\",\"responseTimeMs\"]}}]";
private static final String VALID_METADATA =
"[{\"id\":\"gadgets.metadata\",\"result\"" +
":{\"http://www.example.com/gadget.xml\":{\"data-snipped\":\"here-for-brevity\",\"userPrefs\":{\"age\":{\"dataType\":\"STRING\",\"default\":\"0\",\"displayName\":\"Age\"}}
}}}]";
Modified:
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultPersonService.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultPersonService.java?rev=1326051&r1=1326050&r2=1326051&view=diff
==============================================================================
---
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultPersonService.java
(original)
+++
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultPersonService.java
Sat Apr 14 02:58:25 2012
@@ -71,6 +71,11 @@ public class DefaultPersonService implem
}
@Override
+ public Future<Person> updatePerson(UserId id, Person person, SecurityToken
token) throws ProtocolException {
+ throw new ProtocolException(HttpServletResponse.SC_NOT_IMPLEMENTED,
"Not Implemented");
+ }
+
+ @Override
public List<org.apache.rave.portal.model.Person> getPeople(Set<UserId>
userIds, GroupId groupId,
CollectionOptions collectionOptions,
SecurityToken token) {
