You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/11/23 18:40:40 UTC
svn commit: r1038218 - in /shindig/trunk: content/sampledata/
extras/src/main/java/org/apache/shindig/extras/as/core/model/
extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/
Author: lindner
Date: Tue Nov 23 17:40:39 2010
New Revision: 1038218
URL: http://svn.apache.org/viewvc?rev=1038218&view=rev
Log:
SHINDIG-1475 | Patch from Eric Woods | ActivityStreams Data Model Update
Modified:
shindig/trunk/content/sampledata/canonicaldb.json
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/core/model/StandardLinkImpl.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
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/StandardLink.java
Modified: shindig/trunk/content/sampledata/canonicaldb.json
URL: http://svn.apache.org/viewvc/shindig/trunk/content/sampledata/canonicaldb.json?rev=1038218&r1=1038217&r2=1038218&view=diff
==============================================================================
--- shindig/trunk/content/sampledata/canonicaldb.json (original)
+++ shindig/trunk/content/sampledata/canonicaldb.json Tue Nov 23 17:40:39 2010
@@ -359,17 +359,21 @@
"displayName": "John Doe"
},
"verb": "post",
+ "standardLinks": {"myRel": [
+ {"href": "www.mypics.com/1", "type": "image/jpg"},
+ {"href": "www.mypics.com/2", "type": "image/jpg"}
+ ]},
"object": {
"id": "myObjectId123",
"displayName": "My Object",
"link": "http://www.myobject.com",
"objectType": "article",
- "media": {
+ "image": {
"url": "http://myvideos.com/raftingtrip/raftingvideo.avi",
"type": "http://activitystrea.ms/schema/1.0/video",
- "width": "400",
- "height": "300",
- "duration": "93"
+ "width": 400,
+ "height": 300,
+ "duration": 93
},
"actionLinks": [{
"target": "http://myvideos.com/raftingvideo",
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=1038218&r1=1038217&r2=1038218&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 Tue Nov 23 17:40:39 2010
@@ -19,9 +19,11 @@
package org.apache.shindig.extras.as.core.model;
import java.util.List;
+import java.util.Map;
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.MediaLink;
import org.apache.shindig.extras.as.opensocial.model.StandardLink;
/**
@@ -30,7 +32,7 @@ import org.apache.shindig.extras.as.open
*/
public class ActivityEntryImpl implements ActivityEntry {
- private String icon;
+ private MediaLink icon;
private String postedTime;
private ActivityObject actor;
private String verb;
@@ -40,7 +42,7 @@ public class ActivityEntryImpl implement
private ActivityObject provider;
private String title;
private String body;
- private List<StandardLink> standardLinks;
+ private Map<String, List<StandardLink>> standardLinks;
private List<String> to;
private List<String> cc;
private List<String> bcc;
@@ -52,12 +54,12 @@ public class ActivityEntryImpl implement
}
/** {@inheritDoc} */
- public String getIcon() {
+ public MediaLink getIcon() {
return icon;
}
/** {@inheritDoc} */
- public void setIcon(String icon) {
+ public void setIcon(MediaLink icon) {
this.icon = icon;
}
@@ -152,12 +154,12 @@ public class ActivityEntryImpl implement
}
/** {@inheritDoc} */
- public List<StandardLink> getStandardLinks() {
+ public Map<String, List<StandardLink>> getStandardLinks() {
return standardLinks;
}
/** {@inheritDoc} */
- public void setStandardLinks(List<StandardLink> standardLinks) {
+ public void setStandardLinks(Map<String, List<StandardLink>> standardLinks) {
this.standardLinks = standardLinks;
}
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=1038218&r1=1038217&r2=1038218&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 Tue Nov 23 17:40:39 2010
@@ -19,6 +19,7 @@
package org.apache.shindig.extras.as.core.model;
import java.util.List;
+import java.util.Map;
import org.apache.shindig.extras.as.opensocial.model.ActionLink;
import org.apache.shindig.extras.as.opensocial.model.ActivityObject;
@@ -34,7 +35,7 @@ public class ActivityObjectImpl implemen
private String id;
private String displayName;
private String summary;
- private MediaLink media;
+ private MediaLink image;
private String link;
private String objectType;
private ActivityObject inReplyTo;
@@ -44,7 +45,7 @@ public class ActivityObjectImpl implemen
private List<ActionLink> actionLinks;
private List<String> upstreamDuplicates;
private List<String> downstreamDuplicates;
- private List<StandardLink> standardLinks;
+ private Map<String, List<StandardLink>> standardLinks;
/**
* A simple implementation of an ActivtyObject
@@ -83,13 +84,13 @@ public class ActivityObjectImpl implemen
}
/** {@inheritDoc} */
- public MediaLink getMedia() {
- return media;
+ public MediaLink getImage() {
+ return image;
}
/** {@inheritDoc} */
- public void setMedia(MediaLink media) {
- this.media = media;
+ public void setImage(MediaLink image) {
+ this.image = image;
}
/** {@inheritDoc} */
@@ -183,12 +184,12 @@ public class ActivityObjectImpl implemen
}
/** {@inheritDoc} */
- public List<StandardLink> getStandardLinks() {
+ public Map<String, List<StandardLink>> getStandardLinks() {
return standardLinks;
}
/** {@inheritDoc} */
- public void setStandardLinks(List<StandardLink> standardLinks) {
+ public void setStandardLinks(Map<String, 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=1038218&r1=1038217&r2=1038218&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 Tue Nov 23 17:40:39 2010
@@ -27,9 +27,9 @@ public class MediaLinkImpl implements Me
private String url;
private String type;
- private String width;
- private String height;
- private String duration;
+ private Integer width;
+ private Integer height;
+ private Integer duration;
/**
* Create a new MediaLink
@@ -58,32 +58,32 @@ public class MediaLinkImpl implements Me
}
/** {@inheritDoc} */
- public String getWidth() {
+ public Integer getWidth() {
return width;
}
/** {@inheritDoc} */
- public void setWidth(String width) {
+ public void setWidth(Integer width) {
this.width = width;
}
/** {@inheritDoc} */
- public String getHeight() {
+ public Integer getHeight() {
return height;
}
/** {@inheritDoc} */
- public void setHeight(String height) {
+ public void setHeight(Integer height) {
this.height = height;
}
/** {@inheritDoc} */
- public String getDuration() {
+ public Integer getDuration() {
return duration;
}
/** {@inheritDoc} */
- public void setDuration(String duration) {
+ public void setDuration(Integer duration) {
this.duration = duration;
}
}
Modified: 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=1038218&r1=1038217&r2=1038218&view=diff
==============================================================================
--- shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/core/model/StandardLinkImpl.java (original)
+++ shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/core/model/StandardLinkImpl.java Tue Nov 23 17:40:39 2010
@@ -26,7 +26,6 @@ import org.apache.shindig.extras.as.open
public class StandardLinkImpl implements StandardLink {
private String href;
- private String rel;
private String inline;
private String type;
@@ -47,16 +46,6 @@ public class StandardLinkImpl implements
}
/** {@inheritDoc} */
- public String getRel() {
- return rel;
- }
-
- /** {@inheritDoc} */
- public void setRel(String rel) {
- this.rel = rel;
- }
-
- /** {@inheritDoc} */
public String getInline() {
return inline;
}
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=1038218&r1=1038217&r2=1038218&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 Tue Nov 23 17:40:39 2010
@@ -19,9 +19,10 @@
package org.apache.shindig.extras.as.opensocial.model;
import java.util.List;
+import java.util.Map;
-import org.apache.shindig.protocol.model.Exportablebean;
import org.apache.shindig.extras.as.core.model.ActivityEntryImpl;
+import org.apache.shindig.protocol.model.Exportablebean;
import com.google.inject.ImplementedBy;
@@ -122,16 +123,16 @@ public interface ActivityEntry {
/**
* <p>getIcon</p>
*
- * @return a {@link java.lang.String} object.
+ * @return a {@link org.apache.shindig.extras.as.opensocial.model.MediaLink} object.
*/
- String getIcon();
+ MediaLink getIcon();
/**
* <p>setIcon</p>
*
- * @param icon a {@link java.lang.String} object.
+ * @param icon a {@link org.apache.shindig.extras.as.opensocial.model.MediaLink} object.
*/
- void setIcon(String icon);
+ void setIcon(MediaLink icon);
/**
* <p>getPostedTime</p>
@@ -262,16 +263,16 @@ public interface ActivityEntry {
/**
* <p>getStandardLinks</p>
*
- * @return a {@link java.util.List} object.
+ * @return a {@link java.util.Map} object.
*/
- List<StandardLink> getStandardLinks();
+ Map<String, List<StandardLink>> getStandardLinks();
/**
* <p>setStandardLinks</p>
*
- * @param standardLinks a {@link java.util.List} object.
+ * @param standardLinks a {@link java.util.Map} object.
*/
- void setStandardLinks(List<StandardLink> standardLinks);
+ void setStandardLinks(Map<String, List<StandardLink>> standardLinks);
/**
* <p>getTo</p>
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=1038218&r1=1038217&r2=1038218&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 Tue Nov 23 17:40:39 2010
@@ -19,9 +19,10 @@
package org.apache.shindig.extras.as.opensocial.model;
import java.util.List;
+import java.util.Map;
-import org.apache.shindig.protocol.model.Exportablebean;
import org.apache.shindig.extras.as.core.model.ActivityObjectImpl;
+import org.apache.shindig.protocol.model.Exportablebean;
import com.google.inject.ImplementedBy;
@@ -39,7 +40,7 @@ public interface ActivityObject {
ID("id"),
DISPLAY_NAME("displayName"),
SUMMARY("summary"),
- MEDIA("media"),
+ IMAGE("image"),
LINK("link"),
OBJECT_TYPE("objectType"),
IN_REPLY_TO("inReplyTo"),
@@ -114,18 +115,18 @@ public interface ActivityObject {
void setSummary(String summary);
/**
- * Get the link to a media item
+ * Get the link to a representative image.
*
* @return a {@link org.apache.shindig.extras.as.opensocial.model.MediaLink} object.
*/
- MediaLink getMedia();
+ MediaLink getImage();
/**
- * Set the link to a media item
+ * Set the link to a representative image.
*
- * @param media a {@link org.apache.shindig.extras.as.opensocial.model.MediaLink} object.
+ * @param image a {@link org.apache.shindig.extras.as.opensocial.model.MediaLink} object.
*/
- void setMedia(MediaLink media);
+ void setImage(MediaLink image);
/**
* Get the permanent link
@@ -256,14 +257,14 @@ public interface ActivityObject {
/**
* Return the Object's StandardLinks
*
- * @return List<StandardLink> is the list of StandardLinks
+ * @return Map<String, List<StandardLink>> is the list of StandardLinks
*/
- List<StandardLink> getStandardLinks();
+ Map<String, List<StandardLink>> getStandardLinks();
/**
* Set the standard link string
*
- * @param standardLinks the standard link
+ * @param standardLinks the list of standard links
*/
- void setStandardLinks(List<StandardLink> standardLinks);
+ void setStandardLinks(Map<String, 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=1038218&r1=1038217&r2=1038218&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 Tue Nov 23 17:40:39 2010
@@ -17,8 +17,9 @@
*/
package org.apache.shindig.extras.as.opensocial.model;
-import org.apache.shindig.protocol.model.Exportablebean;
import org.apache.shindig.extras.as.core.model.MediaLinkImpl;
+import org.apache.shindig.protocol.model.Exportablebean;
+
import com.google.inject.ImplementedBy;
/*
@@ -97,42 +98,42 @@ public interface MediaLink {
/**
* <p>getWidth</p>
*
- * @return a {@link java.lang.String} object.
+ * @return Integer the target's width
*/
- String getWidth();
+ Integer getWidth();
/**
* Sets the Width of this mediaLink
*
- * @param width a width
+ * @param width is the target's width
*/
- void setWidth(String width);
+ void setWidth(Integer width);
/**
* Sets the Height of this mediaLink
*
- * @return a height
+ * @return Integer the target's height
*/
- String getHeight();
+ Integer getHeight();
/**
* Sets the Height of this mediaLink
*
- * @param height a height
+ * @param height is the target's height
*/
- void setHeight(String height);
+ void setHeight(Integer height);
/**
* Returns the duration of this mediaLink
*
- * @return a duration
+ * @return Integer is the target's duration
*/
- String getDuration();
+ Integer getDuration();
/**
* Sets the duration of this mediaLink
*
- * @param duration a duration
+ * @param duration is the target's duration
*/
- void setDuration(String duration);
+ void setDuration(Integer duration);
}
Modified: 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=1038218&r1=1038217&r2=1038218&view=diff
==============================================================================
--- shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/StandardLink.java (original)
+++ shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/StandardLink.java Tue Nov 23 17:40:39 2010
@@ -17,8 +17,8 @@
*/
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 org.apache.shindig.protocol.model.Exportablebean;
import com.google.inject.ImplementedBy;
@@ -34,7 +34,6 @@ public interface StandardLink {
*/
public static enum Field {
HREF("href"),
- REL("rel"),
INLINE("inline"),
TYPE("type");
@@ -65,10 +64,6 @@ public interface StandardLink {
String getHref();
void setHref(String href);
-
- String getRel();
-
- void setRel(String rel);
String getInline();