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 2014/10/01 17:51:49 UTC
[23/50] [abbrv] git commit: Auto-merge | Integrating changes from
apache/master
Auto-merge | Integrating changes from apache/master
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/84bbfbec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/84bbfbec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/84bbfbec
Branch: refs/heads/REDBULL-1604
Commit: 84bbfbecc0bdf973ecec6e54c4a017a67d84d74c
Parents: d7147db 67ab1ff
Author: W2O Deployer <ds...@w2odigital.com>
Authored: Thu Aug 28 15:32:47 2014 -0400
Committer: W2O Deployer <ds...@w2odigital.com>
Committed: Thu Aug 28 15:32:47 2014 -0400
----------------------------------------------------------------------
pom.xml | 2 +-
streams-contrib/pom.xml | 1 +
.../streams-processor-jackson/pom.xml | 86 ++
.../CleanAdditionalPropertiesProcessor.java | 62 +
.../regex/AbstractRegexExtensionExtractor.java | 13 +-
.../streams-provider-datasift/pom.xml | 21 +-
.../streams/datasift/csdl/DatasiftCsdlUtil.java | 6 +-
.../DatasiftTypeConverterProcessor.java | 154 +++
.../provider/DatasiftManagedSourceSetup.java | 76 ++
.../provider/DatasiftStreamConfigurator.java | 15 +-
.../DatasiftTypeConverterProcessor.java | 167 ---
.../serializer/DatasiftActivitySerializer.java | 5 +-
.../DatasiftDefaultActivitySerializer.java | 13 +-
.../DatasiftInstagramActivitySerializer.java | 118 ++
.../DatasiftTweetActivitySerializer.java | 6 +
.../main/jsonschema/com/datasift/Datasift.json | 1103 ------------------
.../com/datasift/DatasiftConfiguration.json | 22 -
.../com/datasift/DatasiftPushConfiguration.json | 17 -
.../datasift/DatasiftStreamConfiguration.json | 17 -
.../com/datasift/DatasiftTwitterUser.json | 68 --
.../org/apache/streams/datasift/Datasift.json | 458 ++++++++
.../streams/datasift/DatasiftConfiguration.json | 133 +++
.../datasift/DatasiftPushConfiguration.json | 17 +
.../datasift/DatasiftStreamConfiguration.json | 17 +
.../datasift/facebook/DatasiftFacebook.json | 120 ++
.../datasift/instagram/DatasiftInstagram.json | 178 +++
.../interaction/DatasiftInteraction.json | 92 ++
.../datasift/twitter/DatasiftTwitter.json | 365 ++++++
.../datasift/twitter/DatasiftTwitterMedia.json | 126 ++
.../datasift/twitter/DatasiftTwitterUser.json | 68 ++
.../DatasiftTypeConverterProcessorTest.java | 5 +-
.../DatasiftActivitySerializerTest.java | 19 +-
.../test/resources/instagram_datasift_json.txt | 25 +
.../org/apache/streams/data/util/JsonUtil.java | 8 +-
.../jackson/StreamsDateTimeSerializer.java | 4 -
.../streams/jackson/StreamsJacksonMapper.java | 10 -
.../jackson/StreamsPeriodDeserializer.java | 1 -
.../jackson/StreamsPeriodSerializer.java | 2 -
.../data/data/util/DateTimeSerDeTest.java | 2 -
39 files changed, 2182 insertions(+), 1440 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/84bbfbec/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/84bbfbec/streams-contrib/pom.xml
----------------------------------------------------------------------
diff --cc streams-contrib/pom.xml
index 96db214,e290466..ee2aa6f
--- a/streams-contrib/pom.xml
+++ b/streams-contrib/pom.xml
@@@ -48,14 -48,15 +48,15 @@@
<!--<module>streams-processor-lucene</module>-->
<!--<module>streams-processor-tika</module>-->
<module>streams-provider-instagram</module>
+ <module>streams-processor-jackson</module>
<module>streams-processor-json</module>
<module>streams-processor-urls</module>
- <module>streams-provider-datasift</module>
+ <module>streams-provider-gnip</module>
<module>streams-provider-facebook</module>
<module>streams-provider-google</module>
- <module>streams-provider-gnip</module>
<module>streams-provider-moreover</module>
<module>streams-provider-twitter</module>
+ <module>streams-provider-datasift</module>
<module>streams-provider-sysomos</module>
<module>streams-provider-rss</module>
<module>streams-processor-regex</module>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/84bbfbec/streams-contrib/streams-provider-datasift/pom.xml
----------------------------------------------------------------------