Merge branch 'STREAMS-218'

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

Branch: refs/heads/master
Commit: 536f85d34c3ca53032177bc66ae534bb883364fe
Parents: acc7c84 a9358f9
Author: sblackmon <[email protected]>
Authored: Thu Dec 11 14:24:44 2014 -0600
Committer: sblackmon <[email protected]>
Committed: Thu Dec 11 14:24:44 2014 -0600

----------------------------------------------------------------------
 .../converter/ActivityConverterProcessor.java   | 262 +++++++++++++++++++
 .../converter/BaseDocumentClassifier.java       |  83 ++++++
 .../BaseObjectNodeActivityConverter.java        |  93 +++++++
 .../converter/BaseStringActivityConverter.java  |  93 +++++++
 ...ActivityConverterProcessorConfiguration.json |  23 ++
 .../BaseActivityConverterProcessorTest.java     |  92 +++++++
 .../converter/test/CustomActivityConverter.java |  72 +++++
 .../CustomActivityConverterProcessorTest.java   | 103 ++++++++
 .../test/CustomDocumentClassifier.java          |  75 ++++++
 .../streams/converter/test/CustomType.java      |  37 +++
 .../apache/streams/core/util/DatumUtils.java    |  12 +
 .../apache/streams/data/ActivityConverter.java  |  87 ++++++
 .../apache/streams/data/ActivitySerializer.java |   4 +-
 .../apache/streams/data/DocumentClassifier.java |  39 +++
 .../exceptions/ActivityConversionException.java |  42 +++
 15 files changed, 1116 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


Reply via email to