streams-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sblack...@apache.org
Subject [21/32] incubator-streams git commit: Merge branch 'STREAMS-254' into 0.1-rc1
Date Wed, 17 Dec 2014 21:04:45 GMT
Merge branch 'STREAMS-254' into 0.1-rc1

Conflicts:
	pom.xml


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

Branch: refs/heads/0.1-rc1
Commit: 99d01237eddd5e2975035dc8f86e95e39e0f5a13
Parents: 560d82e 85a3d6e
Author: sblackmon <sblackmon@w2odigital.com>
Authored: Sun Dec 14 09:02:42 2014 -0600
Committer: sblackmon <sblackmon@w2odigital.com>
Committed: Sun Dec 14 09:02:42 2014 -0600

----------------------------------------------------------------------
 pom.xml                                         |   32 +
 .../streams/converter/TypeConverterUtil.java    |   18 +
 ...ActivityConverterProcessorConfiguration.json |    5 +-
 .../components/http/HttpConfiguration.json      |    5 +-
 .../http/HttpProcessorConfiguration.json        |    5 +-
 .../http/HttpProviderConfiguration.json         |    5 +-
 .../main/jsonschema/ComponentConfiguration.json |    5 +-
 .../main/jsonschema/StreamsConfiguration.json   |    5 +-
 .../org/apache/streams/s3/S3Configuration.json  |    5 +-
 .../streams/s3/S3ReaderConfiguration.json       |    5 +-
 .../streams/s3/S3WriterConfiguration.json       |    5 +-
 .../apache/streams/s3/S3PersistWriterTest.java  |   18 +
 streams-contrib/streams-persist-console/pom.xml |   17 +
 .../streams-persist-elasticsearch/pom.xml       |   17 +
 .../ElasticsearchMetadataUtil.java              |   18 +
 .../ElasticsearchConfiguration.json             |    5 +-
 .../ElasticsearchReaderConfiguration.json       |    5 +-
 .../ElasticsearchWriterConfiguration.json       |    5 +-
 .../test/TestDatumFromMetadataProcessor.java    |   18 +
 .../test/TestDocumentToMetadataProcessor.java   |   18 +
 .../test/TestElasticsearchPersistWriter.java    |   18 +
 streams-contrib/streams-persist-hbase/pom.xml   |   17 +
 .../streams/hbase/HbaseConfiguration.json       |    5 +-
 streams-contrib/streams-persist-hdfs/pom.xml    |   17 +
 .../apache/streams/hdfs/HdfsConfiguration.json  |    5 +-
 .../streams/hdfs/HdfsReaderConfiguration.json   |    5 +-
 .../streams/hdfs/HdfsWriterConfiguration.json   |    5 +-
 streams-contrib/streams-persist-kafka/pom.xml   |   17 +
 .../streams/kafka/KafkaConfiguration.json       |    5 +-
 streams-contrib/streams-persist-mongo/pom.xml   |   17 +
 .../streams/mongo/MongoConfiguration.json       |    5 +-
 .../CleanAdditionalPropertiesProcessor.java     |   19 +
 .../streams/jackson/TypeConverterProcessor.java |    1 +
 .../streams-processor-lucene/pom.xml            |   18 +
 .../lucene/LuceneSimpleTaggingProcessor.java    |   18 +
 .../lucene/LuceneTaggerConfiguration.json       |    5 +-
 .../lucene/TestLucenSimpleTaggingProcessor.java |   18 +
 .../streams/peoplepattern/AccountType.json      |    5 +-
 .../streams/peoplepattern/Demographics.json     |    5 +-
 streams-contrib/streams-processor-tika/pom.xml  |   18 +
 .../org/apache/streams/tika/CategoryParser.java |   18 +
 .../org/apache/streams/tika/TikaProcessor.java  |   18 +
 .../apache/streams/tika/BoilerPipeArticle.json  |    5 +-
 streams-contrib/streams-processor-urls/pom.xml  |   17 +
 .../org/apache/streams/urls/LinkDetails.json    |    5 +-
 .../streams-provider-datasift/pom.xml           |   17 +
 .../streams/datasift/csdl/DatasiftCsdlUtil.java |   18 +
 .../DatasiftActivitySerializerProcessor.java    |    1 +
 .../DatasiftTypeConverterProcessor.java         |    1 +
 .../provider/DatasiftManagedSourceSetup.java    |   18 +
 .../datasift/provider/DatasiftPushProvider.java |    1 +
 .../provider/DatasiftStreamConfigurator.java    |    1 +
 .../provider/DatasiftStreamProvider.java        |    1 +
 .../streams/datasift/provider/ErrorHandler.java |    1 +
 .../streams/datasift/provider/Subscription.java |    1 +
 .../DatasiftInteractionActivitySerializer.java  |   18 +
 .../org/apache/streams/datasift/Datasift.json   |    6 +-
 .../streams/datasift/DatasiftConfiguration.json |    5 +-
 .../apache/streams/datasift/DatasiftPush.json   |    7 +-
 .../datasift/DatasiftPushConfiguration.json     |    5 +-
 .../datasift/DatasiftStreamConfiguration.json   |    5 +-
 .../datasift/facebook/DatasiftFacebook.json     |    9 +-
 .../datasift/instagram/DatasiftInstagram.json   |    9 +-
 .../interaction/DatasiftInteraction.json        |    7 +-
 .../datasift/twitter/DatasiftTwitter.json       |    9 +-
 .../datasift/twitter/DatasiftTwitterMedia.json  |    8 +-
 .../datasift/twitter/DatasiftTwitterUser.json   |    7 +-
 .../DatasiftActivitySerializerTest.java         |   18 +
 ...DatasiftInstagramActivitySerializerTest.java |   18 +
 ...tasiftInteractionActivitySerializerTest.java |   18 +
 .../DatasiftTwitterActivitySerializerTest.java  |   18 +
 .../metadata/facebook_post.mup                  | 1297 +++++-----
 .../streams-provider-facebook/pom.xml           |   17 +
 .../serializer/FacebookActivityUtil.java        |    1 +
 .../FacebookStreamsPostSerializer.java          |   18 +
 .../streams/facebook/FacebookConfiguration.json |    5 +-
 .../FacebookUserInformationConfiguration.json   |    6 +-
 .../FacebookUserstreamConfiguration.json        |    5 +-
 .../org/apache/streams/facebook/Page.json       |  333 +--
 .../org/apache/streams/facebook/graph/Post.json |    6 +-
 .../gnip-edc-facebook/pom.xml                   |   17 +
 .../gnip-edc-flickr/pom.xml                     |   17 +
 .../gnip-edc-googleplus/pom.xml                 |   17 +
 .../gnip-edc-instagram/pom.xml                  |   17 +
 .../jsonschema/com/instagram/Instagram.json     |    6 +-
 .../gnip-edc-reddit/pom.xml                     |   17 +
 .../gnip-edc-youtube/pom.xml                    |   17 +
 .../gnip-powertrack/pom.xml                     |   17 +
 .../src/main/jsonschema/com/gnip/Gnip.json      |    8 +-
 .../src/main/xmlschema/com/gnip/binding.xjb     |   17 +
 .../src/main/xmlschema/com/gnip/entry.xsd       |   17 +
 streams-contrib/streams-provider-gnip/pom.xml   |   17 +
 .../google-gmail/pom.xml                        |   17 +
 .../com/google/gmail/GMailConfiguration.json    |    5 +-
 .../google-gplus/pom.xml                        |   17 +
 .../gplus/provider/GPlusDataCollector.java      |   18 +
 .../provider/GPlusUserActivityCollector.java    |    1 +
 .../provider/GPlusUserActivityProvider.java     |   18 +
 .../gplus/provider/GPlusUserDataCollector.java  |   18 +
 .../gplus/provider/GPlusUserDataProvider.java   |   18 +
 .../com/google/gplus/GPlusConfiguration.json    |    6 +-
 .../provider/TestAbstractGPlusProvider.java     |   19 +
 .../TestGPlusUserActivityCollector.java         |   19 +
 .../provider/TestGPlusUserDataCollector.java    |   19 +
 .../util/GPlusEventClassifierTest.java          |    1 +
 streams-contrib/streams-provider-google/pom.xml |   17 +
 .../InstagramMediaDataActivitySerializer.mup    | 1697 ++++++-------
 .../streams-provider-instagram/pom.xml          |   17 +
 .../serializer/InstagramUserInfoSerializer.java |   18 +
 .../com/instagram/InstagramConfiguration.json   |    5 +-
 .../InstagramUserInformationConfiguration.json  |    5 +-
 .../streams-provider-moreover/pom.xml           |   17 +
 .../main/jsonschema/com/moreover/Moreover.json  |    8 +-
 .../com/moreover/MoreoverConfiguration.json     |    5 +-
 .../main/xmlschema/com/moreover/articles10.xsd  |   17 +
 .../src/main/xmlschema/com/moreover/binding.xjb |   17 +
 .../streams/data/util/MoreoverTestUtil.java     |   19 +-
 streams-contrib/streams-provider-rss/pom.xml    |   17 +
 .../main/jsonschema/RssStreamConfiguration.json |    5 +-
 .../src/main/xmlschema/contents.xsd             |   18 +-
 .../src/main/xmlschema/opml.xsd                 |   17 +
 .../rss/provider/RssStreamProviderTest.java     |   18 +
 .../streams-provider-sysomos/pom.xml            |   17 +
 .../main/jsonschema/com/sysomos/Sysomos.json    |    8 +-
 .../com/sysomos/SysomosConfiguration.json       |    6 +-
 .../src/main/xmlschema/com/sysomos/binding.xjb  |   17 +
 .../src/main/xmlschema/com/sysomos/sysomos.xsd  |   18 +
 .../streams-provider-twitter/pom.xml            |   17 +
 .../src/main/jsonschema/com/twitter/Delete.json |    6 +-
 .../main/jsonschema/com/twitter/FriendList.json |    6 +-
 .../main/jsonschema/com/twitter/Retweet.json    |    6 +-
 .../com/twitter/TwitterConfiguration.json       |    5 +-
 .../com/twitter/TwitterStreamConfiguration.json |    5 +-
 .../TwitterUserInformationConfiguration.json    |    5 +-
 .../jsonschema/com/twitter/UserstreamEvent.json |    6 +-
 .../src/main/jsonschema/com/twitter/tweet.json  |    5 +-
 .../persist/impl/SLF4JMessagePersister.java     |   18 +
 .../org/apache/streams/pojo/json/Broadcast.json |   41 +-
 .../pojo/json/DatumStatusCounterBroadcast.json  |   43 +-
 .../streams/pojo/json/MemoryUsageBroadcast.json |   59 +-
 .../pojo/json/StreamsTaskCounterBroadcast.json  |   75 +-
 .../pojo/json/ThroughputQueueBroadcast.json     |   75 +-
 .../activity-consumer/osgi.bnd                  |    4 +
 .../spring/activity-consumer-context.xml        |   17 +
 .../META-INF/spring/activity-consumer-osgi.xml  |   17 +
 .../activity-registration/osgi.bnd              |    4 +
 .../impl/ActivityPublisherRegistrationImpl.java |   18 +
 ...tivityStreamsSubscriberRegistrationImpl.java |   18 +
 .../activity-registration-context-osgi.xml      |   17 +
 .../spring/activity-registration-context.xml    |   17 +
 .../activity-subscriber/osgi.bnd                |    4 +
 .../spring/activity-subscriber-context.xml      |   17 +
 .../spring/activity-subscriber-osgi.xml         |   17 +
 streams-pojo/metadata/Serializer.mup            |  699 +++---
 .../streams/jackson/StreamsDateTimeFormat.java  |   18 +
 .../org/apache/streams/pojo/json/activity.json  |  191 +-
 .../apache/streams/pojo/json/collection.json    |   75 +-
 .../apache/streams/pojo/json/media_link.json    |   56 +-
 .../org/apache/streams/pojo/json/object.json    |  169 +-
 .../streams/pojo/json/objectTypes/article.json  |   24 +-
 .../streams/pojo/json/objectTypes/audio.json    |   24 +-
 .../streams/pojo/json/objectTypes/bookmark.json |   24 +-
 .../streams/pojo/json/objectTypes/comment.json  |   24 +-
 .../streams/pojo/json/objectTypes/event.json    |   32 +-
 .../streams/pojo/json/objectTypes/file.json     |   24 +-
 .../streams/pojo/json/objectTypes/folder.json   |   24 +-
 .../streams/pojo/json/objectTypes/group.json    |   24 +-
 .../streams/pojo/json/objectTypes/list.json     |   38 +-
 .../streams/pojo/json/objectTypes/note.json     |   24 +-
 .../streams/pojo/json/objectTypes/person.json   |   32 +-
 .../pojo/json/objectTypes/photo-album.json      |   24 +-
 .../streams/pojo/json/objectTypes/photo.json    |   30 +-
 .../streams/pojo/json/objectTypes/place.json    |   31 +-
 .../streams/pojo/json/objectTypes/playlist.json |   26 +-
 .../streams/pojo/json/objectTypes/product.json  |   26 +-
 .../streams/pojo/json/objectTypes/property.json |   76 +-
 .../streams/pojo/json/objectTypes/review.json   |   26 +-
 .../streams/pojo/json/objectTypes/service.json  |   26 +-
 .../streams/pojo/json/objectTypes/song.json     |   26 +-
 .../streams/pojo/json/objectTypes/status.json   |   26 +-
 .../streams/pojo/json/objectTypes/video.json    |   26 +-
 .../streams/pojo/json/verbs/favorite.json       |   32 +-
 .../apache/streams/pojo/json/verbs/follow.json  |   32 +-
 .../apache/streams/pojo/json/verbs/join.json    |   32 +-
 .../apache/streams/pojo/json/verbs/like.json    |   32 +-
 .../streams/pojo/json/verbs/make-friend.json    |   32 +-
 .../apache/streams/pojo/json/verbs/play.json    |   32 +-
 .../apache/streams/pojo/json/verbs/post.json    |   32 +-
 .../streams/pojo/json/verbs/rsvp-maybe.json     |   32 +-
 .../apache/streams/pojo/json/verbs/rsvp-no.json |   32 +-
 .../streams/pojo/json/verbs/rsvp-yes.json       |   32 +-
 .../apache/streams/pojo/json/verbs/save.json    |   32 +-
 .../apache/streams/pojo/json/verbs/share.json   |   32 +-
 .../org/apache/streams/pojo/json/verbs/tag.json |   32 +-
 .../apache/streams/pojo/json/verbs/update.json  |   52 +-
 .../data/data/util/CustomDateTimeFormat.java    |   18 +
 .../data/util/CustomDateTimeFormatTest.java     |   18 +
 .../data/data/util/RFC3339UtilsTest.java        |    2 +-
 ...amOnUnhandleThrowableThreadPoolExecutor.java |    1 +
 .../jsonschema/LocalRuntimeConfiguration.json   |    5 +-
 ...nhandledThrowableThreadPoolExecutorTest.java |   18 +
 .../backoff/AbstractBackOffStrategy.java        |    1 +
 .../api/requests/backoff/BackOffException.java  |    1 +
 .../api/requests/backoff/BackOffStrategy.java   |    1 +
 .../impl/ConstantTimeBackOffStrategy.java       |    1 +
 .../impl/ExponentialBackOffStrategy.java        |    1 +
 .../backoff/impl/LinearTimeBackOffStrategy.java |    1 +
 .../requests/backoff/BackOffStrategyTest.java   |   18 +
 .../ConstantTimeBackOffStrategyTest.java        |   18 +
 .../backoff/ExponentialBackOffStrategyTest.java |   18 +
 .../backoff/LinearTimeBackOffStartegyTest.java  |   18 +
 .../streams/util/files/StreamsScannerUtil.java  |   18 +
 .../tokenmanager/TestBasicTokenManager.java     |   19 +-
 .../src/main/webapp/demo/activityDemo.html      |   19 +-
 .../src/main/webapp/demo/css/activityStyles.css |   17 +
 .../src/main/webapp/demo/js/activityDemo.js     |   17 +
 .../src/main/webapp/demo/js/handlebars.js       | 2278 ------------------
 .../src/main/webapp/demo/js/publisher.js        |   17 +
 .../src/main/webapp/demo/js/subscriber.js       |   17 +
 streams-web/src/main/webapp/demo/publisher.html |   17 +
 .../src/main/webapp/demo/subscriber.html        |   17 +
 streams-web/src/main/webapp/index.html          |   17 +
 222 files changed, 5084 insertions(+), 5104 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/99d01237/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/99d01237/streams-contrib/streams-persist-console/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/99d01237/streams-contrib/streams-persist-elasticsearch/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/99d01237/streams-contrib/streams-persist-hbase/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/99d01237/streams-contrib/streams-persist-hdfs/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/99d01237/streams-contrib/streams-persist-kafka/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/99d01237/streams-contrib/streams-persist-mongo/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/99d01237/streams-contrib/streams-processor-urls/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/99d01237/streams-contrib/streams-provider-datasift/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/99d01237/streams-contrib/streams-provider-facebook/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/99d01237/streams-contrib/streams-provider-gnip/gnip-edc-facebook/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/99d01237/streams-contrib/streams-provider-gnip/gnip-edc-flickr/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/99d01237/streams-contrib/streams-provider-gnip/gnip-edc-googleplus/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/99d01237/streams-contrib/streams-provider-gnip/gnip-edc-instagram/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/99d01237/streams-contrib/streams-provider-gnip/gnip-edc-reddit/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/99d01237/streams-contrib/streams-provider-gnip/gnip-edc-youtube/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/99d01237/streams-contrib/streams-provider-gnip/gnip-powertrack/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/99d01237/streams-contrib/streams-provider-gnip/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/99d01237/streams-contrib/streams-provider-google/google-gmail/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/99d01237/streams-contrib/streams-provider-google/google-gplus/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/99d01237/streams-contrib/streams-provider-google/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/99d01237/streams-contrib/streams-provider-instagram/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/99d01237/streams-contrib/streams-provider-moreover/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/99d01237/streams-contrib/streams-provider-rss/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/99d01237/streams-contrib/streams-provider-sysomos/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/99d01237/streams-contrib/streams-provider-twitter/pom.xml
----------------------------------------------------------------------


Mime
View raw message