You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by wo...@apache.org on 2011/04/14 20:13:56 UTC
svn commit: r1092425 - in /shindig/trunk: content/sampledata/
java/social-api/src/main/java/org/apache/shindig/social/core/model/
java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/
java/social-api/src/main/java/org/apache/shindi...
Author: woodser
Date: Thu Apr 14 18:13:55 2011
New Revision: 1092425
URL: http://svn.apache.org/viewvc?rev=1092425&view=rev
Log:
Committing Ryan Baxter's patch: https://issues.apache.org/jira/browse/SHINDIG-1524
Adds support for an 'opensocial' namespace within ActivtyStreams.
Added:
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/OpenSocialImpl.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/OpenSocial.java
Modified:
shindig/trunk/content/sampledata/canonicaldb.json
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/ActivityEntryImpl.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ActivityEntry.java
shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonGroup.json
shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonId.json
shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonIds.json
shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonUpdated.json
Modified: shindig/trunk/content/sampledata/canonicaldb.json
URL: http://svn.apache.org/viewvc/shindig/trunk/content/sampledata/canonicaldb.json?rev=1092425&r1=1092424&r2=1092425&view=diff
==============================================================================
--- shindig/trunk/content/sampledata/canonicaldb.json (original)
+++ shindig/trunk/content/sampledata/canonicaldb.json Thu Apr 14 18:13:55 2011
@@ -400,7 +400,8 @@
"height": 250
},
"displayName": "John Doe"
- }
+ },
+ "openSocial" : {}
}, {
"title": "Super simple ActivityEntry",
"actor": {
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/ActivityEntryImpl.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/ActivityEntryImpl.java?rev=1092425&r1=1092424&r2=1092425&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/ActivityEntryImpl.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/ActivityEntryImpl.java Thu Apr 14 18:13:55 2011
@@ -21,6 +21,7 @@ package org.apache.shindig.social.core.m
import org.apache.shindig.social.opensocial.model.ActivityEntry;
import org.apache.shindig.social.opensocial.model.ActivityObject;
import org.apache.shindig.social.opensocial.model.MediaLink;
+import org.apache.shindig.social.opensocial.model.OpenSocial;
/**
* A simple bean implementation of an ActivityStream Entry.
@@ -38,6 +39,7 @@ public class ActivityEntryImpl implement
private String title;
private String updatedTime;
private String verb;
+ private OpenSocial extensions;
/**
* Create a new empty ActivityEntry
@@ -154,4 +156,15 @@ public class ActivityEntryImpl implement
public void setVerb(String verb) {
this.verb = verb;
}
+
+ /** {@inheritDoc} */
+ public OpenSocial getOpenSocial() {
+ return extensions;
+ }
+
+ /** {@inheritDoc} */
+ public void setOpenSocial(OpenSocial extensions) {
+ this.extensions = extensions;
+
+ }
}
Added: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/OpenSocialImpl.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/OpenSocialImpl.java?rev=1092425&view=auto
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/OpenSocialImpl.java (added)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/OpenSocialImpl.java Thu Apr 14 18:13:55 2011
@@ -0,0 +1,13 @@
+package org.apache.shindig.social.core.model;
+
+import org.apache.shindig.social.opensocial.model.OpenSocial;
+
+/**
+ * OpenSocial namespace implementation.
+ *
+ */
+
+public class OpenSocialImpl implements OpenSocial {
+
+
+}
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java?rev=1092425&r1=1092424&r2=1092425&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java Thu Apr 14 18:13:55 2011
@@ -57,6 +57,7 @@ import org.apache.shindig.social.opensoc
import org.apache.shindig.social.opensocial.model.Message;
import org.apache.shindig.social.opensocial.model.MessageCollection;
import org.apache.shindig.social.opensocial.model.Name;
+import org.apache.shindig.social.opensocial.model.OpenSocial;
import org.apache.shindig.social.opensocial.model.Organization;
import org.apache.shindig.social.opensocial.model.Person;
import org.apache.shindig.social.opensocial.model.Url;
@@ -173,6 +174,7 @@ public class XStream081Configuration imp
new ClassFieldMapping("organization", Organization.class),
new ClassFieldMapping("person", Person.class),
new ClassFieldMapping("url", Url.class),
+ new ClassFieldMapping("openSocial", OpenSocial.class),
// this is an example of a class field mapping with context. If
// ListField is mapped inside an element named emails, replace the element
// name
@@ -211,6 +213,7 @@ public class XStream081Configuration imp
new ClassFieldMapping("organization", Organization.class),
new ClassFieldMapping("person", Person.class),
new ClassFieldMapping("url", Url.class),
+ new ClassFieldMapping("openSocial", OpenSocial.class),
// this is an example of a class field mapping with context. If
// ListField is mapped inside an element named emails, replace the element
// name that would have been defiend as fqcn ListField with email
@@ -250,6 +253,7 @@ public class XStream081Configuration imp
.put("organization", Organization.class)
.put("person", Person.class)
.put("url", Url.class)
+ .put("openSocial", OpenSocial.class)
.put("listField", ListField.class).build()
);
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ActivityEntry.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ActivityEntry.java?rev=1092425&r1=1092424&r2=1092425&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ActivityEntry.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ActivityEntry.java Thu Apr 14 18:13:55 2011
@@ -44,7 +44,8 @@ public interface ActivityEntry {
TARGET("target"),
TITLE("title"),
UPDATED_TIME("updatedTime"),
- VERB("verb");
+ VERB("verb"),
+ OPENSOCIAL("openSocial");
/**
* The name of the JSON element.
@@ -223,4 +224,18 @@ public interface ActivityEntry {
* @param verb a {@link java.lang.String} object.
*/
void setVerb(String verb);
+
+ /**
+ * <p>getOpenSocial</p>
+ *
+ * @return a {@link org.apache.shindig.social.opensocial.model.OpenSocial} object
+ */
+ OpenSocial getOpenSocial();
+
+ /**
+ * <p>setOpenSocial</p>
+ *
+ * @return a {@link org.apache.shindig.social.opensocial.model.OpenSocial} object
+ */
+ void setOpenSocial(OpenSocial extensions);
}
Added: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/OpenSocial.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/OpenSocial.java?rev=1092425&view=auto
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/OpenSocial.java (added)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/OpenSocial.java Thu Apr 14 18:13:55 2011
@@ -0,0 +1,44 @@
+package org.apache.shindig.social.opensocial.model;
+
+import org.apache.shindig.protocol.model.Exportablebean;
+import org.apache.shindig.social.core.model.OpenSocialImpl;
+
+import com.google.inject.ImplementedBy;
+
+/**
+ * Represents the OpenSocial namespace in ActivityStreams.
+ *
+ */
+@ImplementedBy(OpenSocialImpl.class)
+@Exportablebean
+public interface OpenSocial {
+
+ public static enum Field {
+ //Add OpenSocial field extensions here
+ ;
+ /**
+ * The name of the JSON element.
+ */
+ private final String jsonString;
+
+ /**
+ * Constructs the field base for the JSON element.
+ *
+ * @param jsonString the name of the element
+ */
+ private Field(String jsonString) {
+ this.jsonString = jsonString;
+ }
+
+ /**
+ * Returns the name of the JSON element.
+ *
+ * @return String the name of the JSON element
+ */
+ public String toString() {
+ return jsonString;
+ }
+ }
+
+
+}
Modified: shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonGroup.json
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonGroup.json?rev=1092425&r1=1092424&r2=1092425&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonGroup.json (original)
+++ shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonGroup.json Thu Apr 14 18:13:55 2011
@@ -58,7 +58,8 @@
"url":"http://example.org/attached2"
}
]
- }
+ },
+ "openSocial":{}
},
{
"title":"Super simple ActivityEntry",
Modified: shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonId.json
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonId.json?rev=1092425&r1=1092424&r2=1092425&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonId.json (original)
+++ shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonId.json Thu Apr 14 18:13:55 2011
@@ -55,6 +55,7 @@
"height":250
},
"displayName":"John Doe"
- }
+ },
+ "openSocial":{}
}
}
\ No newline at end of file
Modified: shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonIds.json
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonIds.json?rev=1092425&r1=1092424&r2=1092425&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonIds.json (original)
+++ shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonIds.json Thu Apr 14 18:13:55 2011
@@ -58,7 +58,8 @@
"url":"http://example.org/attached2"
}
]
- }
+ },
+ "openSocial":{}
},
{
"title":"Super simple ActivityEntry",
Modified: shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonUpdated.json
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonUpdated.json?rev=1092425&r1=1092424&r2=1092425&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonUpdated.json (original)
+++ shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/ActivityEntryJsonUpdated.json Thu Apr 14 18:13:55 2011
@@ -58,7 +58,8 @@
"url":"http://example.org/attached2"
}
]
- }
+ },
+ "openSocial":{}
},
{
"title":"Super Updated Activity",