Merge pull request #18 from apache/master Merge Apache Master 2014/12/08
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/ce67d58f Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/ce67d58f Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/ce67d58f Branch: refs/heads/master Commit: ce67d58fff0c56f07a3781a2cd5c20c479ac75d5 Parents: f31b82f 8517eed Author: Ryan Ebanks <[email protected]> Authored: Mon Dec 8 16:29:50 2014 -0600 Committer: Ryan Ebanks <[email protected]> Committed: Mon Dec 8 16:29:50 2014 -0600 ---------------------------------------------------------------------- pom.xml | 24 +++++++++- streams-contrib/streams-processor-urls/pom.xml | 8 ++++ .../org/apache/streams/urls/LinkResolver.java | 37 ++++++++++----- .../streams/urls/TestLinkUnwinderProcessor.java | 47 ++++++++++++------ .../streams-provider-datasift/pom.xml | 50 ++++++++------------ .../DatasiftActivitySerializerTest.java | 7 ++- .../serializer/DatasiftEventClassifierTest.java | 11 ++++- ...DatasiftInstagramActivitySerializerTest.java | 6 ++- ...tasiftInteractionActivitySerializerTest.java | 6 ++- .../DatasiftTwitterActivitySerializerTest.java | 8 +++- streams-util/pom.xml | 15 ++++++ .../streams/util/files/StreamsScannerUtil.java | 21 ++++++++ 12 files changed, 176 insertions(+), 64 deletions(-) ----------------------------------------------------------------------
