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 2015/05/08 23:21:20 UTC

[44/50] [abbrv] incubator-streams git commit: [maven-release-plugin] prepare release streams-project-0.2-incubating-rc2

[maven-release-plugin] prepare release streams-project-0.2-incubating-rc2


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

Branch: refs/heads/pp-master
Commit: 434848fa745e49240f8831c98e18de877c4bb70d
Parents: 95be56b
Author: Steve Blackmon <sb...@apache.org>
Authored: Sun Apr 5 17:39:40 2015 -0500
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Fri May 8 15:47:03 2015 -0500

----------------------------------------------------------------------
 pom.xml                                         |   183 +-
 src/site/site.xml                               |    29 +
 .../src/main/resources/reference.conf           |     9 +
 .../src/main/resources/reference.json           |     9 -
 .../graph/test/TestNeo4jVertexReader.java       |     9 +-
 .../src/test/resources/sampleReaderResult.json  |   100 +-
 .../src/main/resources/reference.conf           |     8 +
 .../src/main/resources/reference.json           |     8 -
 .../json/test/JsonPathExtractorTwitterTest.java |    92 -
 .../src/test/resources/tweet.json               |     1 -
 .../resources/templates/peoplepatternactor.json |     3 +
 .../com/datasift/test/DatasiftSerDeTest.java    |     6 +-
 .../DatasiftActivitySerializerTest.java         |     8 +-
 .../serializer/DatasiftEventClassifierTest.java |     6 +-
 ...DatasiftInstagramActivitySerializerTest.java |    17 +-
 ...tasiftInteractionActivitySerializerTest.java |    17 +-
 .../DatasiftTwitterActivitySerializerTest.java  |    19 +-
 .../src/test/resources/amazon_datasift_json.txt |    10 -
 .../src/test/resources/blog_datasift_json.txt   |   719 -
 .../src/test/resources/board_datasift_json.txt  |  4160 --
 .../test/resources/facebook_datasift_json.txt   |  1843 -
 .../test/resources/instagram_datasift_json.txt  |    25 -
 .../src/test/resources/part-r-00000.json        |   862 -
 .../resources/rand_sample_datasift_json.txt     |  1547 -
 .../resources/random_sample_datasift_json.txt   |  1547 -
 .../src/test/resources/reddit_datasift_json.txt |    33 -
 .../test/resources/twitter_datasift_json.txt    |  1000 -
 .../test/resources/wikipedia_datasift_json.txt  |   252 -
 .../test/resources/youtube_datasift_json.txt    |     7 -
 .../test/FacebookActivityActorSerDeTest.java    |    11 +-
 .../test/FacebookActivitySerDeTest.java         |     5 +
 .../facebook/test/FacebookPageSerDeTest.java    |     4 +
 .../facebook/test/FacebookPostSerDeTest.java    |     4 +
 .../streams/facebook/test/SimplePageTest.java   |    11 +-
 .../src/test/resources/Facebook.json            |   250 -
 .../src/test/resources/testpage.json            |     1 -
 .../src/test/resources/testpost.json            |   162 -
 .../test/FacebookEDCAsActivityTest.java         |    14 +-
 .../facebook/test/FacebookEDCSerDeTest.java     |    20 +-
 .../src/test/resources/FacebookEDC.xml          |    71 -
 .../flickr/test/FlickrEDCAsActivityTest.java    |    16 +-
 .../gnip/flickr/test/FlickrEDCSerDeTest.java    |    17 +-
 .../src/test/resources/FlickrEDC.xml            |    64 -
 .../gnip-edc-googleplus/pom.xml                 |    40 +-
 .../com/gplus/api/GPlusEDCAsActivityTest.java   |     8 +-
 .../src/test/resources/GPlusEDCFixed.json       |   100 -
 .../com/instagram/test/InstagramSerDeTest.java  |     5 +
 .../src/test/resources/instagram_jsons.txt      |     6 -
 .../gnip-edc-reddit/pom.xml                     |    44 -
 .../reddit/api/RedditEDCAsActivityJSONTest.java |    10 +-
 .../src/test/resources/RedditEDC.json           |   100 -
 .../src/test/resources/RedditEDC.xml            |  5762 ---
 .../src/test/resources/RedditEDCFixed.json      |   100 -
 .../src/test/resources/RedditEDCFlattened.xml   |   100 -
 .../src/test/resources/redditTest.xml           |     1 -
 .../java/com/gnip/test/YouTubeEDCSerDeTest.java |    13 +-
 .../com/gnip/test/YoutubeEDCAsActivityTest.java |    13 +-
 .../src/test/resources/YoutubeEDC.xml           |     8 -
 .../gnip-powertrack/pom.xml                     |    14 -
 .../gmail/test/GMailMessageSerDeTest.java       |    67 +
 .../src/main/resources/reference.conf           |     2 +
 .../gmail/test/GMailMessageSerDeTest.java       |    71 -
 .../gplus/GooglePlusCommentSerDeTest.java       |     4 +
 .../google/gplus/GooglePlusPersonSerDeTest.java |     5 +
 .../processor/GooglePlusActivitySerDeTest.java  |     5 +
 .../processor/GooglePlusTypeConverterTest.java  |     5 +
 .../TestGPlusUserActivityCollector.java         |     2 +-
 .../src/main/resources/reference.conf           |     2 +
 .../test/InstagramActivitySerDeTest.java        |     5 +
 .../src/test/resources/testMediaFeedObjects.txt |     2 -
 .../src/test/resources/testUserInfoData.txt     |     2 -
 .../src/test/resources/testtweets.txt           |   695 -
 .../MoreoverJsonActivitySerializerTest.java     |    13 +-
 .../data/MoreoverXmlActivitySerializerTest.java |     5 +
 .../org/apache/streams/data/moreover.json       | 39433 -----------------
 .../org/apache/streams/data/moreover.xml        |  1324 -
 .../rss/provider/RssStreamProviderTaskTest.java |     2 +
 .../rss/provider/RssStreamProviderTest.java     |     7 +-
 .../streams/rss/test/RssTypeConverterTest.java  |     3 +
 .../test/SyndEntryActivitySerizlizerTest.java   |     5 +
 .../src/test/resources/TestSyndEntryJson.txt    |    11 -
 .../test/resources/test_rss_xml/economist1.xml  |   233 -
 .../test/resources/test_rss_xml/economist2.xml  |  1069 -
 .../test_rss_xml/economistCombined.xml          |   221 -
 .../src/test/resources/top100.opml              |   110 -
 .../streams-provider-sysomos/pom.xml            |    14 -
 .../com/sysomos/test/SysomosJsonSerDeTest.java  |     8 +-
 .../com/sysomos/test/SysomosXmlSerDeTest.java   |     8 +-
 .../src/test/resources/sysomos_jsons.txt        |   101 -
 .../src/test/resources/sysomos_xmls.txt         |     6 -
 .../src/main/resources/reference.conf           |     2 +
 .../test/TwitterActivityConvertersTest.java     |    22 +-
 .../test/TwitterDocumentClassifierTest.java     |    22 +-
 .../twitter/test/TwitterObjectMapperTest.java   |     6 +-
 .../src/test/resources/testtweets.txt           |   695 -
 .../src/test/resources/twitter_jsons.txt        |   695 -
 streams-pojo/pom.xml                            |   165 +-
 streams-pojo/src/main/jsonschema/activity.json  |   107 +
 .../src/main/jsonschema/collection.json         |    47 +
 .../src/main/jsonschema/media_link.json         |    34 +
 streams-pojo/src/main/jsonschema/object.json    |    96 +
 .../src/main/jsonschema/objectTypes/alert.json  |    19 +
 .../jsonschema/objectTypes/application.json     |    19 +
 .../main/jsonschema/objectTypes/article.json    |    19 +
 .../src/main/jsonschema/objectTypes/audio.json  |    19 +
 .../src/main/jsonschema/objectTypes/badge.json  |    19 +
 .../src/main/jsonschema/objectTypes/binary.json |    19 +
 .../main/jsonschema/objectTypes/bookmark.json   |    19 +
 .../main/jsonschema/objectTypes/comment.json    |    19 +
 .../src/main/jsonschema/objectTypes/device.json |    19 +
 .../src/main/jsonschema/objectTypes/event.json  |    51 +
 .../src/main/jsonschema/objectTypes/file.json   |    25 +
 .../src/main/jsonschema/objectTypes/folder.json |    19 +
 .../src/main/jsonschema/objectTypes/game.json   |    19 +
 .../src/main/jsonschema/objectTypes/group.json  |    19 +
 .../src/main/jsonschema/objectTypes/image.json  |    22 +
 .../src/main/jsonschema/objectTypes/issue.json  |    25 +
 .../src/main/jsonschema/objectTypes/job.json    |    19 +
 .../src/main/jsonschema/objectTypes/list.json   |    28 +
 .../src/main/jsonschema/objectTypes/note.json   |    19 +
 .../src/main/jsonschema/objectTypes/offer.json  |    19 +
 .../jsonschema/objectTypes/organization.json    |    19 +
 .../src/main/jsonschema/objectTypes/page.json   |    19 +
 .../main/jsonschema/objectTypes/permission.json |    36 +
 .../src/main/jsonschema/objectTypes/person.json |    25 +
 .../jsonschema/objectTypes/photo-album.json     |    19 +
 .../src/main/jsonschema/objectTypes/photo.json  |    23 +
 .../src/main/jsonschema/objectTypes/place.json  |    43 +
 .../main/jsonschema/objectTypes/playlist.json   |    19 +
 .../main/jsonschema/objectTypes/process.json    |    19 +
 .../main/jsonschema/objectTypes/product.json    |    25 +
 .../main/jsonschema/objectTypes/property.json   |    48 +
 .../main/jsonschema/objectTypes/question.json   |    28 +
 .../src/main/jsonschema/objectTypes/review.json |    22 +
 .../src/main/jsonschema/objectTypes/role.json   |    25 +
 .../main/jsonschema/objectTypes/service.json    |    19 +
 .../src/main/jsonschema/objectTypes/song.json   |    19 +
 .../src/main/jsonschema/objectTypes/status.json |    19 +
 .../src/main/jsonschema/objectTypes/task.json   |    44 +
 .../src/main/jsonschema/objectTypes/team.json   |    19 +
 .../src/main/jsonschema/objectTypes/video.json  |    19 +
 .../org/apache/streams/pojo/json/activity.json  |   107 -
 .../apache/streams/pojo/json/collection.json    |    47 -
 .../apache/streams/pojo/json/media_link.json    |    34 -
 .../org/apache/streams/pojo/json/object.json    |    96 -
 .../streams/pojo/json/objectTypes/alert.json    |    19 -
 .../pojo/json/objectTypes/application.json      |    19 -
 .../streams/pojo/json/objectTypes/article.json  |    19 -
 .../streams/pojo/json/objectTypes/audio.json    |    19 -
 .../streams/pojo/json/objectTypes/badge.json    |    19 -
 .../streams/pojo/json/objectTypes/binary.json   |    19 -
 .../streams/pojo/json/objectTypes/bookmark.json |    19 -
 .../streams/pojo/json/objectTypes/comment.json  |    19 -
 .../streams/pojo/json/objectTypes/device.json   |    19 -
 .../streams/pojo/json/objectTypes/event.json    |    51 -
 .../streams/pojo/json/objectTypes/file.json     |    25 -
 .../streams/pojo/json/objectTypes/folder.json   |    19 -
 .../streams/pojo/json/objectTypes/game.json     |    19 -
 .../streams/pojo/json/objectTypes/group.json    |    19 -
 .../streams/pojo/json/objectTypes/image.json    |    22 -
 .../streams/pojo/json/objectTypes/issue.json    |    25 -
 .../streams/pojo/json/objectTypes/job.json      |    19 -
 .../streams/pojo/json/objectTypes/list.json     |    28 -
 .../streams/pojo/json/objectTypes/note.json     |    19 -
 .../streams/pojo/json/objectTypes/offer.json    |    19 -
 .../pojo/json/objectTypes/organization.json     |    19 -
 .../streams/pojo/json/objectTypes/page.json     |    19 -
 .../pojo/json/objectTypes/permission.json       |    36 -
 .../streams/pojo/json/objectTypes/person.json   |    25 -
 .../pojo/json/objectTypes/photo-album.json      |    19 -
 .../streams/pojo/json/objectTypes/photo.json    |    23 -
 .../streams/pojo/json/objectTypes/place.json    |    43 -
 .../streams/pojo/json/objectTypes/playlist.json |    19 -
 .../streams/pojo/json/objectTypes/process.json  |    19 -
 .../streams/pojo/json/objectTypes/product.json  |    25 -
 .../streams/pojo/json/objectTypes/property.json |    48 -
 .../streams/pojo/json/objectTypes/question.json |    28 -
 .../streams/pojo/json/objectTypes/review.json   |    22 -
 .../streams/pojo/json/objectTypes/role.json     |    25 -
 .../streams/pojo/json/objectTypes/service.json  |    19 -
 .../streams/pojo/json/objectTypes/song.json     |    19 -
 .../streams/pojo/json/objectTypes/status.json   |    19 -
 .../streams/pojo/json/objectTypes/task.json     |    44 -
 .../streams/pojo/json/objectTypes/team.json     |    19 -
 .../streams/pojo/json/objectTypes/video.json    |    19 -
 .../apache/streams/pojo/json/verbs/accept.json  |    24 -
 .../apache/streams/pojo/json/verbs/access.json  |    24 -
 .../streams/pojo/json/verbs/acknowledge.json    |    24 -
 .../org/apache/streams/pojo/json/verbs/add.json |    24 -
 .../apache/streams/pojo/json/verbs/agree.json   |    24 -
 .../apache/streams/pojo/json/verbs/append.json  |    24 -
 .../apache/streams/pojo/json/verbs/approve.json |    24 -
 .../apache/streams/pojo/json/verbs/archive.json |    24 -
 .../apache/streams/pojo/json/verbs/assign.json  |    24 -
 .../org/apache/streams/pojo/json/verbs/at.json  |    24 -
 .../apache/streams/pojo/json/verbs/attach.json  |    24 -
 .../apache/streams/pojo/json/verbs/attend.json  |    24 -
 .../apache/streams/pojo/json/verbs/author.json  |    25 -
 .../streams/pojo/json/verbs/authorize.json      |    24 -
 .../apache/streams/pojo/json/verbs/borrow.json  |    24 -
 .../apache/streams/pojo/json/verbs/build.json   |    24 -
 .../apache/streams/pojo/json/verbs/cancel.json  |    24 -
 .../apache/streams/pojo/json/verbs/checkin.json |    24 -
 .../apache/streams/pojo/json/verbs/close.json   |    24 -
 .../streams/pojo/json/verbs/complete.json       |    24 -
 .../apache/streams/pojo/json/verbs/confirm.json |    24 -
 .../apache/streams/pojo/json/verbs/consume.json |    24 -
 .../apache/streams/pojo/json/verbs/create.json  |    24 -
 .../apache/streams/pojo/json/verbs/delete.json  |    24 -
 .../apache/streams/pojo/json/verbs/deliver.json |    24 -
 .../apache/streams/pojo/json/verbs/deny.json    |    24 -
 .../streams/pojo/json/verbs/disagree.json       |    24 -
 .../apache/streams/pojo/json/verbs/dislike.json |    24 -
 .../streams/pojo/json/verbs/experience.json     |    24 -
 .../streams/pojo/json/verbs/favorite.json       |    24 -
 .../apache/streams/pojo/json/verbs/find.json    |    24 -
 .../pojo/json/verbs/flag-as-inappropriate.json  |    24 -
 .../apache/streams/pojo/json/verbs/follow.json  |    24 -
 .../apache/streams/pojo/json/verbs/give.json    |    24 -
 .../apache/streams/pojo/json/verbs/host.json    |    24 -
 .../apache/streams/pojo/json/verbs/ignore.json  |    24 -
 .../apache/streams/pojo/json/verbs/insert.json  |    24 -
 .../apache/streams/pojo/json/verbs/install.json |    24 -
 .../streams/pojo/json/verbs/interact.json       |    24 -
 .../apache/streams/pojo/json/verbs/invite.json  |    24 -
 .../apache/streams/pojo/json/verbs/join.json    |    24 -
 .../apache/streams/pojo/json/verbs/leave.json   |    24 -
 .../apache/streams/pojo/json/verbs/like.json    |    24 -
 .../apache/streams/pojo/json/verbs/listen.json  |    24 -
 .../apache/streams/pojo/json/verbs/lose.json    |    24 -
 .../streams/pojo/json/verbs/make-friend.json    |    24 -
 .../apache/streams/pojo/json/verbs/open.json    |    24 -
 .../apache/streams/pojo/json/verbs/play.json    |    24 -
 .../apache/streams/pojo/json/verbs/post.json    |    24 -
 .../apache/streams/pojo/json/verbs/present.json |    24 -
 .../streams/pojo/json/verbs/purchase.json       |    24 -
 .../apache/streams/pojo/json/verbs/qualify.json |    24 -
 .../apache/streams/pojo/json/verbs/read.json    |    24 -
 .../apache/streams/pojo/json/verbs/receive.json |    24 -
 .../apache/streams/pojo/json/verbs/reject.json  |    24 -
 .../streams/pojo/json/verbs/remove-friend.json  |    24 -
 .../apache/streams/pojo/json/verbs/remove.json  |    24 -
 .../apache/streams/pojo/json/verbs/replace.json |    24 -
 .../streams/pojo/json/verbs/request-friend.json |    24 -
 .../apache/streams/pojo/json/verbs/request.json |    24 -
 .../apache/streams/pojo/json/verbs/resolve.json |    24 -
 .../apache/streams/pojo/json/verbs/retract.json |    24 -
 .../apache/streams/pojo/json/verbs/return.json  |    24 -
 .../streams/pojo/json/verbs/rsvp-maybe.json     |    24 -
 .../apache/streams/pojo/json/verbs/rsvp-no.json |    24 -
 .../streams/pojo/json/verbs/rsvp-yes.json       |    24 -
 .../apache/streams/pojo/json/verbs/satisfy.json |    24 -
 .../apache/streams/pojo/json/verbs/save.json    |    24 -
 .../streams/pojo/json/verbs/schedule.json       |    24 -
 .../apache/streams/pojo/json/verbs/search.json  |    24 -
 .../apache/streams/pojo/json/verbs/sell.json    |    24 -
 .../apache/streams/pojo/json/verbs/send.json    |    24 -
 .../apache/streams/pojo/json/verbs/share.json   |    24 -
 .../apache/streams/pojo/json/verbs/sponsor.json |    24 -
 .../apache/streams/pojo/json/verbs/start.json   |    24 -
 .../streams/pojo/json/verbs/stop-following.json |    24 -
 .../apache/streams/pojo/json/verbs/submit.json  |    24 -
 .../org/apache/streams/pojo/json/verbs/tag.json |    24 -
 .../streams/pojo/json/verbs/terminate.json      |    24 -
 .../org/apache/streams/pojo/json/verbs/tie.json |    24 -
 .../streams/pojo/json/verbs/unfavorite.json     |    24 -
 .../apache/streams/pojo/json/verbs/unlike.json  |    24 -
 .../streams/pojo/json/verbs/unsatisfy.json      |    24 -
 .../apache/streams/pojo/json/verbs/unsave.json  |    24 -
 .../apache/streams/pojo/json/verbs/unshare.json |    24 -
 .../apache/streams/pojo/json/verbs/update.json  |    34 -
 .../org/apache/streams/pojo/json/verbs/use.json |    24 -
 .../apache/streams/pojo/json/verbs/watch.json   |    24 -
 .../org/apache/streams/pojo/json/verbs/win.json |    24 -
 .../src/main/jsonschema/verbs/accept.json       |    24 +
 .../src/main/jsonschema/verbs/access.json       |    24 +
 .../src/main/jsonschema/verbs/acknowledge.json  |    24 +
 streams-pojo/src/main/jsonschema/verbs/add.json |    24 +
 .../src/main/jsonschema/verbs/agree.json        |    24 +
 .../src/main/jsonschema/verbs/append.json       |    24 +
 .../src/main/jsonschema/verbs/approve.json      |    24 +
 .../src/main/jsonschema/verbs/archive.json      |    24 +
 .../src/main/jsonschema/verbs/assign.json       |    24 +
 streams-pojo/src/main/jsonschema/verbs/at.json  |    24 +
 .../src/main/jsonschema/verbs/attach.json       |    24 +
 .../src/main/jsonschema/verbs/attend.json       |    24 +
 .../src/main/jsonschema/verbs/author.json       |    24 +
 .../src/main/jsonschema/verbs/authorize.json    |    24 +
 .../src/main/jsonschema/verbs/borrow.json       |    24 +
 .../src/main/jsonschema/verbs/build.json        |    24 +
 .../src/main/jsonschema/verbs/cancel.json       |    24 +
 .../src/main/jsonschema/verbs/checkin.json      |    24 +
 .../src/main/jsonschema/verbs/close.json        |    24 +
 .../src/main/jsonschema/verbs/complete.json     |    24 +
 .../src/main/jsonschema/verbs/confirm.json      |    24 +
 .../src/main/jsonschema/verbs/consume.json      |    24 +
 .../src/main/jsonschema/verbs/create.json       |    24 +
 .../src/main/jsonschema/verbs/delete.json       |    24 +
 .../src/main/jsonschema/verbs/deliver.json      |    24 +
 .../src/main/jsonschema/verbs/deny.json         |    24 +
 .../src/main/jsonschema/verbs/disagree.json     |    24 +
 .../src/main/jsonschema/verbs/dislike.json      |    24 +
 .../src/main/jsonschema/verbs/experience.json   |    24 +
 .../src/main/jsonschema/verbs/favorite.json     |    24 +
 .../src/main/jsonschema/verbs/find.json         |    24 +
 .../jsonschema/verbs/flag-as-inappropriate.json |    24 +
 .../src/main/jsonschema/verbs/follow.json       |    24 +
 .../src/main/jsonschema/verbs/give.json         |    24 +
 .../src/main/jsonschema/verbs/host.json         |    24 +
 .../src/main/jsonschema/verbs/ignore.json       |    24 +
 .../src/main/jsonschema/verbs/insert.json       |    24 +
 .../src/main/jsonschema/verbs/install.json      |    24 +
 .../src/main/jsonschema/verbs/interact.json     |    24 +
 .../src/main/jsonschema/verbs/invite.json       |    24 +
 .../src/main/jsonschema/verbs/join.json         |    24 +
 .../src/main/jsonschema/verbs/leave.json        |    24 +
 .../src/main/jsonschema/verbs/like.json         |    24 +
 .../src/main/jsonschema/verbs/listen.json       |    24 +
 .../src/main/jsonschema/verbs/lose.json         |    24 +
 .../src/main/jsonschema/verbs/make-friend.json  |    24 +
 .../src/main/jsonschema/verbs/open.json         |    24 +
 .../src/main/jsonschema/verbs/play.json         |    24 +
 .../src/main/jsonschema/verbs/post.json         |    24 +
 .../src/main/jsonschema/verbs/present.json      |    24 +
 .../src/main/jsonschema/verbs/purchase.json     |    24 +
 .../src/main/jsonschema/verbs/qualify.json      |    24 +
 .../src/main/jsonschema/verbs/read.json         |    24 +
 .../src/main/jsonschema/verbs/receive.json      |    24 +
 .../src/main/jsonschema/verbs/reject.json       |    24 +
 .../main/jsonschema/verbs/remove-friend.json    |    24 +
 .../src/main/jsonschema/verbs/remove.json       |    24 +
 .../src/main/jsonschema/verbs/replace.json      |    24 +
 .../main/jsonschema/verbs/request-friend.json   |    24 +
 .../src/main/jsonschema/verbs/request.json      |    24 +
 .../src/main/jsonschema/verbs/resolve.json      |    24 +
 .../src/main/jsonschema/verbs/retract.json      |    24 +
 .../src/main/jsonschema/verbs/return.json       |    24 +
 .../src/main/jsonschema/verbs/rsvp-maybe.json   |    24 +
 .../src/main/jsonschema/verbs/rsvp-no.json      |    24 +
 .../src/main/jsonschema/verbs/rsvp-yes.json     |    24 +
 .../src/main/jsonschema/verbs/satisfy.json      |    24 +
 .../src/main/jsonschema/verbs/save.json         |    24 +
 .../src/main/jsonschema/verbs/schedule.json     |    24 +
 .../src/main/jsonschema/verbs/search.json       |    24 +
 .../src/main/jsonschema/verbs/sell.json         |    24 +
 .../src/main/jsonschema/verbs/send.json         |    24 +
 .../src/main/jsonschema/verbs/share.json        |    24 +
 .../src/main/jsonschema/verbs/sponsor.json      |    24 +
 .../src/main/jsonschema/verbs/start.json        |    24 +
 .../main/jsonschema/verbs/stop-following.json   |    24 +
 .../src/main/jsonschema/verbs/submit.json       |    24 +
 streams-pojo/src/main/jsonschema/verbs/tag.json |    24 +
 .../src/main/jsonschema/verbs/terminate.json    |    24 +
 streams-pojo/src/main/jsonschema/verbs/tie.json |    24 +
 .../src/main/jsonschema/verbs/unfavorite.json   |    24 +
 .../src/main/jsonschema/verbs/unlike.json       |    24 +
 .../src/main/jsonschema/verbs/unsatisfy.json    |    24 +
 .../src/main/jsonschema/verbs/unsave.json       |    24 +
 .../src/main/jsonschema/verbs/unshare.json      |    24 +
 .../src/main/jsonschema/verbs/update.json       |    34 +
 streams-pojo/src/main/jsonschema/verbs/use.json |    24 +
 .../src/main/jsonschema/verbs/watch.json        |    24 +
 streams-pojo/src/main/jsonschema/verbs/win.json |    24 +
 streams-pojo/src/main/xmlschema/activity.xsd    |    94 +
 .../org/apache/streams/pojo/xml/activity.xsd    |    94 -
 streams-pojo/src/site/markdown/index.md         |    31 +
 .../test/GenericWebhookResourceTest.java        |     1 -
 streams-verbs/src/main/resources/delete.json    |    31 +-
 streams-verbs/src/main/resources/follow.json    |    31 +-
 streams-verbs/src/main/resources/post.json      |     3 +
 streams-verbs/src/main/resources/share.json     |    31 +-
 371 files changed, 4025 insertions(+), 67592 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/434848fa/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 652c081..92c5869 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,12 +12,16 @@
     <groupId>org.apache.streams</groupId>
     <artifactId>streams-project</artifactId>
     <version>0.3-incubating-SNAPSHOT</version>
+<<<<<<< HEAD
 
     <name>Apache Streams Project Parent POM</name>
+=======
+>>>>>>> master
 
+    <name>Apache Streams Project</name>
     <description>Apache Streams Project</description>
 
-    <url>http://streams.incubator.apache.org/</url>
+    <url>http://streams.incubator.apache.org/${project.version}/${project.artifactId}</url>
 
     <scm>
         <connection>scm:git:git@github.com:apache/incubator-streams.git</connection>
@@ -114,6 +118,7 @@
         </repository>
     </repositories>
 
+<<<<<<< HEAD
   <distributionManagement>
     <repository>
         <id>s3.release</id>
@@ -126,6 +131,25 @@
         <url>s3://snapshots.peoplepattern.com</url>
     </snapshotRepository>
 </distributionManagement>
+=======
+    <distributionManagement>
+        <repository>
+            <id>streams.releases</id>
+            <name>Streams Releases</name>
+            <url>${release.repository.url}</url>
+        </repository>
+        <!-- Snapshots (not-releases) are published to this repository -->
+        <snapshotRepository>
+            <id>streams.snapshots</id>
+            <name>Streams Snapshots</name>
+            <url>${snapshot.repository.url}</url>
+        </snapshotRepository>
+        <site>
+            <id>site.streams.project</id>
+            <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/streams/content/site/${project.version}/streams-project</url>
+        </site>
+    </distributionManagement>
+>>>>>>> master
 
     <properties>
 
@@ -150,6 +174,8 @@
         <war.plugin.version>2.5</war.plugin.version>
         <site.plugin.version>3.4</site.plugin.version>
         <maven.enforcer.plugin.version>1.3.1</maven.enforcer.plugin.version>
+        <javadoc.plugin.version>2.10.2</javadoc.plugin.version>
+        <resources.plugin.version>2.7</resources.plugin.version>
 
         <!-- Library Dependency Versions -->
         <org.osgi.service.http.port>8080</org.osgi.service.http.port>
@@ -289,14 +315,84 @@
         <pluginManagement>
             <plugins>
                 <plugin>
+                    <artifactId>maven-clean-plugin</artifactId>
+                    <configuration>
+                        <filesets>
+                            <fileset>
+                                <directory>src/site/resources</directory>
+                                <followSymlinks>false</followSymlinks>
+                            </fileset>
+                        </filesets>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>2.7</version>
+                    <executions>
+                        <execution>
+                            <id>copy-resources</id>
+                            <!-- validate is first to run-->
+                            <!-- copy these files to src/site/resources -->
+                            <phase>validate</phase>
+                            <goals>
+                                <goal>copy-resources</goal>
+                            </goals>
+                            <configuration>
+                                <outputDirectory>${basedir}/src/site/resources</outputDirectory>
+                                <resources>
+                                    <resource>
+                                        <directory>src/main/jsonschema</directory>
+                                    </resource>
+                                    <resource>
+                                        <directory>src/main/xmlschema</directory>
+                                    </resource>
+                                    <resource>
+                                        <directory>src/main/resources</directory>
+                                    </resource>
+                                </resources>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
                     <groupId>org.jsonschema2pojo</groupId>
                     <artifactId>jsonschema2pojo-maven-plugin</artifactId>
                     <version>${jsonschema2pojo.version}</version>
+                    <configuration>
+                        <addCompileSourceRoot>true</addCompileSourceRoot>
+                        <generateBuilders>true</generateBuilders>
+                        <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
+                        <useLongIntegers>true</useLongIntegers>
+                        <useJodaDates>true</useJodaDates>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>generate</goal>
+                            </goals>
+                        </execution>
+                    </executions>
                 </plugin>
                 <plugin>
                     <groupId>org.jvnet.jaxb2.maven2</groupId>
                     <artifactId>maven-jaxb2-plugin</artifactId>
                     <version>${jaxb2.version}</version>
+                    <configuration>
+                        <schemaDirectory>src/main/xmlschema</schemaDirectory>
+                        <generateDirectory>target/generated-sources/jaxb2</generateDirectory>
+                        <verbose>true</verbose>
+                        <debug>true</debug>
+                        <encoding>${project.build.sourceEncoding}</encoding>
+                        <forceRegenerate>true</forceRegenerate>
+                        <removeOldOutput>false</removeOldOutput>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>generate</goal>
+                            </goals>
+                        </execution>
+                    </executions>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
@@ -318,6 +414,18 @@
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <version>${site.plugin.version}</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.maven.doxia</groupId>
+                            <artifactId>doxia-module-markdown</artifactId>
+                            <version>1.6</version>
+                        </dependency>
+                    </dependencies>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-failsafe-plugin</artifactId>
                     <version>${failsafe.plugin.version}</version>
                     <executions>
@@ -364,10 +472,81 @@
                         </execution>
                     </executions>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <version>3.4</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.maven.wagon</groupId>
+                            <artifactId>wagon-scm</artifactId>
+                            <version>2.8</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.maven.scm</groupId>
+                            <artifactId>maven-scm-api</artifactId>
+                            <version>1.9.4</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.maven.scm</groupId>
+                            <artifactId>maven-scm-provider-svn-commons</artifactId>
+                            <version>1.9.4</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.maven.scm</groupId>
+                            <artifactId>maven-scm-provider-svnexe</artifactId>
+                            <version>1.9.4</version>
+                        </dependency>
+                    </dependencies>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>
 
+    <reporting>
+        <plugins>
+            <plugin>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <configuration>
+                    <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>${javadoc.plugin.version}</version>
+                <configuration>
+                    <failOnError>false</failOnError>
+                    <minmemory>128m</minmemory>
+                    <maxmemory>1g</maxmemory>
+                </configuration>
+                <reportSets>
+                    <reportSet>
+                        <id>aggregate</id>
+                        <reports>
+                            <report>javadoc-no-fork</report>
+                            <report>test-javadoc-no-fork</report>
+                            <report>aggregate</report>
+                        </reports>
+                        <configuration>
+                             <aggregate>true</aggregate>
+                        </configuration>
+                    </reportSet>
+                    <reportSet>
+                        <id>html</id>
+                        <reports>
+                            <report>javadoc</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+            <plugin>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>${site.plugin.version}</version>
+            </plugin>
+        </plugins>
+    </reporting>
+
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
@@ -759,7 +938,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.10.1</version>
+                        <version>${javadoc.plugin.version}</version>
                         <configuration>
                             <additionalparam>-Xdoclint:none</additionalparam>
                             <aggregate>true</aggregate>

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/434848fa/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
new file mode 100644
index 0000000..fef0628
--- /dev/null
+++ b/src/site/site.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<project>
+    <version position="right"/>
+    <skin>
+        <groupId>org.apache.maven.skins</groupId>
+        <artifactId>maven-fluido-skin</artifactId>
+        <version>1.3.0</version>
+    </skin>
+    <body>
+        <menu ref="reports"/>
+    </body>
+</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/434848fa/streams-contrib/streams-persist-elasticsearch/src/main/resources/reference.conf
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/main/resources/reference.conf b/streams-contrib/streams-persist-elasticsearch/src/main/resources/reference.conf
new file mode 100644
index 0000000..d67d437
--- /dev/null
+++ b/streams-contrib/streams-persist-elasticsearch/src/main/resources/reference.conf
@@ -0,0 +1,9 @@
+# Apache Streams (incubating)
+# Licensed under Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0
+"elasticsearch": {
+  "hosts": [
+      "localhost"
+  ],
+  "port": 9300,
+  "clusterName": "elasticsearch"
+}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/434848fa/streams-contrib/streams-persist-elasticsearch/src/main/resources/reference.json
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/main/resources/reference.json b/streams-contrib/streams-persist-elasticsearch/src/main/resources/reference.json
deleted file mode 100644
index 408399c..0000000
--- a/streams-contrib/streams-persist-elasticsearch/src/main/resources/reference.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "elasticsearch": {
-        "hosts": [
-            "localhost"
-        ],
-        "port": 9300,
-        "clusterName": "elasticsearch"
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/434848fa/streams-contrib/streams-persist-graph/src/test/java/org/apache/streams/graph/test/TestNeo4jVertexReader.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-graph/src/test/java/org/apache/streams/graph/test/TestNeo4jVertexReader.java b/streams-contrib/streams-persist-graph/src/test/java/org/apache/streams/graph/test/TestNeo4jVertexReader.java
index 1f18058..ec2b1e5 100644
--- a/streams-contrib/streams-persist-graph/src/test/java/org/apache/streams/graph/test/TestNeo4jVertexReader.java
+++ b/streams-contrib/streams-persist-graph/src/test/java/org/apache/streams/graph/test/TestNeo4jVertexReader.java
@@ -23,18 +23,16 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.apache.commons.io.IOUtils;
 import org.apache.streams.graph.GraphConfiguration;
-import org.apache.streams.graph.GraphVertexReader;
 import org.apache.streams.graph.GraphReaderConfiguration;
+import org.apache.streams.graph.GraphVertexReader;
 import org.apache.streams.jackson.StreamsJacksonMapper;
 import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URL;
 import java.util.List;
 
 /**
@@ -76,9 +74,8 @@ public class TestNeo4jVertexReader {
 
         assert( result.size() == 10);
 
-        assert( result.get(0).get("summary").asText().startsWith("Building"));
-
-        assert( result.get(1).get("extensions").size() == 5);
+        for( int i = 0 ; i < 10; i++ )
+            assert( result.get(i).get("extensions").size() == 5);
 
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/434848fa/streams-contrib/streams-persist-graph/src/test/resources/sampleReaderResult.json
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-graph/src/test/resources/sampleReaderResult.json b/streams-contrib/streams-persist-graph/src/test/resources/sampleReaderResult.json
index 8b34ec9..7b65f0c 100644
--- a/streams-contrib/streams-persist-graph/src/test/resources/sampleReaderResult.json
+++ b/streams-contrib/streams-persist-graph/src/test/resources/sampleReaderResult.json
@@ -9,18 +9,10 @@
         [
             {
                 "data": {
-                    "summary": "Building products at RelateIQ - http://www.relateiq.com",
-                    "extensions.screenName": "dpatil",
+                    "extensions.screenName": "*@^$&!",
                     "extensions.location": "Silicon Valley",
                     "extensions.posts": 10134,
-                    "displayName": "dj patil",
-                    "handle": "dpatil",
                     "extensions.favorites": 5468,
-                    "image.url": "https://pbs.twimg.com/profile_images/2827560897/e76b7577f7d9545362b9fb65c9db3bb3_normal.png",
-                    "url": "http://www.linkedin.com/in/dpatil",
-                    "objectType": "page",
-                    "@timestamp": 1417557531005,
-                    "id": "id:twitter:14839109",
                     "extensions.followers": 20062
                 }
             }
@@ -28,18 +20,10 @@
         [
             {
                 "data": {
-                    "summary": "I am pretty awesome. Check out this simple guide to my tweets: http://bit.ly/r1GnK // former CTO @ Obama for America  // founder of Modest",
-                    "extensions.screenName": "harper",
+                    "extensions.screenName": ")#(%&!",
                     "extensions.location": "Chicago",
                     "extensions.posts": 44728,
-                    "displayName": "harper",
-                    "handle": "harper",
                     "extensions.favorites": 7759,
-                    "image.url": "https://pbs.twimg.com/profile_images/539089638669819905/7F_DiiQE_normal.jpeg",
-                    "url": "http://harperreed.com",
-                    "objectType": "page",
-                    "@timestamp": 1417555923917,
-                    "id": "id:twitter:1497",
                     "extensions.followers": 28551
                 }
             }
@@ -47,18 +31,10 @@
         [
             {
                 "data": {
-                    "summary": "CTO at @sustranatalks & @last2left, owner of @structuredquery.  Interested in IA, UX, sustainability, equality, travel, cities, semtech, books...",
-                    "extensions.screenName": "ronmichael",
+                    "extensions.screenName": "(@&)!*$&@",
                     "extensions.location": "Philadelphia",
                     "extensions.posts": 12725,
-                    "displayName": "Ron M Zettlemoyer",
-                    "handle": "ronmichael",
                     "extensions.favorites": 782,
-                    "image.url": "https://pbs.twimg.com/profile_images/533457797024063489/NXLJqfhm_normal.jpeg",
-                    "url": "http://zettlemoyer.com",
-                    "objectType": "page",
-                    "@timestamp": 1417558717717,
-                    "id": "id:twitter:807851",
                     "extensions.followers": 457
                 }
             }
@@ -66,18 +42,10 @@
         [
             {
                 "data": {
-                    "summary": "Creating intelligent systems to automate tasks & improve decisions. Entrepreneur, ex Principal Data Scientist @LinkedIn. Machine Learning, Product, Networks",
-                    "extensions.screenName": "peteskomoroch",
+                    "extensions.screenName": "*(%&)@(#**$@!",
                     "extensions.location": "San Francisco",
                     "extensions.posts": 14847,
-                    "displayName": "Peter Skomoroch",
-                    "handle": "peteskomoroch",
                     "extensions.favorites": 7168,
-                    "image.url": "https://pbs.twimg.com/profile_images/3276454686/8f8493dfc040e56ef7ff8f59f9474774_normal.jpeg",
-                    "url": "http://datawrangling.com",
-                    "objectType": "page",
-                    "@timestamp": 1417566210626,
-                    "id": "id:twitter:14344469",
                     "extensions.followers": 20349
                 }
             }
@@ -85,18 +53,10 @@
         [
             {
                 "data": {
-                    "summary": "TV Business Expert as seen on @BBC, Channel4 & more, CEO&Founder, Legacy Leaver, #Investor #Traveller, ?AUTHOR OF #1 BESTSELLING BOOK http://t.co/mexaUgNcwk?",
-                    "extensions.screenName": "marshawright",
+                    "extensions.screenName": "&%#*(@#$)(*&^@#$&^%#",
                     "extensions.location": "London|Spain|USA|Asia|GLOBAL",
                     "extensions.posts": 82955,
-                    "displayName": "Real Marsha Wright",
-                    "handle": "marshawright",
                     "extensions.favorites": 2882,
-                    "image.url": "https://pbs.twimg.com/profile_images/526068997440020480/rXNQhagV_normal.jpeg",
-                    "url": "http://www.MarshaWright.com",
-                    "objectType": "page",
-                    "@timestamp": 1417566667586,
-                    "id": "id:twitter:61608747",
                     "extensions.followers": 120109
                 }
             }
@@ -104,18 +64,10 @@
         [
             {
                 "data": {
-                    "summary": "Married to @crystale, dad to @CCEleven & @CircaLuna, investor in @Twitter, @Uber, @Instagram, @kickstarter & other startups. Learn more: http://t.co/nJWB60dIUL.",
-                    "extensions.screenName": "sacca",
+                    "extensions.screenName": "^$**!",
                     "extensions.location": "",
                     "extensions.posts": 34941,
-                    "displayName": "Chris Sacca",
-                    "handle": "sacca",
                     "extensions.favorites": 87987,
-                    "image.url": "https://pbs.twimg.com/profile_images/1771648774/Sacca_profile_normal.jpg",
-                    "url": "http://lowercasellc.com/proprietor/",
-                    "objectType": "page",
-                    "@timestamp": 1417559518689,
-                    "id": "id:twitter:586",
                     "extensions.followers": 1503801
                 }
             }
@@ -123,35 +75,21 @@
         [
             {
                 "data": {
-                    "extensions.screenName": "AustinTXDaily",
-                    "@timestamp": 1417561360464,
+                    "extensions.screenName": "*#(&%#*(&@#$*&!",
                     "extensions.location": "Austin, TX",
                     "extensions.posts": 27400,
-                    "displayName": "Austin Daily",
-                    "handle": "AustinTXDaily",
                     "extensions.favorites": 0,
-                    "id": "id:twitter:200145841",
-                    "image.url": "https://pbs.twimg.com/profile_images/1175142789/Austin__TX_normal.jpg",
-                    "extensions.followers": 16695,
-                    "objectType": "page"
+                    "extensions.followers": 16695
                 }
             }
         ],
         [
             {
                 "data": {
-                    "summary": "Leading Social Strategy for @WCGWorld. Hustler. Lakers. Niners. US Marine. Author.",
-                    "extensions.screenName": "Britopian",
+                    "extensions.screenName": "$#*&(%(*#)@#$",
                     "extensions.location": "Silicon Valley, Ca.",
                     "extensions.posts": 50558,
-                    "displayName": "Michael Brito",
-                    "handle": "Britopian",
                     "extensions.favorites": 2408,
-                    "image.url": "https://pbs.twimg.com/profile_images/378800000388239413/59a5f995014ddf639b4827b6e3f403eb_normal.jpeg",
-                    "url": "http://linkd.in/britopian",
-                    "objectType": "page",
-                    "@timestamp": 1417564730230,
-                    "id": "id:twitter:844631",
                     "extensions.followers": 115395
                 }
             }
@@ -159,18 +97,10 @@
         [
             {
                 "data": {
-                    "summary": "Real journalism for the Internet age",
-                    "extensions.screenName": "dailydot",
+                    "extensions.screenName": "#5&*($@(#*&",
                     "extensions.location": "Online/IRL",
                     "extensions.posts": 97369,
-                    "displayName": "The Daily Dot",
-                    "handle": "dailydot",
                     "extensions.favorites": 13677,
-                    "image.url": "https://pbs.twimg.com/profile_images/481571907888615425/R2TXfCgx_normal.png",
-                    "url": "http://dailydot.com/",
-                    "objectType": "page",
-                    "@timestamp": 1417566787760,
-                    "id": "id:twitter:211620426",
                     "extensions.followers": 210024
                 }
             }
@@ -178,18 +108,10 @@
         [
             {
                 "data": {
-                    "summary": "Music Lover, Global Citizen, Digital Native, #FutureofWork, #Vegan, @PwCAdvisory on loan to @PwC_UK, Former @IBMSoftware Exec, OPINIONS=OWN",
-                    "extensions.screenName": "katmandelstein",
+                    "extensions.screenName": "3%&*#$&*((P)@",
                     "extensions.location": "Austinite Abroad in London",
                     "extensions.posts": 32414,
-                    "displayName": "Kat Mandelstein",
-                    "handle": "katmandelstein",
                     "extensions.favorites": 1305,
-                    "image.url": "https://pbs.twimg.com/profile_images/378800000674683761/e57c9b3033a246e9b7ef09fea6fedee2_normal.jpeg",
-                    "url": "http://about.me/katmandelstein",
-                    "objectType": "page",
-                    "@timestamp": 1417554091482,
-                    "id": "id:twitter:14529289",
                     "extensions.followers": 6997
                 }}
         ]

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/434848fa/streams-contrib/streams-persist-mongo/src/main/resources/reference.conf
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-mongo/src/main/resources/reference.conf b/streams-contrib/streams-persist-mongo/src/main/resources/reference.conf
new file mode 100644
index 0000000..fca2903
--- /dev/null
+++ b/streams-contrib/streams-persist-mongo/src/main/resources/reference.conf
@@ -0,0 +1,8 @@
+# Apache Streams (incubating)
+# Licensed under Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0
+"mongo": {
+  "host": "localhost",
+  "port": 27017,
+  "db": "local",
+  "collection": "startup_log"
+}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/434848fa/streams-contrib/streams-persist-mongo/src/main/resources/reference.json
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-mongo/src/main/resources/reference.json b/streams-contrib/streams-persist-mongo/src/main/resources/reference.json
deleted file mode 100644
index 41c9a12..0000000
--- a/streams-contrib/streams-persist-mongo/src/main/resources/reference.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "mongo": {
-        "host": "localhost",
-        "port": 27017,
-        "db": "local",
-        "collection": "startup_log"
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/434848fa/streams-contrib/streams-processor-json/src/test/java/org/apache/streams/json/test/JsonPathExtractorTwitterTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-json/src/test/java/org/apache/streams/json/test/JsonPathExtractorTwitterTest.java b/streams-contrib/streams-processor-json/src/test/java/org/apache/streams/json/test/JsonPathExtractorTwitterTest.java
deleted file mode 100644
index b5d5766..0000000
--- a/streams-contrib/streams-processor-json/src/test/java/org/apache/streams/json/test/JsonPathExtractorTwitterTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.json.test;
-
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.commons.io.FileUtils;
-import org.apache.streams.core.StreamsDatum;
-import org.apache.streams.json.JsonPathExtractor;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
-/**
- * Test for extracting json fields and
- * objects from datums using JsonPath syntax
- */
-public class JsonPathExtractorTwitterTest {
-
-    private final static Logger LOGGER = LoggerFactory.getLogger(JsonPathExtractorTwitterTest.class);
-
-    private String testJson;
-
-    @Before
-    public void initialize() {
-        try {
-            testJson = FileUtils.readFileToString(new File("src/test/resources/tweet.json"));
-        } catch (IOException e) {
-            e.printStackTrace();
-            Assert.fail();
-        }
-    }
-
-    @Test
-    public void test1()
-    {
-        JsonPathExtractor extractor = new JsonPathExtractor();
-        extractor.prepare("$.user.id_str");
-        List<StreamsDatum> result = extractor.process(new StreamsDatum(testJson));
-        assertThat(result.size(), is(1));
-        assertTrue(result.get(0).getDocument() instanceof String);
-        assertThat((String)result.get(0).getDocument(), is("3971941"));
-    }
-
-    @Test
-    public void test2()
-    {
-        JsonPathExtractor extractor = new JsonPathExtractor();
-        extractor.prepare("$.created_at");
-        List<StreamsDatum> result = extractor.process(new StreamsDatum(testJson));
-        assertThat(result.size(), is(1));
-        assertTrue(result.get(0).getDocument() instanceof String);
-        assertThat((String)result.get(0).getDocument(), is("Thu May 08 15:58:59 +0000 2014"));
-    }
-
-    @Test
-    public void test3()
-    {
-        JsonPathExtractor extractor = new JsonPathExtractor();
-        extractor.prepare("$.user");
-        List<StreamsDatum> result = extractor.process(new StreamsDatum(testJson));
-        assertThat(result.size(), is(1));
-        assertTrue(result.get(0).getDocument() instanceof ObjectNode);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/434848fa/streams-contrib/streams-processor-json/src/test/resources/tweet.json
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-json/src/test/resources/tweet.json b/streams-contrib/streams-processor-json/src/test/resources/tweet.json
deleted file mode 100644
index 8975829..0000000
--- a/streams-contrib/streams-processor-json/src/test/resources/tweet.json
+++ /dev/null
@@ -1 +0,0 @@
-{"contributors":null,"text":"I just read through an entire white paper and enjoyed it. Is this how mid-life begins?","geo":null,"retweeted":false,"in_reply_to_screen_name":null,"truncated":false,"lang":"en","entities":{"symbols":[],"urls":[],"hashtags":[],"user_mentions":[]},"in_reply_to_status_id_str":null,"id":464434297516986368,"source":"web","in_reply_to_user_id_str":null,"favorited":false,"in_reply_to_status_id":null,"retweet_count":1,"created_at":"Thu May 08 15:58:59 +0000 2014","in_reply_to_user_id":null,"favorite_count":0,"id_str":"464434297516986368","place":null,"user":{"location":"Austin, TX","default_profile":false,"profile_background_tile":false,"statuses_count":8135,"lang":"en","profile_link_color":"0000FF","profile_banner_url":"https://pbs.twimg.com/profile_banners/3971941/1397146508","id":3971941,"following":false,"protected":false,"favourites_count":19,"profile_text_color":"383838","description":"VP of the McBeth family, @alliemcbeth is CEO. Head of Media & Planning
  @WCG, binge cyclist, west coast kid, self Google-er. Own most of my opinions.","verified":false,"contributors_enabled":false,"profile_sidebar_border_color":"000000","name":"Dean McBeth","profile_background_color":"101010","created_at":"Tue Apr 10 02:44:04 +0000 2007","is_translation_enabled":false,"default_profile_image":false,"followers_count":7453,"profile_image_url_https":"https://pbs.twimg.com/profile_images/2455687917/5nviqk54ga68222vxhhk_normal.jpeg","geo_enabled":true,"profile_background_image_url":"http://pbs.twimg.com/profile_background_images/449113958/JESS3_SXSW_dean.jpg","profile_background_image_url_https":"https://pbs.twimg.com/profile_background_images/449113958/JESS3_SXSW_dean.jpg","follow_request_sent":false,"entities":{"description":{"urls":[]},"url":{"urls":[{"expanded_url":"http://about.me/evilspinmeister","indices":[0,22],"display_url":"about.me/evilspinmeister","url":"http://t.co/1l1lAsEuO0"}]}},"url":"http://t.co/1l1lAsEuO0","utc_offset":-25200,"time_zone":"P
 acific Time (US & Canada)","notifications":false,"profile_use_background_image":true,"friends_count":2768,"profile_sidebar_fill_color":"000000","screen_name":"evilspinmeister","id_str":"3971941","profile_image_url":"http://pbs.twimg.com/profile_images/2455687917/5nviqk54ga68222vxhhk_normal.jpeg","listed_count":383,"is_translator":false},"coordinates":null}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/434848fa/streams-contrib/streams-processor-peoplepattern/src/main/resources/templates/peoplepatternactor.json
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-peoplepattern/src/main/resources/templates/peoplepatternactor.json b/streams-contrib/streams-processor-peoplepattern/src/main/resources/templates/peoplepatternactor.json
index 9a24c5c..21285e4 100644
--- a/streams-contrib/streams-processor-peoplepattern/src/main/resources/templates/peoplepatternactor.json
+++ b/streams-contrib/streams-processor-peoplepattern/src/main/resources/templates/peoplepatternactor.json
@@ -1,4 +1,7 @@
 {
+    "$license": [
+      "http://www.apache.org/licenses/LICENSE-2.0"
+    ],
 	"order": 20,
 	"template": "*activity*",
 	"settings": {},

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/434848fa/streams-contrib/streams-provider-datasift/src/test/java17/com/datasift/test/DatasiftSerDeTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/src/test/java17/com/datasift/test/DatasiftSerDeTest.java b/streams-contrib/streams-provider-datasift/src/test/java17/com/datasift/test/DatasiftSerDeTest.java
index 750915e..a682b79 100644
--- a/streams-contrib/streams-provider-datasift/src/test/java17/com/datasift/test/DatasiftSerDeTest.java
+++ b/streams-contrib/streams-provider-datasift/src/test/java17/com/datasift/test/DatasiftSerDeTest.java
@@ -18,7 +18,6 @@
 
 package com.datasift.test;
 
-import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Lists;
 import org.apache.streams.datasift.Datasift;
@@ -33,12 +32,11 @@ import org.slf4j.LoggerFactory;
 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
- *
+ * Tests serialization of Datasift inputs
  */
+@Ignore("ignore until test resources are available.")
 public class DatasiftSerDeTest {
 
     private final static Logger LOGGER = LoggerFactory.getLogger(DatasiftSerDeTest.class);

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/434848fa/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftActivitySerializerTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftActivitySerializerTest.java b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftActivitySerializerTest.java
index 1cdd0cf..56ce262 100644
--- a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftActivitySerializerTest.java
+++ b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftActivitySerializerTest.java
@@ -18,7 +18,6 @@
 
 package org.apache.streams.datasift.serializer;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang.StringUtils;
@@ -30,15 +29,18 @@ import org.apache.streams.pojo.json.Activity;
 import org.apache.streams.pojo.json.Actor;
 import org.apache.streams.util.files.StreamsScannerUtil;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
-import java.io.InputStream;
 import java.util.Scanner;
-import java.util.regex.Pattern;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
+/**
+ * Tests serialization and conversion of Datasift inputs
+ */
+@Ignore("ignore until test resources are available.")
 public class DatasiftActivitySerializerTest {
 
     protected ActivitySerializer SERIALIZER;

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/434848fa/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftEventClassifierTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftEventClassifierTest.java b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftEventClassifierTest.java
index a29d0f4..257e8ef 100644
--- a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftEventClassifierTest.java
+++ b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftEventClassifierTest.java
@@ -26,15 +26,15 @@ import org.apache.streams.datasift.twitter.Twitter;
 import org.apache.streams.datasift.util.StreamsDatasiftMapper;
 import org.apache.streams.jackson.StreamsJacksonMapper;
 import org.apache.streams.util.files.StreamsScannerUtil;
+import org.junit.Ignore;
 import org.junit.Test;
 
-import java.io.InputStream;
 import java.util.Scanner;
-import java.util.regex.Pattern;
 
 /**
- * Created by sblackmon on 12/13/13.
+ * Tests serialization and conversion of Datasift inputs
  */
+@Ignore("ignore until test resources are available.")
 public class DatasiftEventClassifierTest {
 
     private static final ObjectMapper MAPPER = StreamsJacksonMapper.getInstance(Lists.newArrayList(StreamsDatasiftMapper.DATASIFT_FORMAT));

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/434848fa/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftInstagramActivitySerializerTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftInstagramActivitySerializerTest.java b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftInstagramActivitySerializerTest.java
index ad7ea5c..eb74622 100644
--- a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftInstagramActivitySerializerTest.java
+++ b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftInstagramActivitySerializerTest.java
@@ -18,25 +18,18 @@
 
 package org.apache.streams.datasift.serializer;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.Lists;
-import org.apache.commons.lang.StringUtils;
 import org.apache.streams.datasift.Datasift;
-import org.apache.streams.datasift.util.StreamsDatasiftMapper;
-import org.apache.streams.jackson.StreamsJacksonMapper;
-import org.apache.streams.pojo.json.Activity;
-import org.apache.streams.pojo.json.Actor;
 import org.apache.streams.util.files.StreamsScannerUtil;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
-import java.io.InputStream;
 import java.util.Scanner;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
+/**
+ * Tests serialization and conversion of Datasift inputs
+ */
+@Ignore("ignore until test resources are available.")
 public class DatasiftInstagramActivitySerializerTest extends DatasiftActivitySerializerTest {
 
     @Before

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/434848fa/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftInteractionActivitySerializerTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftInteractionActivitySerializerTest.java b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftInteractionActivitySerializerTest.java
index 68e041b..2865aa6 100644
--- a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftInteractionActivitySerializerTest.java
+++ b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftInteractionActivitySerializerTest.java
@@ -18,25 +18,18 @@
 
 package org.apache.streams.datasift.serializer;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.Lists;
-import org.apache.commons.lang.StringUtils;
 import org.apache.streams.datasift.Datasift;
-import org.apache.streams.datasift.util.StreamsDatasiftMapper;
-import org.apache.streams.jackson.StreamsJacksonMapper;
-import org.apache.streams.pojo.json.Activity;
-import org.apache.streams.pojo.json.Actor;
 import org.apache.streams.util.files.StreamsScannerUtil;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
-import java.io.InputStream;
 import java.util.Scanner;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
+/**
+ * Tests serialization and conversion of Datasift inputs
+ */
+@Ignore("ignore until test resources are available.")
 public class DatasiftInteractionActivitySerializerTest extends DatasiftActivitySerializerTest {
 
     @Before

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/434848fa/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftTwitterActivitySerializerTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftTwitterActivitySerializerTest.java b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftTwitterActivitySerializerTest.java
index 652d381..219706a 100644
--- a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftTwitterActivitySerializerTest.java
+++ b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftTwitterActivitySerializerTest.java
@@ -18,27 +18,18 @@
 
 package org.apache.streams.datasift.serializer;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.Lists;
-import org.apache.commons.lang.StringUtils;
 import org.apache.streams.datasift.Datasift;
-import org.apache.streams.datasift.util.StreamsDatasiftMapper;
-import org.apache.streams.jackson.StreamsJacksonMapper;
-import org.apache.streams.pojo.json.Activity;
-import org.apache.streams.pojo.json.Actor;
 import org.apache.streams.util.files.StreamsScannerUtil;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
-import java.io.InputStream;
-import java.net.URL;
 import java.util.Scanner;
-import java.util.regex.Pattern;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 
+/**
+ * Tests serialization and conversion of Datasift inputs
+ */
+@Ignore("ignore until test resources are available.")
 public class DatasiftTwitterActivitySerializerTest extends DatasiftActivitySerializerTest {
 
     @Before