streams-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reba...@apache.org
Subject [1/4] incubator-streams git commit: Merge pull request #14 from apache/master
Date Fri, 21 Nov 2014 00:22:25 GMT
Repository: incubator-streams
Updated Branches:
  refs/heads/master cb9c6f548 -> 6c32ce214


Merge pull request #14 from apache/master

Merge Apache Master 2014/11/20

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

Branch: refs/heads/master
Commit: 7dd0b7765a019d77ff7fe06fda27a3d9b938bb39
Parents: f3de6f8 1b55741
Author: Ryan Ebanks <rbnks@users.noreply.github.com>
Authored: Thu Nov 20 11:24:47 2014 -0600
Committer: Ryan Ebanks <rbnks@users.noreply.github.com>
Committed: Thu Nov 20 11:24:47 2014 -0600

----------------------------------------------------------------------
 streams-config/pom.xml                          |  14 +-
 .../streams/config/ComponentConfigurator.java   |  73 +++++++
 .../streams/config/StreamsConfigurator.java     |  41 +++-
 .../main/jsonschema/ComponentConfiguration.json |  23 ++
 .../main/jsonschema/StreamsConfiguration.json   |   7 +-
 .../config/test/ComponentConfiguratorTest.java  | 125 +++++++++++
 .../config/test/StreamsConfiguratorTest.java    |  69 ++++++
 .../src/test/resources/componentTest.conf       |  11 +
 .../serializer/FacebookActivityUtil.java        |   2 +-
 .../gplus/provider/AbstractGPlusProvider.java   |  31 +--
 .../gplus/provider/GPlusConfigurator.java       |  32 +--
 .../provider/GPlusUserActivityProvider.java     |  11 +
 .../gplus/provider/GPlusUserDataProvider.java   |  11 +
 .../com/google/gplus/GPlusConfiguration.json    |  17 +-
 .../provider/TestAbstractGPlusProvider.java     |   7 +-
 .../processor/TwitterEventProcessor.java        | 194 +++++++++++++++++
 .../twitter/processor/TwitterTypeConverter.java | 209 +++++++++++++++++++
 .../tasks/BroadcastMonitorThread.java           |   5 +-
 .../org/apache/streams/pojo/json/Broadcast.json |   8 +
 .../local/builders/LocalStreamBuilder.java      |  37 +++-
 .../streams/local/builders/StreamComponent.java |  31 +--
 .../local/counters/DatumStatusCounter.java      |   9 +-
 .../local/counters/StreamsTaskCounter.java      |  16 +-
 .../streams/local/queues/ThroughputQueue.java   |  52 ++++-
 .../streams/local/tasks/BaseStreamsTask.java    |  41 +++-
 .../streams/local/tasks/StreamsMergeTask.java   |   7 +-
 .../local/tasks/StreamsPersistWriterTask.java   |  11 +-
 .../local/tasks/StreamsProcessorTask.java       |  14 +-
 .../local/tasks/StreamsProviderTask.java        |  11 +-
 .../local/builders/LocalStreamBuilderTest.java  |   9 +-
 .../local/counters/DatumStatusCounterTest.java  |  22 +-
 .../local/counters/StreamsTaskCounterTest.java  |  21 +-
 .../queues/ThroughputQueueMulitThreadTest.java  |   5 +-
 .../queues/ThroughputQueueSingleThreadTest.java |  15 +-
 .../streams/local/tasks/BasicTasksTest.java     |   6 +-
 .../local/tasks/StreamsProviderTaskTest.java    |  10 +-
 .../streams/storm/trident/StreamsTopology.java  |   2 +-
 37 files changed, 1072 insertions(+), 137 deletions(-)
----------------------------------------------------------------------



Mime
View raw message