Author: hnguy
Date: Thu Oct 28 21:03:55 2010
New Revision: 1028478
URL: http://svn.apache.org/viewvc?rev=1028478&view=rev
Log:
SHINDIG-1329 | Patch from Eric Woods | ActivityStream support in Apache Shindig
Added:
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/core/model/StandardLinkImpl.java
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/StandardLink.java
Removed:
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActivityStreamImpl.java
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActivityStream.java
Modified:
shindig/trunk/content/samplecontainer/examples/ActivityStreams/ActivityStreamsRender.js
shindig/trunk/content/samplecontainer/examples/ActivityStreams/OpenSocialWrapper.js
shindig/trunk/content/sampledata/canonicaldb.json
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActionLinkImpl.java
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActivityEntryImpl.java
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActivityObjectImpl.java
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/core/model/MediaLinkImpl.java
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActivityEntry.java
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActivityObject.java
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/MediaLink.java
Modified:
shindig/trunk/content/samplecontainer/examples/ActivityStreams/ActivityStreamsRender.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/content/samplecontainer/examples/ActivityStreams/ActivityStreamsRender.js?rev=1028478&r1=1028477&r2=1028478&view=diff
==============================================================================
---
shindig/trunk/content/samplecontainer/examples/ActivityStreams/ActivityStreamsRender.js
(original)
+++
shindig/trunk/content/samplecontainer/examples/ActivityStreams/ActivityStreamsRender.js
Thu Oct 28 21:03:55 2010
@@ -117,14 +117,14 @@ function ActivityStreamsRender() {
function processActivityEntries(entries) {
var html = '';
for(idx = 0; idx < entries.length; idx++) {
- if(entries[idx].object.permalink &&
entries[idx].object.permalink != "null") {
- html += "<h3><a href='" +
entries[idx].object.permalink + "'>" + entries[idx].title + "</a></h3>";
+ if(entries[idx].object.link && entries[idx].object.link
!= "null") {
+ html += "<h3><a href='" +
entries[idx].object.link + "'>" + entries[idx].title + "</a></h3>";
} else {
html += "<h3>" + entries[idx].title + "</h3>";
}
html += "ID: " + entries[idx].object.id + "<br>";
- html += "Actor: " + entries[idx].actor.name + "<br>";
- html += "Posted: " + entries[idx].time + "<br>";
+ html += "Actor: " + entries[idx].actor.displayName +
"<br>";
+ html += "Posted: " + entries[idx].postedTime + "<br>";
if(entries[idx].body && entries[idx].body != "null") {
html += "Body: " + entries[idx].body + "<br>";
}
Modified:
shindig/trunk/content/samplecontainer/examples/ActivityStreams/OpenSocialWrapper.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/content/samplecontainer/examples/ActivityStreams/OpenSocialWrapper.js?rev=1028478&r1=1028477&r2=1028478&view=diff
==============================================================================
---
shindig/trunk/content/samplecontainer/examples/ActivityStreams/OpenSocialWrapper.js
(original)
+++
shindig/trunk/content/samplecontainer/examples/ActivityStreams/OpenSocialWrapper.js
Thu Oct 28 21:03:55 2010
@@ -100,18 +100,18 @@ function OpenSocialWrapper() {
groupId: '@self',
activityEntry: {
standardLink: [standardLink],
- time: '2010-04-27T06:02:36+0000',
+ postedTime: '2010-04-27T06:02:36+0000',
title: title,
body: body,
actor: {
id: actorId,
- name: actorName
+ displayName: actorName
},
verb: verbs,
object: {
id: 'entryId123',
- name: objectName,
- permalink: objectPermalink,
+ displayName: objectName,
+ link: objectPermalink,
type: objectTypes,
media: {
target:
'http://myvideos.com/raftingtrip/raftingvideo.avi',
Modified: shindig/trunk/content/sampledata/canonicaldb.json
URL:
http://svn.apache.org/viewvc/shindig/trunk/content/sampledata/canonicaldb.json?rev=1028478&r1=1028477&r2=1028478&view=diff
==============================================================================
--- shindig/trunk/content/sampledata/canonicaldb.json (original)
+++ shindig/trunk/content/sampledata/canonicaldb.json Thu Oct 28 21:03:55 2010
@@ -352,7 +352,7 @@
"activityEntries" : {
"john.doe": [{
"id": "myEntryId123",
- "permalink": "http://www.myactivityentry.com";,
+ "link": "http://www.myactivityentry.com";,
"postedTime": "2010-04-27T06:02:36+0000",
"title": "This is my ActivityEntry!",
"body": "ActivityStreams are so much fun!",
@@ -371,21 +371,68 @@
},
"albums" : {
"john.doe": [{
- "id" : "album123",
+ "id" : "germany123",
"ownerId" : "john.doe",
- "thumbnailUrl" :
"http://pages.example.org/albums/4433221-tn.png";,
- "title" : "Example Album",
- "description" : "This is an example album, and this text is an
example description",
+ "thumbnailUrl" :
"http://hphotos-snc3.fbcdn.net/hs050.snc3/13734_810445703213_6222631_45135775_1728872_n.jpg";,
+ "title" : "Germany 2009",
+ "description" : "Garmisch-Partenkirchen for research!",
"location" : { "latitude": 0, "longitude": 0 }
+ }, {
+ "id" : "cruise123",
+ "ownerId" : "john.doe",
+ "thumbnailUrl" :
"http://hphotos-snc3.fbcdn.net/hs143.snc3/17062_828584892133_6222631_45795844_8024804_n.jpg";,
+ "title" : "Graduation Cruise",
+ "description" : "Graduation cruise!"
+ }, {
+ "id" : "temp123",
+ "ownerId" : "john.doe",
+ "title" : "Album with no Thumbnail",
+ "description" : "I don't have a thumbnail. I'm a perfect album
to delete..."
}]
},
"mediaItems" : {
"john.doe": [{
- "id" : "mediaItem123",
- "albumId" : "album123",
+ "title" : "Ski Jump",
+ "description" : "We're going to the top!",
+ "id" : "mediaItem2",
+ "albumId" : "germany123",
+ "mimeType" : "image/jpeg",
+ "type" : "image",
+ "thumbnailUrl" :
"http://hphotos-snc3.fbcdn.net/hs070.snc3/13734_810445668283_6222631_45135772_741359_n.jpg";,
+ "url" :
"http://hphotos-snc3.fbcdn.net/hs070.snc3/13734_810445668283_6222631_45135772_741359_n.jpg";
+ }, {
+ "title" : "Frozen",
+ "description" : "Cool effects...",
+ "id" : "mediaItem3",
+ "albumId" : "germany123",
+ "mimeType" : "image/jpeg",
+ "type" : "image",
+ "thumbnailUrl" :
"http://sphotos.ak.fbcdn.net/hphotos-ak-snc4/hs369.snc4/45245_928217193203_6222631_49412689_3724203_n.jpg";,
+ "url" :
"http://sphotos.ak.fbcdn.net/hphotos-ak-snc4/hs369.snc4/45245_928217193203_6222631_49412689_3724203_n.jpg";
+ }, {
+ "title" : "Hotel resort",
+ "id" : "mediaItem4",
+ "albumId" : "germany123",
+ "mimeType" : "image/jpeg",
+ "type" : "image",
+ "thumbnailUrl" :
"http://sphotos.ak.fbcdn.net/hphotos-ak-snc3/hs050.snc3/13734_810445788043_6222631_45135783_1591091_n.jpg";,
+ "url" :
"http://sphotos.ak.fbcdn.net/hphotos-ak-snc3/hs050.snc3/13734_810445788043_6222631_45135783_1591091_n.jpg";
+ }, {
+ "title" : "Authentic? Yes!",
+ "id" : "mediaItem5",
+ "albumId" : "germany123",
+ "mimeType" : "image/jpeg",
+ "type" : "image",
+ "thumbnailUrl" :
"http://hphotos-snc3.fbcdn.net/hs050.snc3/13734_810445758103_6222631_45135780_284612_n.jpg";,
+ "url" :
"http://hphotos-snc3.fbcdn.net/hs050.snc3/13734_810445758103_6222631_45135780_284612_n.jpg";
+ }, {
+ "title" : "Garmisch-Partenkirchen",
+ "id" : "mediaItem6",
+ "albumId" : "germany123",
"mimeType" : "image/jpeg",
"type" : "image",
- "url" :
"http://animals.nationalgeographic.com/staticfiles/NGS/Shared/StaticFiles/animals/images/primary/black-spider-monkey.jpg";
+ "thumbnailUrl" :
"http://hphotos-snc3.fbcdn.net/hs050.snc3/13734_810445703213_6222631_45135775_1728872_n.jpg";,
+ "url" :
"http://hphotos-snc3.fbcdn.net/hs050.snc3/13734_810445703213_6222631_45135775_1728872_n.jpg";
}]
},
//
Modified:
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActionLinkImpl.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActionLinkImpl.java?rev=1028478&r1=1028477&r2=1028478&view=diff
==============================================================================
---
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActionLinkImpl.java
(original)
+++
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActionLinkImpl.java
Thu Oct 28 21:03:55 2010
@@ -31,8 +31,6 @@ public class ActionLinkImpl implements A
* Construct an empty ActionLinkImpl.
*/
public ActionLinkImpl() {
- this.target = null;
- this.caption = null;
}
/** {...@inheritdoc} */
Modified:
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActivityEntryImpl.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActivityEntryImpl.java?rev=1028478&r1=1028477&r2=1028478&view=diff
==============================================================================
---
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActivityEntryImpl.java
(original)
+++
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActivityEntryImpl.java
Thu Oct 28 21:03:55 2010
@@ -22,40 +22,33 @@ import java.util.List;
import org.apache.shindig.extras.as.opensocial.model.ActivityEntry;
import org.apache.shindig.extras.as.opensocial.model.ActivityObject;
+import org.apache.shindig.extras.as.opensocial.model.StandardLink;
/**
* A simple bean implementation of an ActivityStream Entry.
- *
+ *
*/
public class ActivityEntryImpl implements ActivityEntry {
private String icon;
- private String time;
+ private String postedTime;
private ActivityObject actor;
- private List<String> verb;
+ private String verb;
private ActivityObject object;
private ActivityObject target;
private ActivityObject generator;
- private ActivityObject serviceProvider;
+ private ActivityObject provider;
private String title;
private String body;
- private List<String> standardLink;
-
+ private List<StandardLink> standardLinks;
+ private List<String> to;
+ private List<String> cc;
+ private List<String> bcc;
+
/**
* Create a new empty ActivityEntry
*/
public ActivityEntryImpl() {
- this.icon = null;
- this.time = null;
- this.actor = null;
- this.verb = null;
- this.object = null;
- this.target = null;
- this.generator = null;
- this.serviceProvider = null;
- this.title = null;
- this.body = null;
- this.standardLink = null;
}
/** {...@inheritdoc} */
@@ -69,13 +62,13 @@ public class ActivityEntryImpl implement
}
/** {...@inheritdoc} */
- public String getTime() {
- return time;
+ public String getPostedTime() {
+ return postedTime;
}
/** {...@inheritdoc} */
- public void setTime(String time) {
- this.time = time;
+ public void setPostedTime(String postedTime) {
+ this.postedTime = postedTime;
}
/** {...@inheritdoc} */
@@ -89,12 +82,12 @@ public class ActivityEntryImpl implement
}
/** {...@inheritdoc} */
- public List<String> getVerb() {
+ public String getVerb() {
return verb;
}
/** {...@inheritdoc} */
- public void setVerb(List<String> verb) {
+ public void setVerb(String verb) {
this.verb = verb;
}
@@ -129,13 +122,13 @@ public class ActivityEntryImpl implement
}
/** {...@inheritdoc} */
- public ActivityObject getServiceProvider() {
- return serviceProvider;
+ public ActivityObject getProvider() {
+ return provider;
}
/** {...@inheritdoc} */
- public void setServiceProvider(ActivityObject serviceProvider) {
- this.serviceProvider = serviceProvider;
+ public void setProvider(ActivityObject provider) {
+ this.provider = provider;
}
/** {...@inheritdoc} */
@@ -159,12 +152,42 @@ public class ActivityEntryImpl implement
}
/** {...@inheritdoc} */
- public List<String> getStandardLink() {
- return standardLink;
+ public List<StandardLink> getStandardLinks() {
+ return standardLinks;
+ }
+
+ /** {...@inheritdoc} */
+ public void setStandardLinks(List<StandardLink> standardLinks) {
+ this.standardLinks = standardLinks;
+ }
+
+ /** {...@inheritdoc} */
+ public List<String> getTo() {
+ return to;
+ }
+
+ /** {...@inheritdoc} */
+ public void setTo(List<String> to) {
+ this.to = to;
+ }
+
+ /** {...@inheritdoc} */
+ public List<String> getCC() {
+ return cc;
+ }
+
+ /** {...@inheritdoc} */
+ public void setCC(List<String> cc) {
+ this.cc = cc;
}
/** {...@inheritdoc} */
- public void setStandardLink(List<String> standardLink) {
- this.standardLink = standardLink;
+ public List<String> getBCC() {
+ return bcc;
+ }
+
+ /** {...@inheritdoc} */
+ public void setBCC(List<String> bcc) {
+ this.bcc = bcc;
}
}
Modified:
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActivityObjectImpl.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActivityObjectImpl.java?rev=1028478&r1=1028477&r2=1028478&view=diff
==============================================================================
---
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActivityObjectImpl.java
(original)
+++
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActivityObjectImpl.java
Thu Oct 28 21:03:55 2010
@@ -23,6 +23,7 @@ import java.util.List;
import org.apache.shindig.extras.as.opensocial.model.ActionLink;
import org.apache.shindig.extras.as.opensocial.model.ActivityObject;
import org.apache.shindig.extras.as.opensocial.model.MediaLink;
+import org.apache.shindig.extras.as.opensocial.model.StandardLink;
/**
* <p>ActivityObjectImpl class.</p>
@@ -31,38 +32,24 @@ import org.apache.shindig.extras.as.open
public class ActivityObjectImpl implements ActivityObject {
private String id;
- private String name;
+ private String displayName;
private String summary;
private MediaLink media;
- private String permalink;
- private List<String> type;
+ private String link;
+ private String objectType;
private ActivityObject inReplyTo;
- private List<ActivityObject> attached;
- private List<ActivityObject> reply;
- private List<ActivityObject> reaction;
- private ActionLink action;
- private List<String> upstreamDuplicateId;
- private List<String> downstreamDuplicateId;
- private String standardLink;
+ private List<ActivityObject> attachedObjects;
+ private List<ActivityObject> replies;
+ private List<ActivityObject> reactions;
+ private List<ActionLink> actionLinks;
+ private List<String> upstreamDuplicates;
+ private List<String> downstreamDuplicates;
+ private List<StandardLink> standardLinks;
/**
* A simple implementation of an ActivtyObject
*/
public ActivityObjectImpl() {
- this.id = null;
- this.name = null;
- this.summary = null;
- this.media = null;
- this.permalink = null;
- this.type = null;
- this.inReplyTo = null;
- this.attached = null;
- this.reply = null;
- this.reaction = null;
- this.action = null;
- this.upstreamDuplicateId = null;
- this.downstreamDuplicateId = null;
- this.standardLink = null;
}
/** {...@inheritdoc} */
@@ -76,13 +63,13 @@ public class ActivityObjectImpl implemen
}
/** {...@inheritdoc} */
- public String getName() {
- return name;
+ public String getDisplayName() {
+ return displayName;
}
/** {...@inheritdoc} */
- public void setName(String name) {
- this.name = name;
+ public void setDisplayName(String displayName) {
+ this.displayName = displayName;
}
/** {...@inheritdoc} */
@@ -106,23 +93,23 @@ public class ActivityObjectImpl implemen
}
/** {...@inheritdoc} */
- public String getPermalink() {
- return permalink;
+ public String getLink() {
+ return link;
}
/** {...@inheritdoc} */
- public void setPermalink(String permalink) {
- this.permalink = permalink;
+ public void setLink(String link) {
+ this.link = link;
}
/** {...@inheritdoc} */
- public List<String> getType() {
- return type;
+ public String getObjectType() {
+ return objectType;
}
/** {...@inheritdoc} */
- public void setType(List<String> type) {
- this.type = type;
+ public void setObjectType(String objectType) {
+ this.objectType = objectType;
}
/** {...@inheritdoc} */
@@ -136,72 +123,72 @@ public class ActivityObjectImpl implemen
}
/** {...@inheritdoc} */
- public List<ActivityObject> getAttached() {
- return attached;
+ public List<ActivityObject> getAttachedObjects() {
+ return attachedObjects;
}
/** {...@inheritdoc} */
- public void setAttached(List<ActivityObject> attached) {
- this.attached = attached;
+ public void setAttachedObjects(List<ActivityObject> attachedObjects) {
+ this.attachedObjects = attachedObjects;
}
/** {...@inheritdoc} */
- public List<ActivityObject> getReply() {
- return reply;
+ public List<ActivityObject> getReplies() {
+ return replies;
}
/** {...@inheritdoc} */
- public void setReply(List<ActivityObject> reply) {
- this.reply = reply;
+ public void setReplies(List<ActivityObject> replies) {
+ this.replies = replies;
}
/** {...@inheritdoc} */
- public List<ActivityObject> getReaction() {
- return reaction;
+ public List<ActivityObject> getReactions() {
+ return reactions;
}
/** {...@inheritdoc} */
- public void setReaction(List<ActivityObject> reaction) {
- this.reaction = reaction;
+ public void setReactions(List<ActivityObject> reactions) {
+ this.reactions = reactions;
}
/** {...@inheritdoc} */
- public ActionLink getAction() {
- return action;
+ public List<ActionLink> getActionLinks() {
+ return actionLinks;
}
/** {...@inheritdoc} */
- public void setAction(ActionLink action) {
- this.action = action;
+ public void setActionLinks(List<ActionLink> actionLinks) {
+ this.actionLinks = actionLinks;
}
/** {...@inheritdoc} */
- public List<String> getUpstreamDuplicateId() {
- return upstreamDuplicateId;
+ public List<String> getUpstreamDuplicates() {
+ return upstreamDuplicates;
}
/** {...@inheritdoc} */
- public void setUpstreamDuplicateId(List<String> upstreamDuplicateId) {
- this.upstreamDuplicateId = upstreamDuplicateId;
+ public void setUpstreamDuplicates(List<String> upstreamDuplicates) {
+ this.upstreamDuplicates = upstreamDuplicates;
}
/** {...@inheritdoc} */
- public List<String> getDownstreamDuplicateId() {
- return downstreamDuplicateId;
+ public List<String> getDownstreamDuplicates() {
+ return downstreamDuplicates;
}
/** {...@inheritdoc} */
- public void setDownstreamDuplicateId(List<String> downstreamDuplicateId) {
- this.downstreamDuplicateId = downstreamDuplicateId;
+ public void setDownstreamDuplicates(List<String> downstreamDuplicates) {
+ this.downstreamDuplicates = downstreamDuplicates;
}
/** {...@inheritdoc} */
- public String getStandardLink() {
- return standardLink;
+ public List<StandardLink> getStandardLinks() {
+ return standardLinks;
}
/** {...@inheritdoc} */
- public void setStandardLink(String standardLink) {
- this.standardLink = standardLink;
+ public void setStandardLinks(List<StandardLink> standardLinks) {
+ this.standardLinks = standardLinks;
}
}
Modified:
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/core/model/MediaLinkImpl.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/core/model/MediaLinkImpl.java?rev=1028478&r1=1028477&r2=1028478&view=diff
==============================================================================
---
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/core/model/MediaLinkImpl.java
(original)
+++
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/core/model/MediaLinkImpl.java
Thu Oct 28 21:03:55 2010
@@ -25,7 +25,7 @@ import org.apache.shindig.extras.as.open
*/
public class MediaLinkImpl implements MediaLink {
- private String target;
+ private String url;
private String type;
private String width;
private String height;
@@ -35,23 +35,18 @@ public class MediaLinkImpl implements Me
* Create a new MediaLink
*/
public MediaLinkImpl() {
- this.target = null;
- this.type = null;
- this.width = null;
- this.height = null;
- this.duration = null;
}
/** {...@inheritdoc} */
- public String getTarget() {
- return target;
+ public String getUrl() {
+ return url;
}
/** {...@inheritdoc} */
- public void setTarget(String target) {
- this.target = target;
+ public void setUrl(String url) {
+ this.url = url;
}
-
+
/** {...@inheritdoc} */
public String getType() {
return type;
Added:
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/core/model/StandardLinkImpl.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/core/model/StandardLinkImpl.java?rev=1028478&view=auto
==============================================================================
---
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/core/model/StandardLinkImpl.java
(added)
+++
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/core/model/StandardLinkImpl.java
Thu Oct 28 21:03:55 2010
@@ -0,0 +1,78 @@
+/*
+ * 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.
+ */
+package org.apache.shindig.extras.as.core.model;
+
+import org.apache.shindig.extras.as.opensocial.model.StandardLink;
+
+/**
+ * <p>MediaLinkImpl class.</p>
+ *
+ */
+public class StandardLinkImpl implements StandardLink {
+
+ private String href;
+ private String rel;
+ private String inline;
+ private String type;
+
+ /**
+ * Create a new MediaLink
+ */
+ public StandardLinkImpl() {
+ }
+
+ /** {...@inheritdoc} */
+ public String getHref() {
+ return href;
+ }
+
+ /** {...@inheritdoc} */
+ public void setHref(String href) {
+ this.href = href;
+ }
+
+ /** {...@inheritdoc} */
+ public String getRel() {
+ return rel;
+ }
+
+ /** {...@inheritdoc} */
+ public void setRel(String rel) {
+ this.rel = rel;
+ }
+
+ /** {...@inheritdoc} */
+ public String getInline() {
+ return inline;
+ }
+
+ /** {...@inheritdoc} */
+ public void setInline(String inline) {
+ this.inline = inline;
+ }
+
+ /** {...@inheritdoc} */
+ public String getType() {
+ return type;
+ }
+
+ /** {...@inheritdoc} */
+ public void setType(String type) {
+ this.type = type;
+ }
+}
Modified:
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActivityEntry.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActivityEntry.java?rev=1028478&r1=1028477&r2=1028478&view=diff
==============================================================================
---
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActivityEntry.java
(original)
+++
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActivityEntry.java
Thu Oct 28 21:03:55 2010
@@ -41,16 +41,19 @@ public interface ActivityEntry {
*/
public static enum Field {
ICON("icon"),
- TIME("time"),
+ POSTED_TIME("postedTime"),
ACTOR("actor"),
VERB("verb"),
OBJECT("object"),
TARGET("target"),
GENERATOR("generator"),
- SERVICE_PROVIDER("serviceProvider"),
+ PROVIDER("provider"),
TITLE("title"),
BODY("body"),
- STANDARD_LINK("standardLink");
+ STANDARD_LINKS("standardLinks"),
+ TO("to"),
+ CC("cc"),
+ BCC("bcc");
/**
* The name of the JSON element.
@@ -131,18 +134,18 @@ public interface ActivityEntry {
void setIcon(String icon);
/**
- * <p>getTime</p>
+ * <p>getPostedTime</p>
*
* @return a {...@link java.lang.String} object.
*/
- String getTime();
+ String getPostedTime();
/**
- * <p>setTime</p>
+ * <p>setPostedTime</p>
*
- * @param time a {...@link java.lang.String} object.
+ * @param postedTime a {...@link java.lang.String} object.
*/
- void setTime(String time);
+ void setPostedTime(String postedTime);
/**
* <p>getActor</p>
@@ -163,14 +166,14 @@ public interface ActivityEntry {
*
* @return a {...@link java.util.List} object.
*/
- List<String> getVerb();
+ String getVerb();
/**
* <p>setVerb</p>
*
* @param verb a {...@link java.util.List} object.
*/
- void setVerb(List<String> verb);
+ void setVerb(String verb);
/**
* <p>getObject</p>
@@ -215,18 +218,18 @@ public interface ActivityEntry {
void setGenerator(ActivityObject generator);
/**
- * <p>getServiceProvider</p>
+ * <p>getProvider</p>
*
* @return a {...@link
org.apache.shindig.extras.as.opensocial.model.ActivityObject} object.
*/
- ActivityObject getServiceProvider();
+ ActivityObject getProvider();
/**
* <p>setServiceProvider</p>
*
- * @param serviceProvider a {...@link
org.apache.shindig.extras.as.opensocial.model.ActivityObject} object.
+ * @param provider a {...@link
org.apache.shindig.extras.as.opensocial.model.ActivityObject} object.
*/
- void setServiceProvider(ActivityObject serviceProvider);
+ void setProvider(ActivityObject provider);
/**
* <p>getTitle</p>
@@ -257,16 +260,58 @@ public interface ActivityEntry {
void setBody(String body);
/**
- * <p>getStandardLink</p>
+ * <p>getStandardLinks</p>
*
* @return a {...@link java.util.List} object.
*/
- List<String> getStandardLink();
+ List<StandardLink> getStandardLinks();
/**
- * <p>setStandardLink</p>
+ * <p>setStandardLinks</p>
*
- * @param standardLink a {...@link java.util.List} object.
+ * @param standardLinks a {...@link java.util.List} object.
*/
- void setStandardLink(List<String> standardLink);
+ void setStandardLinks(List<StandardLink> standardLinks);
+
+ /**
+ * <p>getTo</p>
+ *
+ * @return a List<String> of target recipients
+ */
+ List<String> getTo();
+
+ /**
+ * <p>setTo</p>
+ *
+ * @param to is the list of target recipients
+ */
+ void setTo(List<String> to);
+
+ /**
+ * <p>getCC</p>
+ *
+ * @return a List<String> of carbon-copy recipients
+ */
+ List<String> getCC();
+
+ /**
+ * <p>setCC</p>
+ *
+ * @param cc is the list of carbon-copy recipients
+ */
+ void setCC(List<String> cc);
+
+ /**
+ * <p>getBCC</p>
+ *
+ * @return a List<String> of BCC recipients
+ */
+ List<String> getBCC();
+
+ /**
+ * <p>setBCC</p>
+ *
+ * @param bcc is the list of BCC recipients
+ */
+ void setBCC(List<String> bcc);
}
Modified:
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActivityObject.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActivityObject.java?rev=1028478&r1=1028477&r2=1028478&view=diff
==============================================================================
---
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActivityObject.java
(original)
+++
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActivityObject.java
Thu Oct 28 21:03:55 2010
@@ -37,19 +37,19 @@ public interface ActivityObject {
*/
public static enum Field {
ID("id"),
- NAME("name"),
+ DISPLAY_NAME("displayName"),
SUMMARY("summary"),
MEDIA("media"),
- PERMALINK("permalink"),
- TYPE("type"),
+ LINK("link"),
+ OBJECT_TYPE("objectType"),
IN_REPLY_TO("inReplyTo"),
- ATTACHED("attached"),
- REPLY("reply"),
- REACTION("reaction"),
- ACTION("action"),
- UPSTREAM_DUPLICATE_ID("upstreamDuplicateId"),
- DOWNSTREAM_DUPLICATE_ID("downstreamDuplicateId"),
- STANDARD_LINK("standardLink");
+ ATTACHED_OBJECTS("attachedObjects"),
+ REPLIES("replies"),
+ REACTIONS("reactions"),
+ ACTION_LINKS("actionLinks"),
+ UPSTREAM_DUPLICATES("upstreamDuplicates"),
+ DOWNSTREAM_DUPLICATES("downstreamDuplicates"),
+ STANDARD_LINKS("standardLinks");
/*
* The name of the JSON element.
@@ -92,13 +92,13 @@ public interface ActivityObject {
/**
* @return the human-readable name fo the object
*/
- String getName();
+ String getDisplayName();
/**
* Sets the name
* @param name a human-readable name
*/
- void setName(String name);
+ void setDisplayName(String displayName);
/**
* Gets the human-readable summary for this object.
@@ -132,28 +132,28 @@ public interface ActivityObject {
*
* @return a permalink string, possibly null
*/
- String getPermalink();
+ String getLink();
/**
* Set the permanent link
*
* @param permalink a permalink string, possibly null
*/
- void setPermalink(String permalink);
+ void setLink(String link);
/**
- * Returns a list of Type strings
+ * Returns the ActivityObject's object type.
*
- * @return a list of Type strings
+ * @return String representing the object type
*/
- List<String> getType();
+ String getObjectType();
/**
- * set the list of Type strings
+ * Set's the ActivityObject's object type.
*
- * @param type a list of Type strings
+ * @param objectType is the object type
*/
- void setType(List<String> type);
+ void setObjectType(String objectType);
/**
* Get the Activity this item is a response to
@@ -174,96 +174,96 @@ public interface ActivityObject {
*
* @return a list of ActivityObjects
*/
- List<ActivityObject> getAttached();
+ List<ActivityObject> getAttachedObjects();
/**
* Sets the list of Attached Activities for this entry
*
- * @param attached a list of ActivityObjects
+ * @param attachedObjects a list of ActivityObjects
*/
- void setAttached(List<ActivityObject> attached);
+ void setAttachedObjects(List<ActivityObject> attachedObjects);
/**
* Gets the list of reply Activities for this entry
*
* @return a list of ActivityObjects
*/
- List<ActivityObject> getReply();
+ List<ActivityObject> getReplies();
/**
* Sets the list of reply Activities for this entry
*
- * @param reply a list of ActivityObjects
+ * @param replies a list of ActivityObjects
*/
- void setReply(List<ActivityObject> reply);
+ void setReplies(List<ActivityObject> replies);
/**
* Gets the list of reaction Activities for this entry
*
* @return a list of ActivityObjects
*/
- List<ActivityObject> getReaction();
+ List<ActivityObject> getReactions();
/**
* Sets the list of reaction Activities for this entry
*
- * @param reaction a list of ActivityObjects
+ * @param reactions a list of ActivityObjects
*/
- void setReaction(List<ActivityObject> reaction);
+ void setReactions(List<ActivityObject> reactions);
/**
- * Returns an ActionLink for this object
+ * Returns the ActionLinks for this object
*
- * @return a {...@link
org.apache.shindig.extras.as.opensocial.model.ActionLink} object.
+ * @return List<ActionLink> is the list of ActionLink objects
*/
- ActionLink getAction();
+ List<ActionLink> getActionLinks();
/**
- * Sets the ActionLink for this object
+ * Sets the ActionLinks for this object
*
- * @param action a {...@link
org.apache.shindig.extras.as.opensocial.model.ActionLink} object.
+ * @param actionLinks is the list of ActionLinks
*/
- void setAction(ActionLink action);
+ void setActionLinks(List<ActionLink> actionLinks);
/**
- * Get the list of upstream duplicate Ids
+ * Get the list of upstream duplicates.
*
* @return a list of strings
*/
- List<String> getUpstreamDuplicateId();
+ List<String> getUpstreamDuplicates();
/**
- * Set the list of upstream duplicate Ids
+ * Set the list of upstream duplicates.
*
- * @param upstreamDuplicateId a list of strings containing duplicate Ids
+ * @param upstreamDuplicates a list of strings containing duplicate IDs
*/
- void setUpstreamDuplicateId(List<String> upstreamDuplicateId);
+ void setUpstreamDuplicates(List<String> upstreamDuplicates);
/**
- * Get the list of downstream duplicate Ids
+ * Get the list of downstream duplicates.
*
* @return a list of strings
*/
- List<String> getDownstreamDuplicateId();
+ List<String> getDownstreamDuplicates();
/**
- * Set the list of downstream duplicate Ids
+ * Set the list of downstream duplicates
*
- * @param downstreamDuplicateId a list of strings containing duplicate Ids
+ * @param downstreamDuplicates a list of strings containing duplicate IDs
*/
- void setDownstreamDuplicateId(List<String> downstreamDuplicateId);
+ void setDownstreamDuplicates(List<String> downstreamDuplicates);
/**
- * Return a standard link string
+ * Return the Object's StandardLinks
*
- * @return the standard link
+ * @return List<StandardLink> is the list of StandardLinks
*/
- String getStandardLink();
+ List<StandardLink> getStandardLinks();
/**
* Set the standard link string
*
- * @param standardLink the standard link
+ * @param standardLinks the standard link
*/
- void setStandardLink(String standardLink);
+ void setStandardLinks(List<StandardLink> standardLinks);
}
Modified:
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/MediaLink.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/MediaLink.java?rev=1028478&r1=1028477&r2=1028478&view=diff
==============================================================================
---
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/MediaLink.java
(original)
+++
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/MediaLink.java
Thu Oct 28 21:03:55 2010
@@ -36,7 +36,7 @@ public interface MediaLink {
* Fields that represent the JSON elements.
*/
public static enum Field {
- TARGET("target"),
+ URL("url"),
TYPE("type"),
WIDTH("width"),
HEIGHT("height"),
@@ -67,30 +67,30 @@ public interface MediaLink {
}
/**
- * Returns the target of this MediaLink
+ * Returns the target URL of this MediaLink
*
* @return a target
*/
- String getTarget();
+ String getUrl();
/**
- * Sets the target for this MediaLink
+ * Sets the target URL for this MediaLink
*
- * @param target a target linke
+ * @param target a target link
*/
- void setTarget(String target);
-
+ void setUrl(String url);
+
/**
- * Returns the type of the MediaLink
- *
- * @return a type
+ * Returns the Media's type.
+ *
+ * @return String indicates the target Media's type
*/
String getType();
-
+
/**
- * Sets the type of the MediaLink
- *
- * @param type a type
+ * Sets the Media's type.
+ *
+ * @param type is target Media's type
*/
void setType(String type);
Added:
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/StandardLink.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/StandardLink.java?rev=1028478&view=auto
==============================================================================
---
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/StandardLink.java
(added)
+++
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/StandardLink.java
Thu Oct 28 21:03:55 2010
@@ -0,0 +1,80 @@
+/*
+ * 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.
+ */
+package org.apache.shindig.extras.as.opensocial.model;
+
+import org.apache.shindig.protocol.model.Exportablebean;
+import org.apache.shindig.extras.as.core.model.StandardLinkImpl;
+
+import com.google.inject.ImplementedBy;
+
+/*
+ * TODO: comment this class.
+ */
+...@implementedby(StandardLinkImpl.class)
+...@exportablebean
+public interface StandardLink {
+
+ /*
+ * Fields that represent JSON elements for an activity entry.
+ */
+ public static enum Field {
+ HREF("href"),
+ REL("rel"),
+ INLINE("inline"),
+ TYPE("type");
+
+ /*
+ * 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;
+ }
+ }
+
+ String getHref();
+
+ void setHref(String href);
+
+ String getRel();
+
+ void setRel(String rel);
+
+ String getInline();
+
+ void setInline(String inline);
+
+ String getType();
+
+ void setType(String type);
+}
![http://pages.example.org/albums/4433221-tn.png"](http://pages.example.org/albums/4433221-tn.png"){kind=link}
![http://hphotos-snc3.fbcdn.net/hs050.snc3/13734_810445703213_6222631_45135775_1728872_n.jpg"](https://hphotos-snc3.fbcdn.net/hs050.snc3/13734_810445703213_6222631_45135775_1728872_n.jpg"){kind=link}
![http://hphotos-snc3.fbcdn.net/hs143.snc3/17062_828584892133_6222631_45795844_8024804_n.jpg"](https://hphotos-snc3.fbcdn.net/hs143.snc3/17062_828584892133_6222631_45795844_8024804_n.jpg"){kind=link}
![http://hphotos-snc3.fbcdn.net/hs070.snc3/13734_810445668283_6222631_45135772_741359_n.jpg"](https://hphotos-snc3.fbcdn.net/hs070.snc3/13734_810445668283_6222631_45135772_741359_n.jpg"){kind=link}
![http://sphotos.ak.fbcdn.net/hphotos-ak-snc4/hs369.snc4/45245_928217193203_6222631_49412689_3724203_n.jpg"](https://sphotos.ak.fbcdn.net/hphotos-ak-snc4/hs369.snc4/45245_928217193203_6222631_49412689_3724203_n.jpg"){kind=link}
![http://sphotos.ak.fbcdn.net/hphotos-ak-snc3/hs050.snc3/13734_810445788043_6222631_45135783_1591091_n.jpg"](https://sphotos.ak.fbcdn.net/hphotos-ak-snc3/hs050.snc3/13734_810445788043_6222631_45135783_1591091_n.jpg"){kind=link}
![http://hphotos-snc3.fbcdn.net/hs050.snc3/13734_810445758103_6222631_45135780_284612_n.jpg"](https://hphotos-snc3.fbcdn.net/hs050.snc3/13734_810445758103_6222631_45135780_284612_n.jpg"){kind=link}
![http://animals.nationalgeographic.com/staticfiles/NGS/Shared/StaticFiles/animals/images/primary/black-spider-monkey.jpg"](http://animals.nationalgeographic.com/staticfiles/NGS/Shared/StaticFiles/animals/images/primary/black-spider-monkey.jpg"){kind=link}