streams-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sblack...@apache.org
Subject [39/41] git commit: Merge remote-tracking branch 'apache/STREAMS-142'
Date Thu, 04 Sep 2014 17:12:27 GMT
Merge remote-tracking branch 'apache/STREAMS-142'


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

Branch: refs/heads/pp
Commit: 67ab1ff6ef6a1c5649c0cee164d397eeea9a8fb9
Parents: 6b632de 0536c98
Author: sblackmon <sblackmon@apache.org>
Authored: Thu Aug 28 14:14:45 2014 -0500
Committer: sblackmon <sblackmon@apache.org>
Committed: Thu Aug 28 14:14:45 2014 -0500

----------------------------------------------------------------------
 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/67ab1ff6/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/67ab1ff6/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftActivitySerializer.java
----------------------------------------------------------------------


Mime
View raw message