Return-Path: X-Original-To: apmail-streams-commits-archive@minotaur.apache.org Delivered-To: apmail-streams-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D8C67112A5 for ; Thu, 4 Sep 2014 19:42:25 +0000 (UTC) Received: (qmail 45475 invoked by uid 500); 4 Sep 2014 19:42:25 -0000 Delivered-To: apmail-streams-commits-archive@streams.apache.org Received: (qmail 45448 invoked by uid 500); 4 Sep 2014 19:42:25 -0000 Mailing-List: contact commits-help@streams.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@streams.incubator.apache.org Delivered-To: mailing list commits@streams.incubator.apache.org Received: (qmail 45412 invoked by uid 99); 4 Sep 2014 19:42:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Sep 2014 19:42:25 +0000 X-ASF-Spam-Status: No, hits=-2001.7 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 04 Sep 2014 19:42:24 +0000 Received: (qmail 45309 invoked by uid 99); 4 Sep 2014 19:42:04 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Sep 2014 19:42:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id DBCBDA089A5; Thu, 4 Sep 2014 19:42:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mfranklin@apache.org To: commits@streams.incubator.apache.org Date: Thu, 04 Sep 2014 19:42:03 -0000 Message-Id: <4895a83a2829495c862db7d4172f0e3f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/6] git commit: Merge pull request #3 from apache/master X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-streams Updated Branches: refs/heads/master fe4cec680 -> d8a3380bf Merge pull request #3 from apache/master Apache master merge 2014/08/19 Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/dca64751 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/dca64751 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/dca64751 Branch: refs/heads/master Commit: dca647510984d189904674511b41fa1d4889b788 Parents: 9c6164c ee6b4d5 Author: Ryan Ebanks Authored: Tue Aug 19 11:11:26 2014 -0500 Committer: Ryan Ebanks Committed: Tue Aug 19 11:11:26 2014 -0500 ---------------------------------------------------------------------- pom.xml | 1 + .../ElasticsearchPersistWriter.java | 3 + .../streams-provider-facebook/pom.xml | 2 + .../api/FacebookPageActivitySerializer.java | 66 ++++++ .../processor/FacebookTypeConverter.java | 41 ++-- .../provider/FacebookEventClassifier.java | 57 ++++++ .../provider/FacebookStreamConfigurator.java | 66 ++++++ .../serializer/FacebookActivityUtil.java | 125 ++++++++++++ .../org/apache/streams/facebook/Page.json | 168 ++++++++++++++++ .../test/FacebookActivityActorSerDeTest.java | 65 ++++++ .../test/FacebookActivitySerDeTest.java | 7 - .../test/FacebookEventClassifierTest.java | 57 ++++++ .../facebook/test/FacebookPageSerDeTest.java | 75 +++++++ .../facebook/test/FacebookPostSerDeTest.java | 1 - .../streams/facebook/test/SimplePageTest.java | 100 ++++++++++ .../src/test/resources/testpage.json | 1 + .../instagram/provider/InstagramOauthToken.java | 43 ++++ .../provider/InstagramRecentMediaCollector.java | 200 ++++++++++--------- .../provider/InstagramRecentMediaProvider.java | 110 ++++++++-- .../com/instagram/InstagramConfiguration.json | 63 +++++- .../InstagramRecentMediaCollectorTest.java | 130 ++++++------ .../InstagramRecentMediaProviderTest.java | 21 +- streams-util/pom.xml | 6 +- .../org/apache/streams/util/ComponentUtils.java | 42 +++- .../backoff/AbstractBackOffStrategy.java | 78 ++++++++ .../api/requests/backoff/BackOffException.java | 62 ++++++ .../api/requests/backoff/BackOffStrategy.java | 50 +++++ .../impl/ConstantTimeBackOffStrategy.java | 47 +++++ .../impl/ExponentialBackOffStrategy.java | 46 +++++ .../backoff/impl/LinearTimeBackOffStrategy.java | 39 ++++ .../util/oauth/tokens/AbstractOauthToken.java | 33 +++ .../tokens/tokenmanager/SimpleTokenManager.java | 53 +++++ .../tokenmanager/impl/BasicTokenManger.java | 86 ++++++++ .../requests/backoff/BackOffStrategyTest.java | 70 +++++++ .../ConstantTimeBackOffStrategyTest.java | 26 +++ .../backoff/ExponentialBackOffStrategyTest.java | 23 +++ .../backoff/LinearTimeBackOffStartegyTest.java | 22 ++ .../tokenmanager/TestBasicTokenManager.java | 176 ++++++++++++++++ 38 files changed, 2034 insertions(+), 227 deletions(-) ----------------------------------------------------------------------