You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2016/10/18 17:33:12 UTC

[2/2] incubator-streams git commit: reuse test data and schemas

reuse test data and schemas


Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/d7e983ea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/d7e983ea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/d7e983ea

Branch: refs/heads/master
Commit: d7e983ea704350ab1993299959e4e9bb18cde465
Parents: a6d5392
Author: Steve Blackmon @steveblackmon <sb...@apache.org>
Authored: Tue Oct 18 12:33:04 2016 -0500
Committer: Steve Blackmon @steveblackmon <sb...@apache.org>
Committed: Tue Oct 18 12:33:04 2016 -0500

----------------------------------------------------------------------
 streams-util/pom.xml                            | 35 ++++++++++++++++----
 .../util/schema/test/SchemaOrderingTest.java    | 24 +++++++-------
 .../util/schema/test/SchemaStoreTest.java       |  8 ++---
 .../src/test/resources/activities/accept.json   | 16 ---------
 .../src/test/resources/activities/access.json   | 17 ----------
 .../test/resources/activities/acknowledge.json  | 16 ---------
 .../src/test/resources/activities/add.json      | 21 ------------
 .../src/test/resources/activities/agree.json    | 15 ---------
 .../src/test/resources/activities/append.json   | 16 ---------
 .../src/test/resources/activities/approve.json  | 20 -----------
 .../src/test/resources/activities/archive.json  | 15 ---------
 .../src/test/resources/activities/assign.json   | 20 -----------
 .../src/test/resources/activities/at.json       | 15 ---------
 .../src/test/resources/activities/attach.json   | 20 -----------
 .../src/test/resources/activities/attend.json   | 15 ---------
 .../src/test/resources/activities/author.json   | 15 ---------
 .../test/resources/activities/authorize.json    | 23 -------------
 .../src/test/resources/activities/borrow.json   | 21 ------------
 .../src/test/resources/activities/build.json    | 16 ---------
 .../src/test/resources/activities/cancel.json   | 16 ---------
 .../src/test/resources/activities/checkin.json  | 16 ---------
 .../src/test/resources/activities/close.json    | 16 ---------
 .../src/test/resources/activities/complete.json | 16 ---------
 .../src/test/resources/activities/confirm.json  | 17 ----------
 .../src/test/resources/activities/consume.json  | 16 ---------
 .../src/test/resources/activities/create.json   | 15 ---------
 .../src/test/resources/activities/delete.json   | 16 ---------
 .../src/test/resources/activities/deliver.json  | 20 -----------
 .../src/test/resources/activities/deny.json     | 23 -------------
 .../src/test/resources/activities/disagree.json | 30 -----------------
 .../src/test/resources/activities/dislike.json  | 15 ---------
 .../test/resources/activities/experience.json   | 16 ---------
 .../src/test/resources/activities/favorite.json | 15 ---------
 .../src/test/resources/activities/find.json     | 19 -----------
 .../activities/flag-as-inappropriate.json       | 24 --------------
 .../src/test/resources/activities/follow.json   | 15 ---------
 .../src/test/resources/activities/give.json     | 28 ----------------
 .../src/test/resources/activities/host.json     | 15 ---------
 .../src/test/resources/activities/ignore.json   | 15 ---------
 .../src/test/resources/activities/insert.json   | 19 -----------
 .../src/test/resources/activities/install.json  | 18 ----------
 .../src/test/resources/activities/interact.json | 16 ---------
 .../src/test/resources/activities/invite.json   | 19 -----------
 .../src/test/resources/activities/join.json     | 15 ---------
 .../src/test/resources/activities/leave.json    | 15 ---------
 .../src/test/resources/activities/like.json     | 22 ------------
 .../src/test/resources/activities/listen.json   | 15 ---------
 .../src/test/resources/activities/lose.json     | 15 ---------
 .../test/resources/activities/make-friend.json  | 15 ---------
 .../src/test/resources/activities/open.json     | 15 ---------
 .../src/test/resources/activities/play.json     | 15 ---------
 .../src/test/resources/activities/post.json     | 29 ----------------
 .../src/test/resources/activities/present.json  | 15 ---------
 .../src/test/resources/activities/purchase.json | 16 ---------
 .../src/test/resources/activities/qualify.json  | 15 ---------
 .../src/test/resources/activities/read.json     | 16 ---------
 .../src/test/resources/activities/receive.json  | 16 ---------
 .../src/test/resources/activities/reject.json   | 15 ---------
 .../resources/activities/remove-friend.json     | 15 ---------
 .../src/test/resources/activities/remove.json   | 23 -------------
 .../src/test/resources/activities/replace.json  | 19 -----------
 .../resources/activities/request-friend.json    | 16 ---------
 .../src/test/resources/activities/request.json  | 23 -------------
 .../src/test/resources/activities/resolve.json  | 15 ---------
 .../src/test/resources/activities/retract.json  | 26 ---------------
 .../src/test/resources/activities/return.json   | 19 -----------
 .../test/resources/activities/rsvp-maybe.json   | 16 ---------
 .../src/test/resources/activities/rsvp-no.json  | 16 ---------
 .../src/test/resources/activities/rsvp-yes.json | 16 ---------
 .../src/test/resources/activities/satisfy.json  | 21 ------------
 .../src/test/resources/activities/save.json     | 20 -----------
 .../src/test/resources/activities/schedule.json | 15 ---------
 .../src/test/resources/activities/search.json   | 21 ------------
 .../src/test/resources/activities/sell.json     | 19 -----------
 .../src/test/resources/activities/send.json     | 19 -----------
 .../src/test/resources/activities/share.json    | 16 ---------
 .../src/test/resources/activities/sponsor.json  | 17 ----------
 .../src/test/resources/activities/start.json    | 15 ---------
 .../resources/activities/stop-following.json    | 15 ---------
 .../src/test/resources/activities/submit.json   | 15 ---------
 .../src/test/resources/activities/tag.json      | 19 -----------
 .../test/resources/activities/terminate.json    | 15 ---------
 .../src/test/resources/activities/tie.json      | 24 --------------
 .../test/resources/activities/unfavorite.json   | 15 ---------
 .../src/test/resources/activities/unlike.json   | 15 ---------
 .../test/resources/activities/unsatisfy.json    | 20 -----------
 .../src/test/resources/activities/unsave.json   | 15 ---------
 .../src/test/resources/activities/unshare.json  | 15 ---------
 .../src/test/resources/activities/update.json   | 15 ---------
 .../src/test/resources/activities/use.json      | 15 ---------
 .../src/test/resources/activities/watch.json    | 16 ---------
 .../src/test/resources/activities/win.json      | 15 ---------
 streams-util/src/test/resources/media_link.json | 11 ------
 .../src/test/resources/objects/event.json       | 26 ---------------
 .../src/test/resources/objects/group.json       | 20 -----------
 .../src/test/resources/objects/issue.json       | 13 --------
 .../src/test/resources/objects/note.json        | 16 ---------
 .../src/test/resources/objects/permission.json  | 17 ----------
 .../src/test/resources/objects/place.json       | 13 --------
 .../src/test/resources/objects/task.json        | 20 -----------
 .../src/test/resources/objects/video.json       | 12 -------
 101 files changed, 44 insertions(+), 1732 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/pom.xml
----------------------------------------------------------------------
diff --git a/streams-util/pom.xml b/streams-util/pom.xml
index 554bd6d..42ff80b 100644
--- a/streams-util/pom.xml
+++ b/streams-util/pom.xml
@@ -77,6 +77,13 @@
             <artifactId>streams-schema-activitystreams</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.streams</groupId>
+            <artifactId>streams-schema-activitystreams</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
             <type>test-jar</type>
         </dependency>
         <dependency>
@@ -138,13 +145,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <configuration>
-                    <includes>**/*.json</includes>
-                    <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
-                    <includeGroupIds>org.apache.streams</includeGroupIds>
-                    <includeArtifactIds>streams-schema-activitystreams</includeArtifactIds>
-                    <includeTypes>jar,test-jar</includeTypes>
-                </configuration>
                 <executions>
                     <execution>
                         <id>unpack-schemas</id>
@@ -152,6 +152,27 @@
                         <goals>
                             <goal>unpack-dependencies</goal>
                         </goals>
+                        <configuration>
+                            <includes>**/*.json</includes>
+                            <outputDirectory>${project.build.directory}/test-classes/activitystreams-schemas</outputDirectory>
+                            <includeGroupIds>org.apache.streams</includeGroupIds>
+                            <includeArtifactIds>streams-schema-activitystreams</includeArtifactIds>
+                            <includeTypes>jar</includeTypes>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>unpack-testdocs</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <includes>**/*.json</includes>
+                            <outputDirectory>${project.build.directory}/test-classes/activitystreams-testdocs</outputDirectory>
+                            <includeGroupIds>org.apache.streams</includeGroupIds>
+                            <includeArtifactIds>streams-schema-activitystreams</includeArtifactIds>
+                            <includeTypes>test-jar</includeTypes>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaOrderingTest.java
----------------------------------------------------------------------
diff --git a/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaOrderingTest.java b/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaOrderingTest.java
index 7f20024..1a72ff6 100644
--- a/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaOrderingTest.java
+++ b/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaOrderingTest.java
@@ -38,9 +38,9 @@ public class SchemaOrderingTest {
     @Test
     public void compareVerbParent() {
         SchemaStore schemaStore = new SchemaStoreImpl();
-        File update = new File("target/test-classes/verbs/update.json");
+        File update = new File("target/test-classes/activitystreams-schemas/verbs/update.json");
         schemaStore.create(update.toURI());
-        File activity = new File("target/test-classes/activity.json");
+        File activity = new File("target/test-classes/activitystreams-schemas/activity.json");
         schemaStore.create(activity.toURI());
         assert( schemaStore.compare( schemaStore.getByUri(update.toURI()).get(), schemaStore.getByUri(activity.toURI()).get()) == 1);
         Iterator<Schema> schemaIterator = schemaStore.getSchemaIterator();
@@ -56,9 +56,9 @@ public class SchemaOrderingTest {
     @Test
     public void compareObjectTypeParent() {
         SchemaStore schemaStore = new SchemaStoreImpl();
-        File alert = new File("target/test-classes/objectTypes/alert.json");
+        File alert = new File("target/test-classes/activitystreams-schemas/objectTypes/alert.json");
         schemaStore.create(alert.toURI());
-        File object = new File("target/test-classes/object.json");
+        File object = new File("target/test-classes/activitystreams-schemas/object.json");
         schemaStore.create(object.toURI());
         assert( schemaStore.compare( schemaStore.getByUri(object.toURI()).get(), schemaStore.getByUri(alert.toURI()).get()) == -1);
         Iterator<Schema> schemaIterator = schemaStore.getSchemaIterator();
@@ -74,9 +74,9 @@ public class SchemaOrderingTest {
     @Test
     public void compareUnrelated() {
         SchemaStore schemaStore = new SchemaStoreImpl();
-        File alert = new File("target/test-classes/objectTypes/alert.json");
+        File alert = new File("target/test-classes/activitystreams-schemas/objectTypes/alert.json");
         schemaStore.create(alert.toURI());
-        File update = new File("target/test-classes/verbs/update.json");
+        File update = new File("target/test-classes/activitystreams-schemas/verbs/update.json");
         schemaStore.create(update.toURI());
         assert( schemaStore.compare( schemaStore.getByUri(alert.toURI()).get(), schemaStore.getByUri(update.toURI()).get()) == 0);
     }
@@ -84,9 +84,9 @@ public class SchemaOrderingTest {
     @Test
     public void compareVerbFieldRef() {
         SchemaStore schemaStore = new SchemaStoreImpl();
-        File update = new File("target/test-classes/verbs/update.json");
+        File update = new File("target/test-classes/activitystreams-schemas/verbs/update.json");
         schemaStore.create(update.toURI());
-        File object = new File("target/test-classes/object.json");
+        File object = new File("target/test-classes/activitystreams-schemas/object.json");
         schemaStore.create(object.toURI());
         assert( schemaStore.compare( schemaStore.getByUri(update.toURI()).get(), schemaStore.getByUri(object.toURI()).get()) == 1);
         Iterator<Schema> schemaIterator = schemaStore.getSchemaIterator();
@@ -102,9 +102,9 @@ public class SchemaOrderingTest {
     @Test
     public void compareObjectTypeFieldRef() {
         SchemaStore schemaStore = new SchemaStoreImpl();
-        File alert = new File("target/test-classes/objectTypes/alert.json");
+        File alert = new File("target/test-classes/activitystreams-schemas/objectTypes/alert.json");
         schemaStore.create(alert.toURI());
-        File media_link = new File("target/test-classes/media_link.json");
+        File media_link = new File("target/test-classes/activitystreams-schemas/media_link.json");
         schemaStore.create(media_link.toURI());
         assert( schemaStore.compare( schemaStore.getByUri(media_link.toURI()).get(), schemaStore.getByUri(alert.toURI()).get()) == -1);
         Iterator<Schema> schemaIterator = schemaStore.getSchemaIterator();
@@ -121,9 +121,9 @@ public class SchemaOrderingTest {
     @Test
     public void compareVerbAncestorIndirect() {
         SchemaStore schemaStore = new SchemaStoreImpl();
-        File update = new File("target/test-classes/verbs/update.json");
+        File update = new File("target/test-classes/activitystreams-schemas/verbs/update.json");
         schemaStore.create(update.toURI());
-        File media_link = new File("target/test-classes/media_link.json");
+        File media_link = new File("target/test-classes/activitystreams-schemas/media_link.json");
         schemaStore.create(media_link.toURI());
         assert( schemaStore.getByUri(media_link.toURI()).isPresent());
         assert( schemaStore.getByUri(update.toURI()).isPresent());

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaStoreTest.java
----------------------------------------------------------------------
diff --git a/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaStoreTest.java b/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaStoreTest.java
index 1d28350..a030bd5 100644
--- a/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaStoreTest.java
+++ b/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaStoreTest.java
@@ -33,7 +33,7 @@ public class SchemaStoreTest {
     @Test
     public void indexMediaLink() {
         SchemaStore schemaStore = new SchemaStoreImpl();
-        File file = new File("target/test-classes/media_link.json");
+        File file = new File("target/test-classes/activitystreams-schemas/media_link.json");
         schemaStore.create(file.toURI());
         assert( schemaStore.getFileUriCount() == 1);
         assert( schemaStore.getByUri(file.toURI()).isPresent());
@@ -43,7 +43,7 @@ public class SchemaStoreTest {
     @Test
     public void indexApprove() {
         SchemaStore schemaStore = new SchemaStoreImpl();
-        File file = new File("target/test-classes/verbs/approve.json");
+        File file = new File("target/test-classes/activitystreams-schemas/verbs/approve.json");
         schemaStore.create(file.toURI());
         assert( schemaStore.getFileUriCount() == 4);
         assert( schemaStore.getByUri(file.toURI()).isPresent());
@@ -53,7 +53,7 @@ public class SchemaStoreTest {
     @Test
     public void indexCollection() {
         SchemaStore schemaStore = new SchemaStoreImpl();
-        File file = new File("target/test-classes/collection.json");
+        File file = new File("target/test-classes/activitystreams-schemas/collection.json");
         schemaStore.create(file.toURI());
         assert( schemaStore.getFileUriCount() == 3);
         assert( schemaStore.getByUri(file.toURI()).isPresent());
@@ -68,7 +68,7 @@ public class SchemaStoreTest {
     @Test
     public void indexUpdate() {
         SchemaStore schemaStore = new SchemaStoreImpl();
-        File file = new File("target/test-classes/verbs/update.json");
+        File file = new File("target/test-classes/activitystreams-schemas/verbs/update.json");
         schemaStore.create(file.toURI());
         assert( schemaStore.getFileUriCount() == 4);
         assert( schemaStore.getByUri(file.toURI()).isPresent());

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/accept.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/accept.json b/streams-util/src/test/resources/activities/accept.json
deleted file mode 100644
index c1dfd5f..0000000
--- a/streams-util/src/test/resources/activities/accept.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Sally"
-  },
-  "verb": "accept",
-  "object": {
-    "objectType": "job",
-    "displayName": "Director of Marketing"
-  },
-  "title": "Sally accepted the Director of Marketing job."
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/access.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/access.json b/streams-util/src/test/resources/activities/access.json
deleted file mode 100644
index 93bc6e2..0000000
--- a/streams-util/src/test/resources/activities/access.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Joe"
-  },
-  "verb": "access",
-  "object": {
-    "objectType": "file",
-    "displayName": "4Q2012 Sales Forecast.xls"
-  },
-  "published": "2012-12-12T12:12:12Z",
-  "title": "Joe accessed the file \"4Q2012 Sales Forecast.xls\""
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/acknowledge.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/acknowledge.json b/streams-util/src/test/resources/activities/acknowledge.json
deleted file mode 100644
index 2b69fa7..0000000
--- a/streams-util/src/test/resources/activities/acknowledge.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Sally"
-  },
-  "verb": "acknowledge",
-  "object": {
-    "objectType": "issue",
-    "displayName": "#123: There is a problem with the build"
-  },
-  "content": "Sally acknowledged Issue #123"
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/add.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/add.json b/streams-util/src/test/resources/activities/add.json
deleted file mode 100644
index b4e8151..0000000
--- a/streams-util/src/test/resources/activities/add.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Joe"
-  },
-  "verb": "add",
-  "object": {
-    "objectType": "image",
-    "displayName": "My cat",
-    "fullImage": {"url": "http://example.org/cat.jpg"}
-  },
-  "target": {
-    "objectType": "collection",
-    "displayName": "Joe's Photo Album",
-    "objectTypes": ["image"]
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/agree.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/agree.json b/streams-util/src/test/resources/activities/agree.json
deleted file mode 100644
index 3034cd8..0000000
--- a/streams-util/src/test/resources/activities/agree.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Sally"
-  },
-  "verb": "agree",
-  "object": {
-    "objectType": "article",
-    "displayName": "Some Random Article Online"
-  }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/append.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/append.json b/streams-util/src/test/resources/activities/append.json
deleted file mode 100644
index d8fb3be..0000000
--- a/streams-util/src/test/resources/activities/append.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Joe"
-  },
-  "verb": "append",
-  "object": {"content": "This is some text"},
-  "target": {
-    "objectType": "file",
-    "displayName": "log.txt"
-  }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/approve.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/approve.json b/streams-util/src/test/resources/activities/approve.json
deleted file mode 100644
index b6f378e..0000000
--- a/streams-util/src/test/resources/activities/approve.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Sally"
-  },
-  "verb": "approve",
-  "object": {
-    "objectType": "task",
-    "actor": {"displayName": "Joe"},
-    "verb": "join",
-    "object": {
-      "objectType": "group",
-      "displayName": "Administrators"
-    }
-  }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/archive.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/archive.json b/streams-util/src/test/resources/activities/archive.json
deleted file mode 100644
index 557dcdf..0000000
--- a/streams-util/src/test/resources/activities/archive.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Joe"
-  },
-  "verb": "archive",
-  "object": {
-    "objectType": "file",
-    "displayName": "4Q2012 Sales Forecast.xls"
-  }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/assign.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/assign.json b/streams-util/src/test/resources/activities/assign.json
deleted file mode 100644
index 51b8a51..0000000
--- a/streams-util/src/test/resources/activities/assign.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Sally"
-  },
-  "verb": "assign",
-  "object": {
-    "objectType": "issue",
-    "displayName": "Issue #123: Some Issue"
-  },
-  "target": {
-    "objectType": "person",
-    "displayName": "Joe"
-  },
-  "title": "Sally assigned Issue #123 to Joe"
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/at.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/at.json b/streams-util/src/test/resources/activities/at.json
deleted file mode 100644
index 64a77f9..0000000
--- a/streams-util/src/test/resources/activities/at.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Joe"
-  },
-  "verb": "at",
-  "object": {
-    "objectType": "place",
-    "displayName": "Acme, Co."
-  }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/attach.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/attach.json b/streams-util/src/test/resources/activities/attach.json
deleted file mode 100644
index 716616b..0000000
--- a/streams-util/src/test/resources/activities/attach.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Sally"
-  },
-  "verb": "attach",
-  "object": {
-    "objectType": "binary",
-    "data": "dGhpcyBpcyB1bmNvbXByZXNzZWQgZGF0YQo="
-  },
-  "target": {
-    "objectType": "issue",
-    "displayName": "Issue #123"
-  },
-  "title": "Sally added an attachment to Issue #123"
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/attend.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/attend.json b/streams-util/src/test/resources/activities/attend.json
deleted file mode 100644
index f8c0838..0000000
--- a/streams-util/src/test/resources/activities/attend.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Joe"
-  },
-  "verb": "attend",
-  "object": {
-    "objectType": "event",
-    "displayName": "Sally's Meeting"
-  }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/author.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/author.json b/streams-util/src/test/resources/activities/author.json
deleted file mode 100644
index 1903700..0000000
--- a/streams-util/src/test/resources/activities/author.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Sally"
-  },
-  "verb": "author",
-  "object": {
-    "objectType": "file",
-    "displayName": "4Q2012 Sales Forecast.xls"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/authorize.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/authorize.json b/streams-util/src/test/resources/activities/authorize.json
deleted file mode 100644
index 2d9d1b3..0000000
--- a/streams-util/src/test/resources/activities/authorize.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Joe"
-  },
-  "verb": "authorize",
-  "object": {
-    "objectType": "task",
-    "actor": {
-      "objectType": "person",
-      "displayName": "Sally"
-    },
-    "verb": "access",
-    "object": {
-      "objectType": "place",
-      "displayName": "Joe's Home"
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/borrow.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/borrow.json b/streams-util/src/test/resources/activities/borrow.json
deleted file mode 100644
index e21809a..0000000
--- a/streams-util/src/test/resources/activities/borrow.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Sally"
-  },
-  "verb": "borrow",
-  "object": {
-    "objectType": "book",
-    "displayName": "Cloud Atlas"
-  },
-  "target": {
-    "objectType": "person",
-    "displayName": "Joe"
-  },
-  "title": "Sally borrowed the book 'Cloud Atlas' from Joe"
-}
-    

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/build.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/build.json b/streams-util/src/test/resources/activities/build.json
deleted file mode 100644
index 78878e1..0000000
--- a/streams-util/src/test/resources/activities/build.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Joe"
-  },
-  "verb": "build",
-  "object": {
-    "objectType": "application",
-    "displayName": "MyApp Builder 12345"
-  }
-}
-   

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/cancel.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/cancel.json b/streams-util/src/test/resources/activities/cancel.json
deleted file mode 100644
index b7aba81..0000000
--- a/streams-util/src/test/resources/activities/cancel.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Sally"
-  },
-  "verb": "cancel",
-  "object": {
-    "objectType": "offer",
-    "displayName": "Free Money!"
-  },
-  "title": "Sally cancelled the offer for free money."
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/checkin.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/checkin.json b/streams-util/src/test/resources/activities/checkin.json
deleted file mode 100644
index 97216b9..0000000
--- a/streams-util/src/test/resources/activities/checkin.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Joe"
-  },
-  "verb": "checkin",
-  "object": {
-    "objectType": "place",
-    "displayName": "Acme, Co"
-  },
-  "title": "Joe checked in at Acme, Co"
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/close.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/close.json b/streams-util/src/test/resources/activities/close.json
deleted file mode 100644
index 362e3f6..0000000
--- a/streams-util/src/test/resources/activities/close.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Joe"
-  },
-  "verb": "close",
-  "object": {
-    "objectType": "issue",
-    "displayName": "Issue #123"
-  },
-  "title": "Joe closed issue #123"
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/complete.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/complete.json b/streams-util/src/test/resources/activities/complete.json
deleted file mode 100644
index 06694a7..0000000
--- a/streams-util/src/test/resources/activities/complete.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Sally"
-  },
-  "verb": "complete",
-  "object": {
-    "objectType": "process",
-    "displayName": "Some long process"
-  }
-}
-    

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/confirm.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/confirm.json b/streams-util/src/test/resources/activities/confirm.json
deleted file mode 100644
index 9307c38..0000000
--- a/streams-util/src/test/resources/activities/confirm.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Joe"
-  },
-  "verb": "confirm",
-  "object": {
-    "objectType": "issue",
-    "displayName": "Issue #123"
-  },
-  "title": "Joe confirmed issue #123"
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/consume.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/consume.json b/streams-util/src/test/resources/activities/consume.json
deleted file mode 100644
index ed907e3..0000000
--- a/streams-util/src/test/resources/activities/consume.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Sally"
-  },
-  "verb": "consume",
-  "object": {
-    "objectType": "product",
-    "displayName": "Some amazing product"
-  }
-}
-    

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/create.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/create.json b/streams-util/src/test/resources/activities/create.json
deleted file mode 100644
index 5d8afb3..0000000
--- a/streams-util/src/test/resources/activities/create.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Sally"
-  },
-  "verb": "create",
-  "object": {
-    "objectType": "product",
-    "displayName": "Some amazing product"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/delete.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/delete.json b/streams-util/src/test/resources/activities/delete.json
deleted file mode 100644
index 6943046..0000000
--- a/streams-util/src/test/resources/activities/delete.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Joe"
-  },
-  "verb": "delete",
-  "object": {
-    "objectType": "file",
-    "displayName": "4Q2012 Sales Forecast.xls"
-  },
-  "title": "Joe is probably going to get fired."
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/deliver.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/deliver.json b/streams-util/src/test/resources/activities/deliver.json
deleted file mode 100644
index 620f0b5..0000000
--- a/streams-util/src/test/resources/activities/deliver.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Sally"
-  },
-  "verb": "deliver",
-  "object": {
-    "objectType": "note",
-    "displayName": "Bad News",
-    "content": "Joe deleted the sales forecast"
-  },
-  "target": {
-    "objectType": "person",
-    "displayName": "Joe's Boss"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/deny.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/deny.json b/streams-util/src/test/resources/activities/deny.json
deleted file mode 100644
index b83ca60..0000000
--- a/streams-util/src/test/resources/activities/deny.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Joe"
-  },
-  "verb": "deny",
-  "object": {
-    "objectType": "task",
-    "actor": {
-      "objectType": "person",
-      "displayName": "Joe"
-    },
-    "verb": "delete",
-    "object": {
-      "objectType": "file",
-      "displayName": "4Q2012 Sales Forecast.xls"
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/disagree.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/disagree.json b/streams-util/src/test/resources/activities/disagree.json
deleted file mode 100644
index 8614e88..0000000
--- a/streams-util/src/test/resources/activities/disagree.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Sally"
-  },
-  "verb": "disagree",
-  "object": {
-    "actor": {
-      "objectType": "person",
-      "displayName": "Joe"
-    },
-    "verb": "deny",
-    "object": {
-      "objectType": "task",
-      "actor": {
-        "objectType": "person",
-        "displayName": "Joe"
-      },
-      "verb": "delete",
-      "object": {
-        "objectType": "file",
-        "displayName": "4Q2012 Sales Forecast.xls"
-      }
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/dislike.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/dislike.json b/streams-util/src/test/resources/activities/dislike.json
deleted file mode 100644
index 16c2148..0000000
--- a/streams-util/src/test/resources/activities/dislike.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Joe"
-  },
-  "verb": "dislike",
-  "object": {
-    "objectType": "person",
-    "displayName": "Sally"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/experience.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/experience.json b/streams-util/src/test/resources/activities/experience.json
deleted file mode 100644
index d81d024..0000000
--- a/streams-util/src/test/resources/activities/experience.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Sally"
-  },
-  "verb": "experience",
-  "object": {
-    "objectType": "event",
-    "displayName": "Disciplinary Action for Joe"
-  }
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/favorite.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/favorite.json b/streams-util/src/test/resources/activities/favorite.json
deleted file mode 100644
index 3df99bf..0000000
--- a/streams-util/src/test/resources/activities/favorite.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Joe's Boss"
-  },
-  "verb": "favorite",
-  "object": {
-    "objectType": "person",
-    "displayName": "Sally"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/find.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/find.json b/streams-util/src/test/resources/activities/find.json
deleted file mode 100644
index 9c25c59..0000000
--- a/streams-util/src/test/resources/activities/find.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Joe"
-  },
-  "verb": "find",
-  "object": {
-    "objectType": "application",
-    "displayName": "Unapproved Software Application"
-  },
-  "location": {
-    "objectType": "place",
-    "displayName": "Sally's Computer"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/flag-as-inappropriate.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/flag-as-inappropriate.json b/streams-util/src/test/resources/activities/flag-as-inappropriate.json
deleted file mode 100644
index 6f4d202..0000000
--- a/streams-util/src/test/resources/activities/flag-as-inappropriate.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Sally's Boss"
-  },
-  "verb": "flag-as-inappropriate",
-  "object": {
-    "objectType": "application",
-    "displayName": "Unapproved Software Application",
-    "location": {
-      "displayName": "Sally's Computer"
-    }
-  },
-  "context": {
-    "objectType": "issue",
-    "displayName": "Issue #125",
-    "types": ["http://example.org/violation-of-corporate-policy"]
-  }
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/follow.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/follow.json b/streams-util/src/test/resources/activities/follow.json
deleted file mode 100644
index fc8c992..0000000
--- a/streams-util/src/test/resources/activities/follow.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Joe"
-  },
-  "verb": "follow",
-  "object": {
-    "objectType": "issue",
-    "displayName": "Issue #125"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/give.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/give.json b/streams-util/src/test/resources/activities/give.json
deleted file mode 100644
index f145296..0000000
--- a/streams-util/src/test/resources/activities/give.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Joe's Boss"
-  },
-  "verb": "give",
-  "object": {
-    "objectType": "note",
-    "displayName": "Notice of Employment Termination"
-  },
-  "target": {
-    "objectType": "collection",
-    "items": [
-      {
-        "objectType": "person",
-        "displayName": "Joe"
-      },
-      {
-        "objectType": "person",
-        "displayName": "Sally"
-      }
-    ]
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/host.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/host.json b/streams-util/src/test/resources/activities/host.json
deleted file mode 100644
index 3331353..0000000
--- a/streams-util/src/test/resources/activities/host.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Bob"
-  },
-  "verb": "host",
-  "object": {
-    "objectType": "event",
-    "displayName": "Job Interview"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/ignore.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/ignore.json b/streams-util/src/test/resources/activities/ignore.json
deleted file mode 100644
index 012013a..0000000
--- a/streams-util/src/test/resources/activities/ignore.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Laura"
-  },
-  "verb": "ignore",
-  "object": {
-    "objectType": "note",
-    "displayName": "Joe's request for his job back."
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/insert.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/insert.json b/streams-util/src/test/resources/activities/insert.json
deleted file mode 100644
index 57bda66..0000000
--- a/streams-util/src/test/resources/activities/insert.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Bob"
-  },
-  "verb": "insert",
-  "object": {
-    "objectType": "note",
-    "displayName": "Notes about Employee Disciplinary Actions"
-  },
-  "target": {
-    "objectType": "file",
-    "displayName": "2013 Corporate Policy Updates.doc"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/install.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/install.json b/streams-util/src/test/resources/activities/install.json
deleted file mode 100644
index 1ecdecd..0000000
--- a/streams-util/src/test/resources/activities/install.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Laura"
-  },
-  "verb": "install",
-  "object": {
-    "objectType": "application",
-    "displayName": "Approved Software Scanning Tool",
-    "location": {
-      "displayName": "All computers in Building A"
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/interact.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/interact.json b/streams-util/src/test/resources/activities/interact.json
deleted file mode 100644
index f427513..0000000
--- a/streams-util/src/test/resources/activities/interact.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Bob"
-  },
-  "verb": "interact",
-  "object": {
-    "objectType": "person",
-    "displayName": "Laura"
-  },
-  "title": "Bob called Laura."
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/invite.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/invite.json b/streams-util/src/test/resources/activities/invite.json
deleted file mode 100644
index 7c84b78..0000000
--- a/streams-util/src/test/resources/activities/invite.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Laura"
-  },
-  "verb": "invite",
-  "object": {
-    "objectType": "person",
-    "displayName": "Mark"
-  },
-  "target": {
-    "objectType": "event",
-    "displayName": "Job Interview"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/join.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/join.json b/streams-util/src/test/resources/activities/join.json
deleted file mode 100644
index 7996a9b..0000000
--- a/streams-util/src/test/resources/activities/join.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Mark"
-  },
-  "verb": "join",
-  "object": {
-    "objectType": "organization",
-    "displayName": "Acme, Co"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/leave.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/leave.json b/streams-util/src/test/resources/activities/leave.json
deleted file mode 100644
index 08516c5..0000000
--- a/streams-util/src/test/resources/activities/leave.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Mark"
-  },
-  "verb": "leave",
-  "object": {
-    "objectType": "organization",
-    "displayName": "Other, Co"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/like.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/like.json b/streams-util/src/test/resources/activities/like.json
deleted file mode 100644
index 853676f..0000000
--- a/streams-util/src/test/resources/activities/like.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Laura"
-  },
-  "verb": "like",
-  "object": {
-    "actor": {
-      "objectType": "person",
-      "displayName": "Mark"
-    },
-    "verb": "join",
-    "object": {
-      "objectType": "organization",
-      "displayName": "Acme, Co"
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/listen.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/listen.json b/streams-util/src/test/resources/activities/listen.json
deleted file mode 100644
index 1268060..0000000
--- a/streams-util/src/test/resources/activities/listen.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Mark"
-  },
-  "verb": "listen",
-  "object": {
-    "objectType": "audio",
-    "displayName": "Welcome to the Company (Podcast).mp3"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/lose.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/lose.json b/streams-util/src/test/resources/activities/lose.json
deleted file mode 100644
index 073e914..0000000
--- a/streams-util/src/test/resources/activities/lose.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "organization",
-    "displayName": "New York Yankees"
-  },
-  "verb": "lose",
-  "object": {
-    "objectType": "game",
-    "displayName": "World Series"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/make-friend.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/make-friend.json b/streams-util/src/test/resources/activities/make-friend.json
deleted file mode 100644
index 1acf539..0000000
--- a/streams-util/src/test/resources/activities/make-friend.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Mark"
-  },
-  "verb": "make-friend",
-  "object": {
-    "objectType": "person",
-    "displayName": "Laura"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/open.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/open.json b/streams-util/src/test/resources/activities/open.json
deleted file mode 100644
index 4bf47cd..0000000
--- a/streams-util/src/test/resources/activities/open.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Laura"
-  },
-  "verb": "open",
-  "object": {
-    "objectType": "issue",
-    "displayName": "Issue #126"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/play.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/play.json b/streams-util/src/test/resources/activities/play.json
deleted file mode 100644
index 0605662..0000000
--- a/streams-util/src/test/resources/activities/play.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Mark"
-  },
-  "verb": "play",
-  "object": {
-    "objectType": "audio",
-    "displayName": "Call Me Maybe"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/post.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/post.json b/streams-util/src/test/resources/activities/post.json
deleted file mode 100644
index fbf2fa8..0000000
--- a/streams-util/src/test/resources/activities/post.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "published": "2011-02-10T15:04:55Z",
-  "actor": {
-    "url": "http://example.org/martin",
-    "objectType": "person",
-    "id": "tag:example.org,2011:martin",
-    "image": {
-      "url": "http://example.org/martin/image",
-      "width": 250,
-      "height": 250
-    },
-    "displayName": "Martin Smith"
-  },
-  "verb": "post",
-  "object": {
-    "url": "http://example.org/blog/2011/02/entry",
-    "id": "tag:example.org,2011:abc123/xyz"
-  },
-  "target": {
-    "url": "http://example.org/blog/",
-    "objectType": "blog",
-    "id": "tag:example.org,2011:abc123",
-    "displayName": "Martin's Blog"
-  }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/present.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/present.json b/streams-util/src/test/resources/activities/present.json
deleted file mode 100644
index 8f4df12..0000000
--- a/streams-util/src/test/resources/activities/present.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Laura"
-  },
-  "verb": "present",
-  "object": {
-    "objectType": "file",
-    "displayName": "1Q2013 Sales Forecast.ppt"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/purchase.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/purchase.json b/streams-util/src/test/resources/activities/purchase.json
deleted file mode 100644
index 3354597..0000000
--- a/streams-util/src/test/resources/activities/purchase.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Mark"
-  },
-  "verb": "purchase",
-  "object": {
-    "objectType": "video",
-    "displayName": "The Avengers"
-  },
-  "title": "Mark purchased the movie, The Avengers"
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/qualify.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/qualify.json b/streams-util/src/test/resources/activities/qualify.json
deleted file mode 100644
index 630bda0..0000000
--- a/streams-util/src/test/resources/activities/qualify.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Laura"
-  },
-  "verb": "qualify",
-  "object": {
-    "objectType": "offer",
-    "displayName": "Free Money!"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/read.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/read.json b/streams-util/src/test/resources/activities/read.json
deleted file mode 100644
index 3509886..0000000
--- a/streams-util/src/test/resources/activities/read.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Mark"
-  },
-  "verb": "read",
-  "object": {
-    "objectType": "book",
-    "displayName": "Cloud Atlas"
-  }
-}
-      

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/receive.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/receive.json b/streams-util/src/test/resources/activities/receive.json
deleted file mode 100644
index d61245e..0000000
--- a/streams-util/src/test/resources/activities/receive.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Laura"
-  },
-  "verb": "receive",
-  "object": {
-    "objectType": "badge",
-    "displayName": "Most Checkins in 24 hours"
-  },
-  "title": "Laura was awarded a badge for \"Most Checkins in 24 hours\""
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/reject.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/reject.json b/streams-util/src/test/resources/activities/reject.json
deleted file mode 100644
index 84d1ab1..0000000
--- a/streams-util/src/test/resources/activities/reject.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Mark"
-  },
-  "verb": "reject",
-  "object": {
-    "objectType": "issue",
-    "displayName": "Issue #126"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/remove-friend.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/remove-friend.json b/streams-util/src/test/resources/activities/remove-friend.json
deleted file mode 100644
index 0a593e9..0000000
--- a/streams-util/src/test/resources/activities/remove-friend.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Mark"
-  },
-  "verb": "remove-friend",
-  "object": {
-    "objectType": "person",
-    "displayName": "Laura"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/remove.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/remove.json b/streams-util/src/test/resources/activities/remove.json
deleted file mode 100644
index 1f386e9..0000000
--- a/streams-util/src/test/resources/activities/remove.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Laura"
-  },
-  "verb": "remove",
-  "object": {
-    "objectType": "image",
-    "displayName": "Cat Photo",
-    "fullImage": {
-      "url": "http://example.org/cats.jpg"
-    }
-  },
-  "target": {
-    "objectType": "collection",
-    "displayName": "Cat Photo Album",
-    "objectTypes": ["image"]
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/replace.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/replace.json b/streams-util/src/test/resources/activities/replace.json
deleted file mode 100644
index f19a35c..0000000
--- a/streams-util/src/test/resources/activities/replace.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Mark"
-  },
-  "verb": "replace",
-  "object": {
-    "objectType": "file",
-    "displayName": "Updated 1Q2014 Sales Forecast.xls"
-  },
-  "target": {
-    "objectType": "file",
-    "displayName": "1Q2014 Sales Forecast.xls"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/request-friend.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/request-friend.json b/streams-util/src/test/resources/activities/request-friend.json
deleted file mode 100644
index 3e571ee..0000000
--- a/streams-util/src/test/resources/activities/request-friend.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Mark"
-  },
-  "verb": "request-friend",
-  "object": {
-    "objectType": "person",
-    "displayName": "Laura"
-  }
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/request.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/request.json b/streams-util/src/test/resources/activities/request.json
deleted file mode 100644
index 3e7c285..0000000
--- a/streams-util/src/test/resources/activities/request.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Laura"
-  },
-  "verb": "request",
-  "object": {
-    "objectType": "task",
-    "actor": {
-      "objectType": "person",
-      "displayName": "Mark"
-    },
-    "verb": "join",
-    "object": {
-      "objectType": "event",
-      "displayName": "The Big Meeting"
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/resolve.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/resolve.json b/streams-util/src/test/resources/activities/resolve.json
deleted file mode 100644
index 14998cf..0000000
--- a/streams-util/src/test/resources/activities/resolve.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Laura"
-  },
-  "verb": "resolve",
-  "object": {
-    "objectType": "issue",
-    "displayName": "Issue #126"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/retract.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/retract.json b/streams-util/src/test/resources/activities/retract.json
deleted file mode 100644
index 9229868..0000000
--- a/streams-util/src/test/resources/activities/retract.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Laura"
-  },
-  "verb": "retract",
-  "object": {
-    "actor": {
-      "objectType": "person",
-      "displayName": "Mark"
-    },
-    "verb": "return",
-    "object": {
-      "objectType": "book",
-      "displayName": "Cloud Atlas"
-    },
-    "target": {
-      "objectType": "person",
-      "displayName": "Laura"
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/return.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/return.json b/streams-util/src/test/resources/activities/return.json
deleted file mode 100644
index d6b8861..0000000
--- a/streams-util/src/test/resources/activities/return.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Mark"
-  },
-  "verb": "return",
-  "object": {
-    "objectType": "book",
-    "displayName": "Cloud Atlas"
-  },
-  "target": {
-    "objectType": "person",
-    "displayName": "Laura"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/rsvp-maybe.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/rsvp-maybe.json b/streams-util/src/test/resources/activities/rsvp-maybe.json
deleted file mode 100644
index b1ec1b5..0000000
--- a/streams-util/src/test/resources/activities/rsvp-maybe.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Laura"
-  },
-  "verb": "rsvp-maybe",
-  "object": {
-    "objectType": "event",
-    "displayName": "The Big Meeting"
-  },
-  "title": "Laura might attend The Big Meeting"
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/rsvp-no.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/rsvp-no.json b/streams-util/src/test/resources/activities/rsvp-no.json
deleted file mode 100644
index 532b096..0000000
--- a/streams-util/src/test/resources/activities/rsvp-no.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Mark"
-  },
-  "verb": "rsvp-no",
-  "object": {
-    "objectType": "event",
-    "displayName": "The Big Meeting"
-  },
-  "title": "Mark will not attend the Big Meeting"
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/rsvp-yes.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/rsvp-yes.json b/streams-util/src/test/resources/activities/rsvp-yes.json
deleted file mode 100644
index 170a5c4..0000000
--- a/streams-util/src/test/resources/activities/rsvp-yes.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Laura"
-  },
-  "verb": "rsvp-yes",
-  "object": {
-    "objectType": "event",
-    "displayName": "The Big Meeting"
-  },
-  "title": "Laura will attend the Big Meeting"
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/satisfy.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/satisfy.json b/streams-util/src/test/resources/activities/satisfy.json
deleted file mode 100644
index 16151fa..0000000
--- a/streams-util/src/test/resources/activities/satisfy.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Mark"
-  },
-  "verb": "satisfy",
-  "object": {
-    "objectType": "http://example.org/condition",
-    "displayName": "Some Condition"
-  },
-  "target": {
-    "objectType": "http://example.org/parole",
-    "displayName": "Terms of Parole"
-  },
-  "title": "Mark has satisfied a condition of his parole."
-}
-      

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/save.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/save.json b/streams-util/src/test/resources/activities/save.json
deleted file mode 100644
index 70c0f5f..0000000
--- a/streams-util/src/test/resources/activities/save.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Laura"
-  },
-  "verb": "save",
-  "object": {
-    "objectType": "note",
-    "displayName": "A note about something important"
-  },
-  "target": {
-    "objectType": "collection",
-    "displayName": "Laura's Reading List"
-  },
-  "title": "Laura saved the note to her reading list"
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/schedule.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/schedule.json b/streams-util/src/test/resources/activities/schedule.json
deleted file mode 100644
index f214290..0000000
--- a/streams-util/src/test/resources/activities/schedule.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Mark"
-  },
-  "verb": "schedule",
-  "object": {
-    "objectType": "event",
-    "displayName": "The Big Meeting"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/search.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/search.json b/streams-util/src/test/resources/activities/search.json
deleted file mode 100644
index 511b612..0000000
--- a/streams-util/src/test/resources/activities/search.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Laura"
-  },
-  "verb": "search",
-  "object": {
-    "objectType": "place",
-    "displayName": "Big Hotel",
-    "address": {
-      "locality": "New York",
-      "region": "NY"
-    }
-  },
-  "title": "Laura searched for a hotel in New York City, NY"
-}
-      

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/sell.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/sell.json b/streams-util/src/test/resources/activities/sell.json
deleted file mode 100644
index ab07fb0..0000000
--- a/streams-util/src/test/resources/activities/sell.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Mark"
-  },
-  "verb": "sell",
-  "object": {
-    "objectType": "product",
-    "displayName": "A cool product"
-  },
-  "target": {
-    "objectType": "person",
-    "displayName": "Laura"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/send.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/send.json b/streams-util/src/test/resources/activities/send.json
deleted file mode 100644
index b392ce8..0000000
--- a/streams-util/src/test/resources/activities/send.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Laura"
-  },
-  "verb": "send",
-  "object": {
-    "objectType": "note",
-    "content": "Thank you for the cool product."
-  },
-  "target": {
-    "objectType": "person",
-    "displayName": "Mark"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/share.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/share.json b/streams-util/src/test/resources/activities/share.json
deleted file mode 100644
index dc7b9f1..0000000
--- a/streams-util/src/test/resources/activities/share.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Mark"
-  },
-  "verb": "share",
-  "object": {
-    "objectType": "note",
-    "displayName": "An important note"
-  },
-  "title": "Mark shared an important note."
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/sponsor.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/sponsor.json b/streams-util/src/test/resources/activities/sponsor.json
deleted file mode 100644
index 156c322..0000000
--- a/streams-util/src/test/resources/activities/sponsor.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "organization",
-    "displayName": "Acme, Co"
-  },
-  "verb": "sponsor",
-  "object": {
-    "objectType": "game",
-    "displayName": "World Series"
-  },
-  "title": "Acme, Co sponsored the World Series"
-}
-      

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/start.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/start.json b/streams-util/src/test/resources/activities/start.json
deleted file mode 100644
index b9aede2..0000000
--- a/streams-util/src/test/resources/activities/start.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Mark"
-  },
-  "verb": "start",
-  "object": {
-    "objectType": "process",
-    "displayName": "A Long Running Process"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/stop-following.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/stop-following.json b/streams-util/src/test/resources/activities/stop-following.json
deleted file mode 100644
index 04b83e7..0000000
--- a/streams-util/src/test/resources/activities/stop-following.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Laura"
-  },
-  "verb": "stop-following",
-  "object": {
-    "objectType": "person",
-    "displayName": "Mark"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/submit.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/submit.json b/streams-util/src/test/resources/activities/submit.json
deleted file mode 100644
index 0fd3c34..0000000
--- a/streams-util/src/test/resources/activities/submit.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Mark"
-  },
-  "verb": "submit",
-  "object": {
-    "objectType": "issue",
-    "displayName": "Issue #127"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/tag.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/tag.json b/streams-util/src/test/resources/activities/tag.json
deleted file mode 100644
index dba6112..0000000
--- a/streams-util/src/test/resources/activities/tag.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Laura"
-  },
-  "verb": "tag",
-  "object": {
-    "objectType": "person",
-    "displayName": "Mark"
-  },
-  "target": {
-    "objectType": "image",
-    "displayName": "Pictures of my cats"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/terminate.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/terminate.json b/streams-util/src/test/resources/activities/terminate.json
deleted file mode 100644
index f4d886e..0000000
--- a/streams-util/src/test/resources/activities/terminate.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Mark"
-  },
-  "verb": "terminate",
-  "object": {
-    "objectType": "process",
-    "displayName": "A long running process"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/tie.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/tie.json b/streams-util/src/test/resources/activities/tie.json
deleted file mode 100644
index 71a3c39..0000000
--- a/streams-util/src/test/resources/activities/tie.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "collection",
-    "items": [
-      {
-        "objectType": "organization",
-        "displayName": "New York Giants"
-      },
-      {
-        "objectType": "organization",
-        "displayName": "Oakland Raiders"
-      }
-    ]
-  },
-  "verb": "tie",
-  "object": {
-    "objectType": "game",
-    "displayName": "Super Bowl"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d7e983ea/streams-util/src/test/resources/activities/unfavorite.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/unfavorite.json b/streams-util/src/test/resources/activities/unfavorite.json
deleted file mode 100644
index b1e7bcd..0000000
--- a/streams-util/src/test/resources/activities/unfavorite.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "$license": [
-    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
-    "http://www.apache.org/licenses/LICENSE-2.0"
-  ],
-  "actor": {
-    "objectType": "person",
-    "displayName": "Laura"
-  },
-  "verb": "unfavorite",
-  "object": {
-    "objectType": "article",
-    "displayName": "Some article"
-  }
-}