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/11/08 21:13:11 UTC

[20/38] incubator-streams git commit: Merge pull request #11 from apache/master

Merge pull request #11 from apache/master

Merge Apache master 2014/10/31

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

Branch: refs/heads/STREAMS-49
Commit: 5c2e8322fb407df1d4059609a205569f71bc2b31
Parents: 2c71550 d88e8c8
Author: Ryan Ebanks <rb...@users.noreply.github.com>
Authored: Fri Oct 31 16:22:28 2014 -0500
Committer: Ryan Ebanks <rb...@users.noreply.github.com>
Committed: Fri Oct 31 16:22:28 2014 -0500

----------------------------------------------------------------------
 streams-contrib/streams-amazon-aws/pom.xml      |   2 +-
 .../org/apache/streams/s3/S3Configurator.java   |  55 +++----
 .../org/apache/streams/s3/S3PersistReader.java  |  11 +-
 .../org/apache/streams/s3/S3PersistWriter.java  |  10 +-
 .../org/apache/streams/s3/S3Configuration.json  |  18 ++-
 .../google-gplus/pom.xml                        |   2 +-
 .../processor/GooglePlusTypeConverter.java      |  91 +++++++++++
 .../util/GPlusPersonDeserializer.java           | 107 +++++++++++++
 .../serializer/util/GooglePlusActivityUtil.java | 115 ++++++++++++++
 .../google/gplus/GooglePlusPersonSerDeTest.java |  97 ++++++++++++
 .../processor/GooglePlusTypeConverterTest.java  |  98 ++++++++++++
 .../test/resources/google_plus_person_jsons.txt |   2 +
 .../streams/core/DatumStatusCountable.java      |   2 +
 .../apache/streams/core/DatumStatusCounter.java |   7 +-
 streams-runtimes/streams-runtime-local/pom.xml  |   6 +-
 .../streams/local/builders/StreamComponent.java |   1 +
 .../local/counters/DatumStatusCounter.java      |  83 ++++++++++
 .../counters/DatumStatusCounterMXBean.java      |  43 +++++
 .../local/counters/StreamsTaskCounter.java      | 157 ++++++++++++++++++
 .../counters/StreamsTaskCounterMXBean.java      |  63 ++++++++
 ...amOnUnhandleThrowableThreadPoolExecutor.java |  17 ++
 .../tasks/LocalStreamProcessMonitorThread.java  |   1 +
 .../tasks/StatusCounterMonitorRunnable.java     |   1 +
 .../local/tasks/StatusCounterMonitorThread.java |   1 +
 .../local/counters/DatumStatusCounterTest.java  | 134 ++++++++++++++++
 .../local/counters/StreamsTaskCounterTest.java  | 158 +++++++++++++++++++
 .../org/apache/streams/util/ComponentUtils.java |  19 ++-
 27 files changed, 1253 insertions(+), 48 deletions(-)
----------------------------------------------------------------------