You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by ds...@apache.org on 2013/11/18 22:19:01 UTC
svn commit: r1543166 - in /incubator/streams/branches/webservice:
streams-persistence/src/main/java/org/apache/streams/persistence/model/
streams-persistence/src/main/java/org/apache/streams/persistence/model/cassandra/
streams-persistence/src/main/jav...
Author: dsullivan
Date: Mon Nov 18 21:19:00 2013
New Revision: 1543166
URL: http://svn.apache.org/r1543166
Log:
adding MediaLinkObject
Added:
incubator/streams/branches/webservice/streams-persistence/src/main/java/org/apache/streams/persistence/model/ActivityStreamsMediaLink.java
incubator/streams/branches/webservice/streams-persistence/src/main/java/org/apache/streams/persistence/model/mongo/MongoActivityStreamsMediaLink.java
Modified:
incubator/streams/branches/webservice/streams-persistence/src/main/java/org/apache/streams/persistence/model/ActivityStreamsObject.java
incubator/streams/branches/webservice/streams-persistence/src/main/java/org/apache/streams/persistence/model/cassandra/CassandraActivityStreamsObject.java
incubator/streams/branches/webservice/streams-persistence/src/main/java/org/apache/streams/persistence/model/mongo/MongoActivityStreamsObject.java
incubator/streams/branches/webservice/streams-web/src/main/webapp/demo/activityDemo.html
incubator/streams/branches/webservice/streams-web/src/main/webapp/demo/js/activityDemo.js
Added: incubator/streams/branches/webservice/streams-persistence/src/main/java/org/apache/streams/persistence/model/ActivityStreamsMediaLink.java
URL: http://svn.apache.org/viewvc/incubator/streams/branches/webservice/streams-persistence/src/main/java/org/apache/streams/persistence/model/ActivityStreamsMediaLink.java?rev=1543166&view=auto
==============================================================================
--- incubator/streams/branches/webservice/streams-persistence/src/main/java/org/apache/streams/persistence/model/ActivityStreamsMediaLink.java (added)
+++ incubator/streams/branches/webservice/streams-persistence/src/main/java/org/apache/streams/persistence/model/ActivityStreamsMediaLink.java Mon Nov 18 21:19:00 2013
@@ -0,0 +1,6 @@
+package org.apache.streams.persistence.model;
+
+public interface ActivityStreamsMediaLink {
+ String getUrl();
+ void setUrl(String url);
+}
Modified: incubator/streams/branches/webservice/streams-persistence/src/main/java/org/apache/streams/persistence/model/ActivityStreamsObject.java
URL: http://svn.apache.org/viewvc/incubator/streams/branches/webservice/streams-persistence/src/main/java/org/apache/streams/persistence/model/ActivityStreamsObject.java?rev=1543166&r1=1543165&r2=1543166&view=diff
==============================================================================
--- incubator/streams/branches/webservice/streams-persistence/src/main/java/org/apache/streams/persistence/model/ActivityStreamsObject.java (original)
+++ incubator/streams/branches/webservice/streams-persistence/src/main/java/org/apache/streams/persistence/model/ActivityStreamsObject.java Mon Nov 18 21:19:00 2013
@@ -9,4 +9,6 @@ public interface ActivityStreamsObject {
void setId(String id);
String getUrl();
void setUrl(String url);
+ ActivityStreamsMediaLink getImage();
+ void setImage(ActivityStreamsMediaLink image);
}
Modified: incubator/streams/branches/webservice/streams-persistence/src/main/java/org/apache/streams/persistence/model/cassandra/CassandraActivityStreamsObject.java
URL: http://svn.apache.org/viewvc/incubator/streams/branches/webservice/streams-persistence/src/main/java/org/apache/streams/persistence/model/cassandra/CassandraActivityStreamsObject.java?rev=1543166&r1=1543165&r2=1543166&view=diff
==============================================================================
--- incubator/streams/branches/webservice/streams-persistence/src/main/java/org/apache/streams/persistence/model/cassandra/CassandraActivityStreamsObject.java (original)
+++ incubator/streams/branches/webservice/streams-persistence/src/main/java/org/apache/streams/persistence/model/cassandra/CassandraActivityStreamsObject.java Mon Nov 18 21:19:00 2013
@@ -1,5 +1,6 @@
package org.apache.streams.persistence.model.cassandra;
+import org.apache.streams.persistence.model.ActivityStreamsMediaLink;
import org.apache.streams.persistence.model.ActivityStreamsObject;
public class CassandraActivityStreamsObject implements ActivityStreamsObject {
@@ -7,6 +8,7 @@ public class CassandraActivityStreamsObj
private String id;
private String objectType;
private String url;
+ private ActivityStreamsMediaLink image;
public String getDisplayName() {
return displayName;
@@ -39,4 +41,14 @@ public class CassandraActivityStreamsObj
public void setUrl(String url) {
this.url = url;
}
+
+ @Override
+ public ActivityStreamsMediaLink getImage() {
+ return image;
+ }
+
+ @Override
+ public void setImage(ActivityStreamsMediaLink image) {
+ this.image = image;
+ }
}
Added: incubator/streams/branches/webservice/streams-persistence/src/main/java/org/apache/streams/persistence/model/mongo/MongoActivityStreamsMediaLink.java
URL: http://svn.apache.org/viewvc/incubator/streams/branches/webservice/streams-persistence/src/main/java/org/apache/streams/persistence/model/mongo/MongoActivityStreamsMediaLink.java?rev=1543166&view=auto
==============================================================================
--- incubator/streams/branches/webservice/streams-persistence/src/main/java/org/apache/streams/persistence/model/mongo/MongoActivityStreamsMediaLink.java (added)
+++ incubator/streams/branches/webservice/streams-persistence/src/main/java/org/apache/streams/persistence/model/mongo/MongoActivityStreamsMediaLink.java Mon Nov 18 21:19:00 2013
@@ -0,0 +1,20 @@
+package org.apache.streams.persistence.model.mongo;
+
+import com.mongodb.BasicDBObject;
+import org.apache.streams.persistence.model.ActivityStreamsMediaLink;
+
+
+public class MongoActivityStreamsMediaLink extends BasicDBObject implements ActivityStreamsMediaLink{
+
+ @Override
+ public String getUrl() {
+ return (String)get("url");
+ }
+
+ @Override
+ public void setUrl(String url) {
+ put("url",url);
+
+ }
+
+}
Modified: incubator/streams/branches/webservice/streams-persistence/src/main/java/org/apache/streams/persistence/model/mongo/MongoActivityStreamsObject.java
URL: http://svn.apache.org/viewvc/incubator/streams/branches/webservice/streams-persistence/src/main/java/org/apache/streams/persistence/model/mongo/MongoActivityStreamsObject.java?rev=1543166&r1=1543165&r2=1543166&view=diff
==============================================================================
--- incubator/streams/branches/webservice/streams-persistence/src/main/java/org/apache/streams/persistence/model/mongo/MongoActivityStreamsObject.java (original)
+++ incubator/streams/branches/webservice/streams-persistence/src/main/java/org/apache/streams/persistence/model/mongo/MongoActivityStreamsObject.java Mon Nov 18 21:19:00 2013
@@ -2,6 +2,8 @@ package org.apache.streams.persistence.m
import com.mongodb.BasicDBObject;
import org.apache.streams.persistence.model.ActivityStreamsObject;
+import org.apache.streams.persistence.model.ActivityStreamsMediaLink;
+
public class MongoActivityStreamsObject extends BasicDBObject implements ActivityStreamsObject{
@@ -36,4 +38,12 @@ public class MongoActivityStreamsObject
public void setUrl(String url) {
put("url", url);
}
+
+ public ActivityStreamsMediaLink getImage() {
+ return (ActivityStreamsMediaLink)get("image");
+ }
+
+ public void setImage(ActivityStreamsMediaLink image) {
+ put("image", image);
+ }
}
Modified: incubator/streams/branches/webservice/streams-web/src/main/webapp/demo/activityDemo.html
URL: http://svn.apache.org/viewvc/incubator/streams/branches/webservice/streams-web/src/main/webapp/demo/activityDemo.html?rev=1543166&r1=1543165&r2=1543166&view=diff
==============================================================================
--- incubator/streams/branches/webservice/streams-web/src/main/webapp/demo/activityDemo.html (original)
+++ incubator/streams/branches/webservice/streams-web/src/main/webapp/demo/activityDemo.html Mon Nov 18 21:19:00 2013
@@ -30,7 +30,7 @@
<!--Iterates through each activity in the array that was returned from Streams-->
{{#each this}}
<div class='activity'>
- <img src={{actor.url}} height=25 width=25> {{verb}} <a href = {{target.url}}>{{target.displayName}}</a> on {{formatDate published}}
+ <a href='{{actor.url}}'><img src='{{actor.image.url}}' height=50 width=40></a> {{verb}} <a href='{{target.url}}'> {{target.displayName}}</a> on {{formatDate published}}
</div>
{{/each}}
</script>
Modified: incubator/streams/branches/webservice/streams-web/src/main/webapp/demo/js/activityDemo.js
URL: http://svn.apache.org/viewvc/incubator/streams/branches/webservice/streams-web/src/main/webapp/demo/js/activityDemo.js?rev=1543166&r1=1543165&r2=1543166&view=diff
==============================================================================
--- incubator/streams/branches/webservice/streams-web/src/main/webapp/demo/js/activityDemo.js (original)
+++ incubator/streams/branches/webservice/streams-web/src/main/webapp/demo/js/activityDemo.js Mon Nov 18 21:19:00 2013
@@ -1,14 +1,9 @@
var activityDemo = activityDemo || (function(){
+ var months = ["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];
Handlebars.registerHelper("formatDate", function(timestamp) {
- var d = new Date(timestamp);
+ var date = new Date(timestamp);
+ return months[date.getMonth()] + " " + date.getDate() + " " + date.getFullYear() + " " + date.getHours() + ":" + (date.getMinutes()<10?'0':'') + date.getMinutes()
- var curr_date = d.getDate();
-
- var curr_month = d.getMonth();
-
- var curr_year = d.getFullYear();
-
- return (curr_month + 1 )+ "-" + curr_date + "-" + curr_year;
});
var subscriberURL = "";