Return-Path: X-Original-To: apmail-aurora-commits-archive@minotaur.apache.org Delivered-To: apmail-aurora-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 2AD5B10C9E for ; Thu, 12 Dec 2013 18:11:01 +0000 (UTC) Received: (qmail 1646 invoked by uid 500); 12 Dec 2013 18:11:01 -0000 Delivered-To: apmail-aurora-commits-archive@aurora.apache.org Received: (qmail 1624 invoked by uid 500); 12 Dec 2013 18:11:01 -0000 Mailing-List: contact commits-help@aurora.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aurora.incubator.apache.org Delivered-To: mailing list commits@aurora.incubator.apache.org Received: (qmail 1617 invoked by uid 99); 12 Dec 2013 18:11:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Dec 2013 18:11:00 +0000 X-ASF-Spam-Status: No, hits=-2000.1 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, 12 Dec 2013 18:10:59 +0000 Received: (qmail 1496 invoked by uid 99); 12 Dec 2013 18:10:37 -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, 12 Dec 2013 18:10:36 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9C4B28B6049; Thu, 12 Dec 2013 18:10:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wfarner@apache.org To: commits@aurora.incubator.apache.org Message-Id: <98a6db98c7894184a34252c5366e82bb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: Remove ability to install a custom quota module. Date: Thu, 12 Dec 2013 18:10:36 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Updated Branches: refs/heads/master e54a3d18e -> 0eefbcbb5 Remove ability to install a custom quota module. Testing Done: gradle clean build Reviewed at https://reviews.apache.org/r/16098/ Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/0eefbcbb Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/0eefbcbb Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/0eefbcbb Branch: refs/heads/master Commit: 0eefbcbb57286273ae2908175c5ce028dcdbee99 Parents: e54a3d1 Author: Bill Farner Authored: Thu Dec 12 10:10:12 2013 -0800 Committer: Bill Farner Committed: Thu Dec 12 10:10:12 2013 -0800 ---------------------------------------------------------------------- .../com/twitter/aurora/scheduler/app/AppModule.java | 2 ++ .../twitter/aurora/scheduler/app/SchedulerMain.java | 16 +--------------- 2 files changed, 3 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/0eefbcbb/src/main/java/com/twitter/aurora/scheduler/app/AppModule.java ---------------------------------------------------------------------- diff --git a/src/main/java/com/twitter/aurora/scheduler/app/AppModule.java b/src/main/java/com/twitter/aurora/scheduler/app/AppModule.java index decb3e9..24702b0 100644 --- a/src/main/java/com/twitter/aurora/scheduler/app/AppModule.java +++ b/src/main/java/com/twitter/aurora/scheduler/app/AppModule.java @@ -40,6 +40,7 @@ import com.twitter.aurora.scheduler.filter.SchedulingFilterImpl; import com.twitter.aurora.scheduler.http.ClusterName; import com.twitter.aurora.scheduler.http.ServletModule; import com.twitter.aurora.scheduler.metadata.MetadataModule; +import com.twitter.aurora.scheduler.quota.QuotaModule; import com.twitter.aurora.scheduler.state.StateModule; import com.twitter.aurora.scheduler.stats.AsyncStatsModule; import com.twitter.common.application.ShutdownRegistry; @@ -99,6 +100,7 @@ class AppModule extends AbstractModule { install(new AsyncModule()); install(new AsyncStatsModule()); install(new MetadataModule()); + install(new QuotaModule()); install(new ServletModule()); install(new SchedulerModule()); install(new StateModule()); http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/0eefbcbb/src/main/java/com/twitter/aurora/scheduler/app/SchedulerMain.java ---------------------------------------------------------------------- diff --git a/src/main/java/com/twitter/aurora/scheduler/app/SchedulerMain.java b/src/main/java/com/twitter/aurora/scheduler/app/SchedulerMain.java index 73b86a9..ec99e01 100644 --- a/src/main/java/com/twitter/aurora/scheduler/app/SchedulerMain.java +++ b/src/main/java/com/twitter/aurora/scheduler/app/SchedulerMain.java @@ -45,9 +45,6 @@ import com.twitter.aurora.scheduler.cron.CronScheduler; import com.twitter.aurora.scheduler.cron.noop.NoopCronModule; import com.twitter.aurora.scheduler.local.IsolatedSchedulerModule; import com.twitter.aurora.scheduler.log.mesos.MesosLogStreamModule; -import com.twitter.aurora.scheduler.quota.QuotaManager; -import com.twitter.aurora.scheduler.quota.QuotaModule; -import com.twitter.aurora.scheduler.state.JobFilter; import com.twitter.aurora.scheduler.storage.backup.BackupModule; import com.twitter.aurora.scheduler.storage.log.LogStorage; import com.twitter.aurora.scheduler.storage.log.LogStorageModule; @@ -126,16 +123,6 @@ public class SchedulerMain extends AbstractApplication { .add(CronScheduler.class) .build(); - @CmdLine(name = "quota_module", - help = "A Guice module to provide quota subsystem bindings.") - private static final Arg> QUOTA_MODULE = - Arg.create(QuotaModule.class); - - private static final Iterable> QUOTA_MODULE_CLASSES = ImmutableList.>builder() - .add(QuotaManager.class) - .add(JobFilter.class) - .build(); - @Inject private SingletonService schedulerService; @Inject private LocalServiceRegistry serviceRegistry; @Inject private SchedulerLifecycle schedulerLifecycle; @@ -190,8 +177,7 @@ public class SchedulerMain extends AbstractApplication { private static Iterable getFlaggedModules() { return ImmutableList.of( getFlaggedModule(AUTH_MODULE, AUTH_MODULE_CLASSES), - getFlaggedModule(CRON_MODULE, CRON_MODULE_CLASSES), - getFlaggedModule(QUOTA_MODULE, QUOTA_MODULE_CLASSES)); + getFlaggedModule(CRON_MODULE, CRON_MODULE_CLASSES)); } static Iterable getModules(