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/09/07 10:02:18 UTC
svn commit: r993268 [7/8] - in /shindig/branches/2.0.x: ./ config/
content/container/ content/samplecontainer/ content/sampledata/
extras/src/main/java/org/apache/shindig/extras/
extras/src/main/java/org/apache/shindig/extras/as/ extras/src/main/java/o...
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/ActivityImpl.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/ActivityImpl.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/ActivityImpl.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/ActivityImpl.java Tue Sep 7 08:02:11 2010
@@ -24,6 +24,9 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
+/**
+ * Default implementation of an {@link org.apache.shindig.social.opensocial.model.Activity}
+ */
public class ActivityImpl implements Activity {
private String appId;
@@ -100,6 +103,7 @@ public class ActivityImpl implements Act
return new Date(updated.getTime());
}
+ /** {@inheritDoc} */
public void setUpdated(Date updated) {
if (updated == null) {
this.updated = null;
@@ -112,6 +116,7 @@ public class ActivityImpl implements Act
return mediaItems;
}
+ /** {@inheritDoc} */
public void setMediaItems(List<MediaItem> mediaItems) {
this.mediaItems = mediaItems;
}
@@ -120,6 +125,7 @@ public class ActivityImpl implements Act
return postedTime;
}
+ /** {@inheritDoc} */
public void setPostedTime(Long postedTime) {
this.postedTime = postedTime;
}
@@ -128,6 +134,7 @@ public class ActivityImpl implements Act
return priority;
}
+ /** {@inheritDoc} */
public void setPriority(Float priority) {
this.priority = priority;
}
@@ -136,6 +143,7 @@ public class ActivityImpl implements Act
return streamFaviconUrl;
}
+ /** {@inheritDoc} */
public void setStreamFaviconUrl(String streamFaviconUrl) {
this.streamFaviconUrl = streamFaviconUrl;
}
@@ -144,6 +152,7 @@ public class ActivityImpl implements Act
return streamSourceUrl;
}
+ /** {@inheritDoc} */
public void setStreamSourceUrl(String streamSourceUrl) {
this.streamSourceUrl = streamSourceUrl;
}
@@ -152,6 +161,7 @@ public class ActivityImpl implements Act
return streamTitle;
}
+ /** {@inheritDoc} */
public void setStreamTitle(String streamTitle) {
this.streamTitle = streamTitle;
}
@@ -160,6 +170,7 @@ public class ActivityImpl implements Act
return streamUrl;
}
+ /** {@inheritDoc} */
public void setStreamUrl(String streamUrl) {
this.streamUrl = streamUrl;
}
@@ -168,6 +179,7 @@ public class ActivityImpl implements Act
return templateParams;
}
+ /** {@inheritDoc} */
public void setTemplateParams(Map<String, String> templateParams) {
this.templateParams = templateParams;
}
@@ -176,6 +188,7 @@ public class ActivityImpl implements Act
return title;
}
+ /** {@inheritDoc} */
public void setTitle(String title) {
this.title = title;
}
@@ -184,6 +197,7 @@ public class ActivityImpl implements Act
return titleId;
}
+ /** {@inheritDoc} */
public void setTitleId(String titleId) {
this.titleId = titleId;
}
@@ -192,6 +206,7 @@ public class ActivityImpl implements Act
return url;
}
+ /** {@inheritDoc} */
public void setUrl(String url) {
this.url = url;
}
@@ -200,6 +215,7 @@ public class ActivityImpl implements Act
return userId;
}
+ /** {@inheritDoc} */
public void setUserId(String userId) {
this.userId = userId;
}
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/AddressImpl.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/AddressImpl.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/AddressImpl.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/AddressImpl.java Tue Sep 7 08:02:11 2010
@@ -19,6 +19,9 @@ package org.apache.shindig.social.core.m
import org.apache.shindig.social.opensocial.model.Address;
+/**
+ * Default representation of an {@link org.apache.shindig.social.opensocial.model.Address}
+ */
public class AddressImpl implements Address {
private String country;
private Float latitude;
@@ -41,6 +44,7 @@ public class AddressImpl implements Addr
return country;
}
+ /** {@inheritDoc} */
public void setCountry(String country) {
this.country = country;
}
@@ -49,6 +53,7 @@ public class AddressImpl implements Addr
return latitude;
}
+ /** {@inheritDoc} */
public void setLatitude(Float latitude) {
this.latitude = latitude;
}
@@ -57,6 +62,7 @@ public class AddressImpl implements Addr
return locality;
}
+ /** {@inheritDoc} */
public void setLocality(String locality) {
this.locality = locality;
}
@@ -65,6 +71,7 @@ public class AddressImpl implements Addr
return longitude;
}
+ /** {@inheritDoc} */
public void setLongitude(Float longitude) {
this.longitude = longitude;
}
@@ -73,6 +80,7 @@ public class AddressImpl implements Addr
return postalCode;
}
+ /** {@inheritDoc} */
public void setPostalCode(String postalCode) {
this.postalCode = postalCode;
}
@@ -81,6 +89,7 @@ public class AddressImpl implements Addr
return region;
}
+ /** {@inheritDoc} */
public void setRegion(String region) {
this.region = region;
}
@@ -89,6 +98,7 @@ public class AddressImpl implements Addr
return streetAddress;
}
+ /** {@inheritDoc} */
public void setStreetAddress(String streetAddress) {
this.streetAddress = streetAddress;
}
@@ -97,6 +107,7 @@ public class AddressImpl implements Addr
return type;
}
+ /** {@inheritDoc} */
public void setType(String type) {
this.type = type;
}
@@ -105,6 +116,7 @@ public class AddressImpl implements Addr
return formatted;
}
+ /** {@inheritDoc} */
public void setFormatted(String formatted) {
this.formatted = formatted;
}
@@ -113,6 +125,7 @@ public class AddressImpl implements Addr
return primary;
}
+ /** {@inheritDoc} */
public void setPrimary(Boolean primary) {
this.primary = primary;
}
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/AlbumImpl.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/AlbumImpl.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/AlbumImpl.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/AlbumImpl.java Tue Sep 7 08:02:11 2010
@@ -24,7 +24,9 @@ import org.apache.shindig.social.opensoc
import java.util.List;
/**
- * Default Implementation of the Album object in the model.
+ * Default Implementation of the {@link org.apache.shindig.social.opensocial.model.Album} object in the model.
+ *
+ * @since 2.0.0
*/
public class AlbumImpl implements Album {
private String description;
@@ -44,6 +46,7 @@ public class AlbumImpl implements Album
return description;
}
+ /** {@inheritDoc} */
public void setDescription(String description) {
this.description = description;
}
@@ -52,6 +55,7 @@ public class AlbumImpl implements Album
return id;
}
+ /** {@inheritDoc} */
public void setId(String id) {
this.id = id;
}
@@ -60,6 +64,7 @@ public class AlbumImpl implements Album
return location;
}
+ /** {@inheritDoc} */
public void setLocation(Address location) {
this.location = location;
}
@@ -68,6 +73,7 @@ public class AlbumImpl implements Album
return mediaItemCount;
}
+ /** {@inheritDoc} */
public void setMediaItemCount(Integer mediaItemCount) {
this.mediaItemCount = mediaItemCount;
}
@@ -76,6 +82,7 @@ public class AlbumImpl implements Album
return mediaMimeType;
}
+ /** {@inheritDoc} */
public void setMediaMimeType(List<String> mediaMimeType) {
this.mediaMimeType = mediaMimeType;
}
@@ -84,6 +91,7 @@ public class AlbumImpl implements Album
return mediaType;
}
+ /** {@inheritDoc} */
public void setMediaType(List<MediaItem.Type> mediaType) {
this.mediaType = mediaType;
}
@@ -92,6 +100,7 @@ public class AlbumImpl implements Album
return ownerId;
}
+ /** {@inheritDoc} */
public void setOwnerId(String ownerId) {
this.ownerId = ownerId;
}
@@ -100,6 +109,7 @@ public class AlbumImpl implements Album
return thumbnailUrl;
}
+ /** {@inheritDoc} */
public void setThumbnailUrl(String thumbnailUrl) {
this.thumbnailUrl = thumbnailUrl;
}
@@ -108,6 +118,7 @@ public class AlbumImpl implements Album
return title;
}
+ /** {@inheritDoc} */
public void setTitle(String title) {
this.title = title;
}
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/BodyTypeImpl.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/BodyTypeImpl.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/BodyTypeImpl.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/BodyTypeImpl.java Tue Sep 7 08:02:11 2010
@@ -23,7 +23,6 @@ import org.apache.shindig.social.opensoc
* see
* <a href="http://www.opensocial.org/Technical-Resources/opensocial-spec-v081/opensocial-reference#opensocial.BodyType">
* http://www.opensocial.org/Technical-Resources/opensocial-spec-v081/opensocial-reference#opensocial.BodyType</a>.
- *
*/
public class BodyTypeImpl implements BodyType {
@@ -37,6 +36,7 @@ public class BodyTypeImpl implements Bod
return build;
}
+ /** {@inheritDoc} */
public void setBuild(String build) {
this.build = build;
}
@@ -45,6 +45,7 @@ public class BodyTypeImpl implements Bod
return eyeColor;
}
+ /** {@inheritDoc} */
public void setEyeColor(String eyeColor) {
this.eyeColor = eyeColor;
}
@@ -53,6 +54,7 @@ public class BodyTypeImpl implements Bod
return hairColor;
}
+ /** {@inheritDoc} */
public void setHairColor(String hairColor) {
this.hairColor = hairColor;
}
@@ -61,6 +63,7 @@ public class BodyTypeImpl implements Bod
return height;
}
+ /** {@inheritDoc} */
public void setHeight(Float height) {
this.height = height;
}
@@ -69,6 +72,7 @@ public class BodyTypeImpl implements Bod
return weight;
}
+ /** {@inheritDoc} */
public void setWeight(Float weight) {
this.weight = weight;
}
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/ListFieldImpl.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/ListFieldImpl.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/ListFieldImpl.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/ListFieldImpl.java Tue Sep 7 08:02:11 2010
@@ -19,6 +19,9 @@ package org.apache.shindig.social.core.m
import org.apache.shindig.social.opensocial.model.ListField;
+/**
+ * ListField data structure
+ */
public class ListFieldImpl implements ListField {
private String type;
private String value;
@@ -35,6 +38,7 @@ public class ListFieldImpl implements Li
return type;
}
+ /** {@inheritDoc} */
public void setType(String type) {
this.type = type;
}
@@ -43,6 +47,7 @@ public class ListFieldImpl implements Li
return value;
}
+ /** {@inheritDoc} */
public void setValue(String value) {
this.value = value;
}
@@ -51,6 +56,7 @@ public class ListFieldImpl implements Li
return primary;
}
+ /** {@inheritDoc} */
public void setPrimary(Boolean primary) {
this.primary = primary;
}
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/MediaItemImpl.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/MediaItemImpl.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/MediaItemImpl.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/MediaItemImpl.java Tue Sep 7 08:02:11 2010
@@ -24,7 +24,6 @@ import org.apache.shindig.social.opensoc
* see
* <a href="http://www.opensocial.org/Technical-Resources/opensocial-spec-v09/OpenSocial-Specification.html#opensocial.MediaItem.Field">
* opensocial.MediaItem.Field</a>
- *
*/
public class MediaItemImpl implements MediaItem {
private String albumId;
@@ -62,6 +61,7 @@ public class MediaItemImpl implements Me
return mimeType;
}
+ /** {@inheritDoc} */
public void setMimeType(String mimeType) {
this.mimeType = mimeType;
}
@@ -78,6 +78,7 @@ public class MediaItemImpl implements Me
return url;
}
+ /** {@inheritDoc} */
public void setUrl(String url) {
this.url = url;
}
@@ -86,6 +87,7 @@ public class MediaItemImpl implements Me
return this.thumbnailUrl;
}
+ /** {@inheritDoc} */
public void setThumbnailUrl(String url) {
this.thumbnailUrl = url;
}
@@ -94,6 +96,7 @@ public class MediaItemImpl implements Me
return albumId;
}
+ /** {@inheritDoc} */
public void setAlbumId(String albumId) {
this.albumId = albumId;
}
@@ -102,6 +105,7 @@ public class MediaItemImpl implements Me
return created;
}
+ /** {@inheritDoc} */
public void setCreated(String created) {
this.created = created;
}
@@ -110,6 +114,7 @@ public class MediaItemImpl implements Me
return description;
}
+ /** {@inheritDoc} */
public void setDescription(String description) {
this.description = description;
}
@@ -118,6 +123,7 @@ public class MediaItemImpl implements Me
return duration;
}
+ /** {@inheritDoc} */
public void setDuration(String duration) {
this.duration = duration;
}
@@ -126,6 +132,7 @@ public class MediaItemImpl implements Me
return fileSize;
}
+ /** {@inheritDoc} */
public void setFileSize(String fileSize) {
this.fileSize = fileSize;
}
@@ -134,6 +141,7 @@ public class MediaItemImpl implements Me
return id;
}
+ /** {@inheritDoc} */
public void setId(String id) {
this.id = id;
}
@@ -142,6 +150,7 @@ public class MediaItemImpl implements Me
return language;
}
+ /** {@inheritDoc} */
public void setLanguage(String language) {
this.language = language;
}
@@ -150,6 +159,7 @@ public class MediaItemImpl implements Me
return lastUpdated;
}
+ /** {@inheritDoc} */
public void setLastUpdated(String lastUpdated) {
this.lastUpdated = lastUpdated;
}
@@ -158,6 +168,7 @@ public class MediaItemImpl implements Me
return location;
}
+ /** {@inheritDoc} */
public void setLocation(Address location) {
this.location = location;
}
@@ -166,6 +177,7 @@ public class MediaItemImpl implements Me
return numComments;
}
+ /** {@inheritDoc} */
public void setNumComments(String numComments) {
this.numComments = numComments;
}
@@ -174,6 +186,7 @@ public class MediaItemImpl implements Me
return numViews;
}
+ /** {@inheritDoc} */
public void setNumViews(String numViews) {
this.numViews = numViews;
}
@@ -182,6 +195,7 @@ public class MediaItemImpl implements Me
return numVotes;
}
+ /** {@inheritDoc} */
public void setNumVotes(String numVotes) {
this.numVotes = numVotes;
}
@@ -190,6 +204,7 @@ public class MediaItemImpl implements Me
return rating;
}
+ /** {@inheritDoc} */
public void setRating(String rating) {
this.rating = rating;
}
@@ -198,6 +213,7 @@ public class MediaItemImpl implements Me
return startTime;
}
+ /** {@inheritDoc} */
public void setStartTime(String startTime) {
this.startTime = startTime;
}
@@ -206,6 +222,7 @@ public class MediaItemImpl implements Me
return taggedPeople;
}
+ /** {@inheritDoc} */
public void setTaggedPeople(String taggedPeople) {
this.taggedPeople = taggedPeople;
}
@@ -214,6 +231,7 @@ public class MediaItemImpl implements Me
return tags;
}
+ /** {@inheritDoc} */
public void setTags(String tags) {
this.tags = tags;
}
@@ -221,6 +239,7 @@ public class MediaItemImpl implements Me
public String getTitle() {
return title;
}
+ /** {@inheritDoc} */
public void setTitle(String title) {
this.title = title;
}
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/MessageCollectionImpl.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/MessageCollectionImpl.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/MessageCollectionImpl.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/MessageCollectionImpl.java Tue Sep 7 08:02:11 2010
@@ -23,6 +23,9 @@ import org.apache.shindig.social.opensoc
import java.util.Date;
import java.util.List;
+/**
+ * Default representation of a MessageCollection
+ */
public class MessageCollectionImpl implements MessageCollection {
private String id;
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/MessageImpl.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/MessageImpl.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/MessageImpl.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/MessageImpl.java Tue Sep 7 08:02:11 2010
@@ -23,6 +23,9 @@ import java.util.Date;
import org.apache.shindig.social.opensocial.model.Message;
import org.apache.shindig.social.opensocial.model.Url;
+/**
+ * Default implementation for a {@link org.apache.shindig.social.opensocial.model.Message}
+ */
public final class MessageImpl implements Message {
private String appUrl;
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/NameImpl.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/NameImpl.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/NameImpl.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/NameImpl.java Tue Sep 7 08:02:11 2010
@@ -19,6 +19,9 @@ package org.apache.shindig.social.core.m
import org.apache.shindig.social.opensocial.model.Name;
+/**
+ * Default implementation of the {@link org.apache.shindig.social.opensocial.model.Name} model.
+ */
public class NameImpl implements Name {
private String additionalName;
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/OrganizationImpl.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/OrganizationImpl.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/OrganizationImpl.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/OrganizationImpl.java Tue Sep 7 08:02:11 2010
@@ -22,6 +22,9 @@ import org.apache.shindig.social.opensoc
import java.util.Date;
+/**
+ * Default implementation of an Organization
+ */
public class OrganizationImpl implements Organization {
private Address address;
private String description;
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationHandlerProvider.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationHandlerProvider.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationHandlerProvider.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationHandlerProvider.java Tue Sep 7 08:02:11 2010
@@ -27,6 +27,9 @@ import org.apache.shindig.auth.UrlParame
import java.util.List;
+/**
+ * Guice provider of an ordered list of Auntentication Providers
+ */
public class AuthenticationHandlerProvider implements Provider<List<AuthenticationHandler>> {
protected List<AuthenticationHandler> handlers;
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthSecurityToken.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthSecurityToken.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthSecurityToken.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthSecurityToken.java Tue Sep 7 08:02:11 2010
@@ -21,6 +21,9 @@ import org.apache.shindig.auth.AbstractS
import org.apache.shindig.auth.AuthenticationMode;
import org.apache.shindig.auth.SecurityToken;
+/**
+ * A SecurityToken that represents two/three legged OAuth requests
+ */
public class OAuthSecurityToken extends AbstractSecurityToken implements SecurityToken {
private final String userId;
private final String appUrl;
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java Tue Sep 7 08:02:11 2010
@@ -74,7 +74,6 @@ import java.util.Map;
* </msg>
* </messagebundle>
* </pre></code>
- *
*/
@ImplementedBy(ActivityImpl.class)
@Exportablebean
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java Tue Sep 7 08:02:11 2010
@@ -31,7 +31,6 @@ import com.google.inject.ImplementedBy;
* Base interface for all address objects
* see <a href="http://www.opensocial.org/Technical-Resources/opensocial-spec-v081/opensocial-reference#opensocial.Address">
* http://www.opensocial.org/Technical-Resources/opensocial-spec-v081/opensocial-reference#opensocial.Address</a>.
- *
*/
@ImplementedBy(AddressImpl.class)
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Album.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Album.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Album.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Album.java Tue Sep 7 08:02:11 2010
@@ -27,12 +27,14 @@ import java.util.List;
/**
* <p>
* The Album API describes the collection of MediaItems of images, movies, and audio.
- * </p>
+ * </p>
* <p>
* Please see <a href="http://www.opensocial.org/Technical-Resources/opensocial-spec-v09/OpenSocial-Specification.html#opensocial.Album.Field">
* http://www.opensocial.org/Technical-Resources/opensocial-spec-v09/OpenSocial-Specification.html#opensocial.Album.Field</a>
* for details about the supported fields.
* </p>
+ *
+ * @since 2.0.0
*/
@ImplementedBy(AlbumImpl.class)
@Exportablebean
@@ -107,7 +109,7 @@ public interface Album {
/**
* Get address location of this album.
- *
+ *
* @return an Address specifying the location of this album.
*/
Address getLocation();
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java Tue Sep 7 08:02:11 2010
@@ -26,7 +26,6 @@ import com.google.inject.ImplementedBy;
* Base interface for all body type objects. see
* <a href="http://www.opensocial.org/Technical-Resources/opensocial-spec-v081/opensocial-reference#opensocial.Person.Field.BODY_TYPE">
* http://www.opensocial.org/Technical-Resources/opensocial-spec-v081/opensocial-reference#opensocial.Person.Field.BODY_TYPE</a>
- *
*/
@ImplementedBy(BodyTypeImpl.class)
@Exportablebean
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Drinker.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Drinker.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Drinker.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Drinker.java Tue Sep 7 08:02:11 2010
@@ -18,7 +18,7 @@
package org.apache.shindig.social.opensocial.model;
/**
- * public java.lang.Enum for opensocial.Enum.Drinker.
+ * public java.lang.Enum for opensocial.Enum.Drinker.
*/
public enum Drinker implements org.apache.shindig.protocol.model.Enum.EnumKey {
/** Heavy drinker. */
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/LookingFor.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/LookingFor.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/LookingFor.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/LookingFor.java Tue Sep 7 08:02:11 2010
@@ -18,7 +18,7 @@
package org.apache.shindig.social.opensocial.model;
/**
- * public java.lang.Enum for opensocial.Enum.LookingFor.
+ * public java.lang.Enum for opensocial.Enum.LookingFor.
*/
public enum LookingFor implements org.apache.shindig.protocol.model.Enum.EnumKey {
/** Interested in dating. */
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MessageCollection.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MessageCollection.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MessageCollection.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MessageCollection.java Tue Sep 7 08:02:11 2010
@@ -25,12 +25,10 @@ import java.util.Set;
import java.util.Date;
/**
- *
* Base interface for all message collection objects.
*
* see
* http://code.google.com/apis/opensocial/docs/0.7/reference/opensocial.MessageCollection.html
- *
*/
@ImplementedBy(MessageCollectionImpl.class)
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java Tue Sep 7 08:02:11 2010
@@ -27,7 +27,6 @@ import com.google.inject.ImplementedBy;
* see
* <a href="http://www.opensocial.org/Technical-Resources/opensocial-spec-v081/opensocial-reference#opensocial.Name">
* http://www.opensocial.org/Technical-Resources/opensocial-spec-v081/opensocial-reference#opensocial.Name</a>
- *
*/
@ImplementedBy(NameImpl.class)
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/NetworkPresence.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/NetworkPresence.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/NetworkPresence.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/NetworkPresence.java Tue Sep 7 08:02:11 2010
@@ -18,7 +18,7 @@
package org.apache.shindig.social.opensocial.model;
/**
- * public java.lang.Enum for opensocial.Enum.NetworkPresence.
+ * public java.lang.Enum for opensocial.Enum.NetworkPresence.
*/
public enum NetworkPresence implements org.apache.shindig.protocol.model.Enum.EnumKey {
/** Currently Online. */
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java Tue Sep 7 08:02:11 2010
@@ -31,7 +31,6 @@ import java.util.Date;
*
* see <a href="http://www.opensocial.org/Technical-Resources/opensocial-spec-v081/opensocial-reference#opensocial.Organization">
* http://www.opensocial.org/Technical-Resources/opensocial-spec-v081/opensocial-reference#opensocial.Organization</a>
- *
*/
@ImplementedBy(OrganizationImpl.class)
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Url.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Url.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Url.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Url.java Tue Sep 7 08:02:11 2010
@@ -64,12 +64,14 @@ public interface Url extends ListField {
/**
* Get the text associated with the link.
+ *
* @return the link text
*/
String getLinkText();
/**
* Set the Link text associated with the link.
+ *
* @param linkText the link text
*/
void setLinkText(String linkText);
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthDataStore.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthDataStore.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthDataStore.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthDataStore.java Tue Sep 7 08:02:11 2010
@@ -28,7 +28,6 @@ import org.apache.shindig.auth.SecurityT
* access tokens, and providing a way to upgrade tokens to
* authorized values.
*/
-
public interface OAuthDataStore {
/**
* Get the OAuthEntry that corresponds to the oauthToken.
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java Tue Sep 7 08:02:11 2010
@@ -37,6 +37,9 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.Future;
+/**
+ * Rest/RPC handler for all activites related requests
+ */
@Service(name = "activities", path="/{userId}+/{groupId}/{appId}/{activityId}+")
public class ActivityHandler {
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java Tue Sep 7 08:02:11 2010
@@ -32,6 +32,9 @@ import javax.servlet.http.HttpServletRes
import com.google.inject.Inject;
+/**
+ * Handles REST/RPC requests for AppData
+ */
@Service(name = "appdata", path = "/{userId}+/{groupId}/{appId}")
public class AppDataHandler {
Copied: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MediaItemHandler.java (from r993179, shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MediaItemHandler.java)
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MediaItemHandler.java?p2=shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MediaItemHandler.java&p1=shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MediaItemHandler.java&r1=993179&r2=993268&rev=993268&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MediaItemHandler.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MediaItemHandler.java Tue Sep 7 08:02:11 2010
@@ -43,10 +43,10 @@ public class MediaItemHandler {
*
* Allowed end-points: /mediaItems/{userId}+/{groupId}/{albumId}/{mediaItemId}+
*
- * Examples: /mediaItems/john.doe/@self
- * /mediaItems/john.doe,jane.doe/@self
- * /mediaItems/john.doe/@self/album123
- * /mediaItems/john.doe/@self/album123/1,2,3
+ * Examples: /mediaItems/john.doe/@self
+ * /mediaItems/john.doe,jane.doe/@self
+ * /mediaItems/john.doe/@self/album123
+ * /mediaItems/john.doe/@self/album123/1,2,3
*/
@Operation(httpMethods = "GET")
public Future<?> get(SocialRequestItem request) throws ProtocolException {
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MessageHandler.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MessageHandler.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MessageHandler.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MessageHandler.java Tue Sep 7 08:02:11 2010
@@ -35,6 +35,9 @@ import javax.servlet.http.HttpServletRes
import com.google.inject.Inject;
+/**
+ * RPC/REST handler for all Messages requests
+ */
@Service(name = "messages", path="/{userId}+/{msgCollId}/{messageIds}+")
public class MessageHandler {
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java Tue Sep 7 08:02:11 2010
@@ -39,6 +39,9 @@ import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Inject;
+/**
+ * RPC/REST handler for all /people requests
+ */
@Service(name = "people", path = "/{userId}+/{groupId}/{personId}+")
public class PersonHandler {
private final PersonService personService;
Copied: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AlbumService.java (from r993179, shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AlbumService.java)
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AlbumService.java?p2=shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AlbumService.java&p1=shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AlbumService.java&r1=993179&r2=993268&rev=993268&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AlbumService.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AlbumService.java Tue Sep 7 08:02:11 2010
@@ -40,11 +40,11 @@ public interface AlbumService {
/*
* Retrieves a single album for the given user with the given album ID.
*
- * @param userId Identifies the person to retrieve the album from
- * @param appId Identifies the application to retrieve the album from
- * @param fields Indicates the fields to return. Empty set implies all
- * @param albumId Identifies the album to retrieve
- * @param token A valid SecurityToken
+ * @param userId Identifies the person to retrieve the album from
+ * @param appId Identifies the application to retrieve the album from
+ * @param fields Indicates the fields to return. Empty set implies all
+ * @param albumId Identifies the album to retrieve
+ * @param token A valid SecurityToken
*
* @return a response item with the requested album
*/
@@ -54,12 +54,12 @@ public interface AlbumService {
/*
* Retrieves albums for the given user with the given album IDs.
*
- * @param userId Identifies the person to retrieve albums for
- * @param appId Identifies the application to retrieve albums from
- * @param fields The fields to return; empty set implies all
- * @param options The sorting/filtering/pagination options
- * @param albumIds The set of album ids to fetch
- * @param token A valid SecurityToken
+ * @param userId Identifies the person to retrieve albums for
+ * @param appId Identifies the application to retrieve albums from
+ * @param fields The fields to return; empty set implies all
+ * @param options The sorting/filtering/pagination options
+ * @param albumIds The set of album ids to fetch
+ * @param token A valid SecurityToken
*
* @return a response item with requested albums
*/
@@ -70,12 +70,12 @@ public interface AlbumService {
/*
* Retrieves albums for the given user and group.
*
- * @param userIds Identifies the users to retrieve albums from
- * @param groupId Identifies the group to retrieve albums from
- * @param appId Identifies the application to retrieve albums from
- * @param fields The fields to return. Empty set implies all
- * @param options The sorting/filtering/pagination options
- * @param token A valid SecurityToken
+ * @param userIds Identifies the users to retrieve albums from
+ * @param groupId Identifies the group to retrieve albums from
+ * @param appId Identifies the application to retrieve albums from
+ * @param fields The fields to return. Empty set implies all
+ * @param options The sorting/filtering/pagination options
+ * @param token A valid SecurityToken
*
* @return a response item with the requested albums
*/
@@ -87,10 +87,10 @@ public interface AlbumService {
/*
* Deletes a single album for the given user with the given album ID.
*
- * @param userId Identifies the user to delete the album from
- * @param appId Identifies the application to delete the album from
- * @param albumId Identifies the album to delete
- * @param token A valid SecurityToken
+ * @param userId Identifies the user to delete the album from
+ * @param appId Identifies the application to delete the album from
+ * @param albumId Identifies the album to delete
+ * @param token A valid SecurityToken
*
* @return a response item containing any errors
*/
@@ -100,10 +100,10 @@ public interface AlbumService {
/*
* Creates an album for the given user.
*
- * @param userId Identifies the user to create the album for
- * @param appId Identifies the application to create the album in
- * @param album The album to create
- * @param token A valid SecurityToken
+ * @param userId Identifies the user to create the album for
+ * @param appId Identifies the application to create the album in
+ * @param album The album to create
+ * @param token A valid SecurityToken
*
* @return a response containing any errors
*/
@@ -114,11 +114,11 @@ public interface AlbumService {
* Updates an album for the given user. The album ID specified in the REST
* end-point is used, even if the album also defines an ID.
*
- * @param userId Identifies the user to update the album for
- * @param appId Identifies the application to update the album in
- * @param album Defines the updated album
- * @param albumId Identifies the ID of the album to update
- * @param token A valid SecurityToken
+ * @param userId Identifies the user to update the album for
+ * @param appId Identifies the application to update the album in
+ * @param album Defines the updated album
+ * @param albumId Identifies the ID of the album to update
+ * @param token A valid SecurityToken
*
* @return a response containing any errors
*/
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/CollectionOptions.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/CollectionOptions.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/CollectionOptions.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/CollectionOptions.java Tue Sep 7 08:02:11 2010
@@ -25,6 +25,9 @@ import com.google.common.base.Objects;
import java.util.Date;
+/**
+ * Data structure representing many of the RPC/REST requests we receive.
+ */
public class CollectionOptions {
private String sortBy;
private SortOrder sortOrder;
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java Tue Sep 7 08:02:11 2010
@@ -22,6 +22,9 @@ import com.google.common.base.Objects;
import java.util.Map;
+/**
+ * A group id used for grouping of people resources (as opposed to groups used by the GroupsHandler)
+ */
public class GroupId {
public enum Type {
all, friends, self, deleted, groupId;
Copied: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MediaItemService.java (from r993179, shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MediaItemService.java)
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MediaItemService.java?p2=shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MediaItemService.java&p1=shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MediaItemService.java&r1=993179&r2=993268&rev=993268&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MediaItemService.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MediaItemService.java Tue Sep 7 08:02:11 2010
@@ -21,12 +21,12 @@ public interface MediaItemService {
/*
* Retrieves a MediaItem by ID.
*
- * @param userId Identifies the owner of the MediaItem to retrieve
- * @param appId Identifies the application of the MeiaItem to retrieve
- * @param albumId Identifies the album containing the MediaItem
- * @param mediaItemId Identifies the MediaItem to retrieve
- * @param fields Indicates fields to be returned; empty set implies all
- * @param token A valid SecurityToken
+ * @param userId Identifies the owner of the MediaItem to retrieve
+ * @param appId Identifies the application of the MeiaItem to retrieve
+ * @param albumId Identifies the album containing the MediaItem
+ * @param mediaItemId Identifies the MediaItem to retrieve
+ * @param fields Indicates fields to be returned; empty set implies all
+ * @param token A valid SecurityToken
*
* @return a response item with the requested MediaItem
*/
@@ -37,13 +37,13 @@ public interface MediaItemService {
/*
* Retrieves MediaItems by IDs.
*
- * @param userId Identifies the owner of the MediaItems
- * @param appId Identifies the application of the MediaItems
- * @param albumId Identifies the album containing the MediaItems
- * @param mediaItemIds Identifies the MediaItems to retrieve
- * @param fields Specifies the fields to return; empty set implies all
- * @param options Sorting/filtering/pagination options
- * @param token A valid SecurityToken
+ * @param userId Identifies the owner of the MediaItems
+ * @param appId Identifies the application of the MediaItems
+ * @param albumId Identifies the album containing the MediaItems
+ * @param mediaItemIds Identifies the MediaItems to retrieve
+ * @param fields Specifies the fields to return; empty set implies all
+ * @param options Sorting/filtering/pagination options
+ * @param token A valid SecurityToken
*
* @return a response item with the requested MediaItems
*/
@@ -55,12 +55,12 @@ public interface MediaItemService {
/*
* Retrieves MediaItems by Album.
*
- * @param userId Identifies the owner of the MediaItems
- * @param appId Identifies the application of the MediaItems
- * @param albumId Identifies the Album containing the MediaItems
- * @param fields Specifies the fields to return; empty set implies all
- * @param options Sorting/filtering/pagination options
- * @param token A valid SecurityToken
+ * @param userId Identifies the owner of the MediaItems
+ * @param appId Identifies the application of the MediaItems
+ * @param albumId Identifies the Album containing the MediaItems
+ * @param fields Specifies the fields to return; empty set implies all
+ * @param options Sorting/filtering/pagination options
+ * @param token A valid SecurityToken
*
* @return a response item with the requested MediaItems
*/
@@ -72,12 +72,12 @@ public interface MediaItemService {
/*
* Retrieves MediaItems by users and groups.
*
- * @param userIds Identifies the users that this request is relative to
- * @param groupId Identifies the users' groups to retrieve MediaItems from
- * @param appId Identifies the application to retrieve MediaItems from
- * @param fields The fields to return; empty set implies all
- * @param options Sorting/filtering/pagination options
- * @param token A valid SecurityToken
+ * @param userIds Identifies the users that this request is relative to
+ * @param groupId Identifies the users' groups to retrieve MediaItems from
+ * @param appId Identifies the application to retrieve MediaItems from
+ * @param fields The fields to return; empty set implies all
+ * @param options Sorting/filtering/pagination options
+ * @param token A valid SecurityToken
*
* @return a response item with the requested MediaItems
*/
@@ -89,11 +89,11 @@ public interface MediaItemService {
/*
* Deletes a MediaItem by ID.
*
- * @param userId Identifies the owner of the MediaItem to delete
- * @param appId Identifies the application hosting the MediaItem
- * @param albumId Identifies the parent album of the MediaItem
- * @param mediaItemId Identifies the MediaItem to delete
- * @param token A valid SecurityToken
+ * @param userId Identifies the owner of the MediaItem to delete
+ * @param appId Identifies the application hosting the MediaItem
+ * @param albumId Identifies the parent album of the MediaItem
+ * @param mediaItemId Identifies the MediaItem to delete
+ * @param token A valid SecurityToken
*
* @return a response item containing any errors
*/
@@ -103,11 +103,11 @@ public interface MediaItemService {
/*
* Create a MediaItem in the given album for the given user.
*
- * @param userId Identifies the owner of the MediaItem to create
- * @param appId Identifies the application hosting the MediaItem
- * @param albumId Identifies the album to contain the MediaItem
- * @param mediaItem The MediaItem to create
- * @param token A valid SecurityToken
+ * @param userId Identifies the owner of the MediaItem to create
+ * @param appId Identifies the application hosting the MediaItem
+ * @param albumId Identifies the album to contain the MediaItem
+ * @param mediaItem The MediaItem to create
+ * @param token A valid SecurityToken
*
* @return a response containing any errors
*/
@@ -118,12 +118,12 @@ public interface MediaItemService {
* Updates a MediaItem for the given user. The MediaItem ID specified in
* the REST end-point is used, even if the MediaItem also defines an ID.
*
- * @param userId Identifies the owner of the MediaItem to update
- * @param appId Identifies the application hosting the MediaItem
- * @param albumId Identifies the album containing the MediaItem
- * @param mediaItemId Identifies the MediaItem to update
- * @param mediaItem The updated MediaItem to persist
- * @param token A valid SecurityToken
+ * @param userId Identifies the owner of the MediaItem to update
+ * @param appId Identifies the application hosting the MediaItem
+ * @param albumId Identifies the album containing the MediaItem
+ * @param mediaItemId Identifies the MediaItem to update
+ * @param mediaItem The updated MediaItem to persist
+ * @param token A valid SecurityToken
*
* @return a response containing any errors
*/
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/PersonService.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/PersonService.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/PersonService.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/PersonService.java Tue Sep 7 08:02:11 2010
@@ -25,6 +25,9 @@ import org.apache.shindig.social.opensoc
import java.util.Set;
import java.util.concurrent.Future;
+/**
+ * Interface that defines how shindig gathers people information.
+ */
public interface PersonService {
/**
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java Tue Sep 7 08:02:11 2010
@@ -24,6 +24,9 @@ import com.google.common.base.Objects;
import java.util.Map;
+/**
+ * Data structure representing a userid
+ */
public class UserId {
public enum Type {
me, viewer, owner, userId;
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/sample/SampleModule.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/sample/SampleModule.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/sample/SampleModule.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/sample/SampleModule.java Tue Sep 7 08:02:11 2010
@@ -19,7 +19,9 @@ package org.apache.shindig.social.sample
import org.apache.shindig.social.opensocial.oauth.OAuthDataStore;
import org.apache.shindig.social.opensocial.spi.ActivityService;
+import org.apache.shindig.social.opensocial.spi.AlbumService;
import org.apache.shindig.social.opensocial.spi.AppDataService;
+import org.apache.shindig.social.opensocial.spi.MediaItemService;
import org.apache.shindig.social.opensocial.spi.MessageService;
import org.apache.shindig.social.opensocial.spi.PersonService;
import org.apache.shindig.social.sample.oauth.SampleOAuthDataStore;
@@ -41,10 +43,11 @@ public class SampleModule extends Abstra
bind(String.class).annotatedWith(Names.named("shindig.canonical.json.db"))
.toInstance("sampledata/canonicaldb.json");
bind(ActivityService.class).to(JsonDbOpensocialService.class);
+ bind(AlbumService.class).to(JsonDbOpensocialService.class);
+ bind(MediaItemService.class).to(JsonDbOpensocialService.class);
bind(AppDataService.class).to(JsonDbOpensocialService.class);
bind(PersonService.class).to(JsonDbOpensocialService.class);
bind(MessageService.class).to(JsonDbOpensocialService.class);
-
bind(OAuthDataStore.class).to(SampleOAuthDataStore.class);
}
}
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthDataStore.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthDataStore.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthDataStore.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthDataStore.java Tue Sep 7 08:02:11 2010
@@ -40,7 +40,9 @@ import java.util.concurrent.ConcurrentMa
import net.oauth.OAuthConsumer;
import net.oauth.OAuthServiceProvider;
-// Sample implementation for OAuth data store
+/**
+ * Sample implementation for OAuth data store
+ */
public class SampleOAuthDataStore implements OAuthDataStore {
// This needs to be long enough that an attacker can't guess it. If the attacker can guess this
// value before they exceed the maximum number of attempts, they can complete a session fixation