Merge pull request #16 from apache/master

Used revert to rewind 6 merges, pushed to this repo mistakenly.

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

Branch: refs/heads/master
Commit: 5f3343b4bc97c99b225b264a5a2b1166cfde514b
Parents: 4d901b4 7afd6e0
Author: Ryan Ebanks <[email protected]>
Authored: Mon Nov 24 15:13:02 2014 -0600
Committer: Ryan Ebanks <[email protected]>
Committed: Mon Nov 24 15:13:02 2014 -0600

----------------------------------------------------------------------
 .gitignore                                      |   6 -
 streams-components/pom.xml                      |   1 -
 streams-components/streams-converters/pom.xml   | 140 ----------
 .../converter/ActivityConverterProcessor.java   | 167 ------------
 .../BaseActivityConverterResolver.java          |  31 ---
 .../converter/BaseDocumentClassifier.java       |  66 -----
 .../BaseObjectNodeActivityConverter.java        |  65 -----
 .../converter/BaseStringActivityConverter.java  |  65 -----
 .../CleanAdditionalPropertiesProcessor.java     |  62 -----
 .../converter/TypeConverterProcessor.java       |  83 ------
 .../streams/converter/TypeConverterUtil.java    |  51 ----
 ...ActivityConverterProcessorConfiguration.json |  23 --
 .../test/ActivityConverterProcessorTest.java    |  86 ------
 .../test/TypeConverterProcessorTest.java        |  94 -------
 streams-components/streams-http/README.md       |   9 -
 streams-components/streams-http/pom.xml         |  17 --
 .../components/http/HttpConfigurator.java       |  13 -
 .../persist/SimpleHTTPPostPersistWriter.java    | 192 -------------
 .../http/processor/SimpleHTTPGetProcessor.java  |  34 +--
 .../http/HttpPersistWriterConfiguration.json    |  15 -
 .../java/SimpleHTTPPostPersistWriterTest.java   | 119 --------
 streams-contrib/pom.xml                         |   2 +-
 streams-contrib/streams-persist-graph/README.md |  44 ---
 streams-contrib/streams-persist-graph/pom.xml   |  96 -------
 .../streams/graph/GraphPersistWriter.java       | 194 -------------
 .../streams/graph/neo4j/CypherGraphUtil.java    | 147 ----------
 .../streams/graph/GraphConfiguration.json       |  19 --
 .../graph/GraphEdgeWriterConfiguration.json     |  30 --
 .../graph/GraphVertexWriterConfiguration.json   |  30 --
 .../streams/graph/GraphWriterConfiguration.json |  18 --
 .../streams-processor-jackson/pom.xml           |  86 ++++++
 .../CleanAdditionalPropertiesProcessor.java     |  62 +++++
 .../streams/jackson/TypeConverterProcessor.java | 112 ++++++++
 .../test/TypeConverterProcessorTest.java        |  95 +++++++
 .../streams-provider-datasift/pom.xml           |   2 +-
 .../DatasiftActivitySerializerProcessor.java    |   9 +-
 .../DatasiftTypeConverterProcessor.java         |   8 +-
 .../serializer/DatasiftActivityConverter.java   |  77 ------
 .../serializer/DatasiftActivitySerializer.java  |  65 +++++
 .../serializer/DatasiftConverterResolver.java   |  50 ----
 .../serializer/DatasiftEventClassifier.java     |  35 ++-
 .../DatasiftInstagramActivityConverter.java     | 124 ---------
 .../DatasiftInstagramActivitySerializer.java    | 124 +++++++++
 .../DatasiftInteractionActivityConverter.java   | 222 ---------------
 .../DatasiftInteractionActivitySerializer.java  | 222 +++++++++++++++
 .../DatasiftTwitterActivityConverter.java       | 272 -------------------
 .../DatasiftTwitterActivitySerializer.java      | 272 +++++++++++++++++++
 .../datasift/util/StreamsDatasiftMapper.java    |   3 +-
 .../com/datasift/test/DatasiftSerDeTest.java    |   2 +-
 .../DatasiftActivityConverterTest.java          |  85 ------
 .../DatasiftActivitySerializerTest.java         |  86 ++++++
 .../serializer/DatasiftEventClassifierTest.java |  26 +-
 .../DatasiftInstagramActivityConverterTest.java |  35 ---
 ...DatasiftInstagramActivitySerializerTest.java |  43 +++
 ...atasiftInteractionActivityConverterTest.java |  40 ---
 ...tasiftInteractionActivitySerializerTest.java |  48 ++++
 .../DatasiftTwitterActivityConverterTest.java   |  35 ---
 .../DatasiftTwitterActivitySerializerTest.java  |  43 +++
 .../api/FacebookPageActivityConverter.java      |  76 ------
 .../api/FacebookPageActivitySerializer.java     |  66 +++++
 .../api/FacebookPostActivityConverter.java      |  79 ------
 .../api/FacebookPostActivitySerializer.java     |  69 +++++
 .../processor/FacebookTypeConverter.java        |  22 +-
 .../provider/FacebookEventClassifier.java       |  57 ++++
 .../serializer/FacebookConverterResolver.java   |  62 -----
 .../serializer/FacebookDocumentClassifier.java  |  75 -----
 .../FacebookStreamsPostConverter.java           |  60 ----
 .../FacebookStreamsPostSerializer.java          |  60 ++++
 .../test/FacebookActivityActorSerDeTest.java    |   6 +-
 .../test/FacebookActivitySerDeTest.java         |   4 +-
 .../test/FacebookDocumentClassifierTest.java    |  57 ----
 .../test/FacebookEventClassifierTest.java       |  57 ++++
 .../streams/facebook/test/SimplePageTest.java   |   4 +-
 .../com/gplus/api/GPlusActivityConverter.java   |  93 -------
 .../com/gplus/api/GPlusActivitySerializer.java  |  93 +++++++
 .../com/gplus/api/GPlusEDCAsActivityTest.java   |   4 +-
 .../com/reddit/api/RedditActivityConverter.java | 107 --------
 .../reddit/api/RedditActivitySerializer.java    | 107 ++++++++
 .../reddit/api/RedditEDCAsActivityJSONTest.java |   4 +-
 .../ActivityXMLActivityConverter.java           | 240 ----------------
 .../ActivityXMLActivitySerializer.java          | 240 ++++++++++++++++
 .../powertrack/PowerTrackActivityConverter.java | 121 ---------
 .../PowerTrackActivitySerializer.java           | 121 +++++++++
 .../test/PowerTrackDeserializationTest.java     |   6 +-
 .../gmail/provider/GMailImapProviderTask.java   |   5 +-
 .../provider/GMailMessageActivityConverter.java | 202 --------------
 .../GMailMessageActivitySerializer.java         | 212 +++++++++++++++
 .../processor/GooglePlusCommentProcessor.java   |   3 -
 .../processor/GooglePlusTypeConverter.java      |   4 -
 .../gplus/provider/GPlusActivityConverter.java  |  67 -----
 .../gplus/provider/GPlusActivitySerializer.java |  67 +++++
 .../gplus/provider/GPlusEventProcessor.java     |  94 +++++++
 .../processor/InstagramTypeConverter.java       |  10 +-
 .../InstagramJsonActivityConverter.java         |  78 ------
 .../InstagramJsonActivitySerializer.java        |  78 ++++++
 .../serializer/InstagramUserInfoConverter.java  |  81 ------
 .../serializer/InstagramUserInfoSerializer.java |  83 ++++++
 .../data/MoreoverJsonActivitySerializer.java    |  93 +++++++
 .../data/MoreoverXmlActivitySerializer.java     | 105 +++++++
 .../conversion/MoreoverConverterResolver.java   |  20 --
 .../conversion/MoreoverDocumentClassifier.java  |  22 --
 .../MoreoverJsonActivityConverter.java          |  94 -------
 .../MoreoverXmlActivityConverter.java           | 106 --------
 .../data/MoreoverJsonActivityConverterTest.java |  66 -----
 .../MoreoverJsonActivitySerializerTest.java     |  72 +++++
 .../data/MoreoverXmlActivityConverterTest.java  |  62 -----
 .../data/MoreoverXmlActivitySerializerTest.java |  61 +++++
 .../streams/rss/processor/RssTypeConverter.java |  10 +-
 .../rss/provider/RssDocumentClassifier.java     |  35 ---
 .../rss/provider/RssEventClassifier.java        |  32 +++
 .../streams/rss/provider/RssEventProcessor.java | 103 +++++++
 .../rss/serializer/RssConverterResolver.java    |  18 --
 .../serializer/SyndEntryActivityConverter.java  | 232 ----------------
 .../serializer/SyndEntryActivitySerializer.java | 235 ++++++++++++++++
 .../test/SyndEntryActivitySerizlizerTest.java   |   4 +-
 .../SysomosBeatActivityConverter.java           |  35 +--
 .../conversion/SysomosConverterResolver.java    |  18 --
 .../conversion/SysomosDocumentClassifier.java   |  16 --
 .../sysomos/processor/SysomosTypeConverter.java |   4 -
 .../streams-provider-twitter/pom.xml            |   9 +-
 .../FetchAndReplaceTwitterProcessor.java        |   4 +-
 .../processor/TwitterProfileProcessor.java      |   4 +-
 .../provider/TwitterEventClassifier.java        |  99 +++++++
 .../TwitterUserInformationProvider.java         |   2 +-
 .../serializer/StreamsTwitterMapper.java        |  10 +-
 .../serializer/TwitterConverterResolver.java    |  61 -----
 .../serializer/TwitterDocumentClassifier.java   |  85 ------
 .../TwitterJsonActivityConverter.java           |  81 ------
 .../TwitterJsonActivitySerializer.java          |  70 +++++
 .../TwitterJsonDeleteActivityConverter.java     |  84 ------
 .../TwitterJsonDeleteActivitySerializer.java    |  94 +++++++
 .../TwitterJsonRetweetActivityConverter.java    |  78 ------
 .../TwitterJsonRetweetActivitySerializer.java   |  79 ++++++
 .../TwitterJsonTweetActivityConverter.java      |  76 ------
 .../TwitterJsonTweetActivitySerializer.java     |  77 ++++++
 .../TwitterJsonUserActivityConverter.java       |  77 ------
 .../TwitterJsonUserActivitySerializer.java      |  78 ++++++
 ...terJsonUserstreameventActivityConverter.java | 115 --------
 ...erJsonUserstreameventActivitySerializer.java | 115 ++++++++
 .../serializer/util/TwitterActivityUtil.java    |   7 +-
 .../streams/twitter/test/FullTweetTest.java     | 119 --------
 .../streams/twitter/test/SimpleTweetTest.java   |  43 +--
 .../twitter/test/TweetActivitySerDeTest.java    |  32 +--
 .../streams/twitter/test/TweetSerDeTest.java    |   8 +-
 .../test/TwitterDocumentClassifierTest.java     | 117 --------
 .../test/TwitterEventClassifierTest.java        | 100 +++++++
 .../apache/streams/data/util/PropertyUtil.java  |  89 ------
 .../apache/streams/data/ActivityConverter.java  |  60 ----
 .../streams/data/ActivityConverterFactory.java  |  27 --
 .../streams/data/ActivityConverterResolver.java |  43 ---
 .../apache/streams/data/ActivitySerializer.java |  60 ++++
 .../apache/streams/data/DocumentClassifier.java |  41 ---
 .../apache/streams/data/util/ActivityUtil.java  |   3 -
 .../ActivityDeserializerException.java          |   7 +-
 .../exceptions/ActivitySerializerException.java |   7 +-
 .../jackson/StreamsDateTimeDeserializer.java    |  10 +-
 .../jackson/StreamsDateTimeSerializer.java      |   5 +-
 .../streams/jackson/StreamsJacksonMapper.java   |  18 +-
 .../streams/jackson/StreamsJacksonModule.java   |   3 +-
 .../streams/pig/StreamsComponentFactory.java    |  13 +-
 .../streams/pig/StreamsProcessDocumentExec.java |  11 +
 .../streams/pig/StreamsSerializerExec.java      |  16 +-
 .../streams/pig/test/PigProcessDatumTest.java   |   6 +
 .../pig/test/PigProcessDocumentTest.java        |   3 +
 .../streams/pig/test/PigSerializerTest.java     |  12 +-
 .../src/test/resources/pigserializertest.pig    |   2 +-
 166 files changed, 4348 insertions(+), 6331 deletions(-)
----------------------------------------------------------------------


Reply via email to