aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wfar...@apache.org
Subject [9/9] git commit: Refactors java and python code to the Apache namespace.
Date Tue, 31 Dec 2013 21:28:10 GMT
Refactors java and python code to the Apache namespace.

Bugs closed: AURORA-3

Reviewed at https://reviews.apache.org/r/16544/


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

Branch: refs/heads/master
Commit: cfb13f659b6e7fa8889ea592af975ab8c91dd562
Parents: bc1635d
Author: Jake Farrell <jfarrell@apache.org>
Authored: Tue Dec 31 13:20:57 2013 -0800
Committer: Bill Farner <wfarner@apache.org>
Committed: Tue Dec 31 13:20:57 2013 -0800

----------------------------------------------------------------------
 build.gradle                                    |  10 +-
 config/checkstyle/checkstyle.xml                |   6 +-
 examples/vagrant/provision-dev-environment.sh   |  16 +-
 src/main/java/org/apache/aurora/GuiceUtils.java |   6 +-
 src/main/java/org/apache/aurora/Protobufs.java  |   2 +-
 .../apache/aurora/auth/CapabilityValidator.java |   4 +-
 .../apache/aurora/auth/SessionValidator.java    |   4 +-
 .../apache/aurora/auth/UnsecureAuthModule.java  |   4 +-
 .../apache/aurora/codec/ThriftBinaryCodec.java  |   2 +-
 .../org/apache/aurora/scheduler/Driver.java     |   8 +-
 .../apache/aurora/scheduler/DriverFactory.java  |  14 +-
 .../aurora/scheduler/MesosSchedulerImpl.java    |  35 ++--
 .../aurora/scheduler/MesosTaskFactory.java      |  27 +--
 .../apache/aurora/scheduler/ResourceSlot.java   |   7 +-
 .../aurora/scheduler/SchedulerLifecycle.java    |  25 +--
 .../aurora/scheduler/SchedulerModule.java       |  23 +--
 .../aurora/scheduler/TaskIdGenerator.java       |   5 +-
 .../apache/aurora/scheduler/TaskLauncher.java   |   2 +-
 .../org/apache/aurora/scheduler/TaskVars.java   |  27 +--
 .../aurora/scheduler/UserTaskLauncher.java      |  16 +-
 .../apache/aurora/scheduler/app/AppModule.java  |  32 ++--
 .../aurora/scheduler/app/Log4jConfigurator.java |  10 +-
 .../apache/aurora/scheduler/app/Modules.java    |   2 +-
 .../aurora/scheduler/app/SchedulerMain.java     |  43 ++---
 .../aurora/scheduler/async/AsyncModule.java     |  23 +--
 .../aurora/scheduler/async/HistoryPruner.java   |  25 +--
 .../aurora/scheduler/async/OfferQueue.java      |  33 ++--
 .../aurora/scheduler/async/Preemptor.java       |  31 ++--
 .../scheduler/async/RescheduleCalculator.java   |  19 ++-
 .../aurora/scheduler/async/TaskGroup.java       |   5 +-
 .../aurora/scheduler/async/TaskGroups.java      |  33 ++--
 .../aurora/scheduler/async/TaskScheduler.java   |  33 ++--
 .../aurora/scheduler/async/TaskTimeout.java     |  21 +--
 .../aurora/scheduler/base/CommandUtil.java      |   6 +-
 .../aurora/scheduler/base/Conversions.java      |  10 +-
 .../apache/aurora/scheduler/base/JobKeys.java   |  12 +-
 .../apache/aurora/scheduler/base/Numbers.java   |   2 +-
 .../org/apache/aurora/scheduler/base/Query.java |  12 +-
 .../scheduler/base/ScheduleException.java       |   2 +-
 .../scheduler/base/SchedulerException.java      |   2 +-
 .../org/apache/aurora/scheduler/base/Tasks.java |  16 +-
 .../configuration/ConfigurationManager.java     |  37 +++--
 .../scheduler/configuration/Resources.java      |  14 +-
 .../configuration/SanitizedConfiguration.java   |   8 +-
 .../aurora/scheduler/cron/CronException.java    |   2 +-
 .../aurora/scheduler/cron/CronPredictor.java    |   2 +-
 .../aurora/scheduler/cron/CronScheduler.java    |   2 +-
 .../scheduler/cron/noop/NoopCronModule.java     |   6 +-
 .../scheduler/cron/noop/NoopCronPredictor.java  |   4 +-
 .../scheduler/cron/noop/NoopCronScheduler.java  |   6 +-
 .../scheduler/cron/testing/AbstractCronIT.java  |  13 +-
 .../events/NotifyingMethodInterceptor.java      |   9 +-
 .../events/NotifyingSchedulingFilter.java       |  11 +-
 .../aurora/scheduler/events/PubsubEvent.java    |  12 +-
 .../scheduler/events/PubsubEventModule.java     |  15 +-
 .../scheduler/filter/AttributeFilter.java       |  14 +-
 .../scheduler/filter/ConstraintFilter.java      |  18 +-
 .../scheduler/filter/SchedulingFilter.java      |   6 +-
 .../scheduler/filter/SchedulingFilterImpl.java  |  49 +++---
 .../aurora/scheduler/http/ClusterName.java      |   2 +-
 .../org/apache/aurora/scheduler/http/Cron.java  |   4 +-
 .../aurora/scheduler/http/DisplayUtils.java     |  11 +-
 .../aurora/scheduler/http/HttpStatsFilter.java  |   2 +-
 .../scheduler/http/JerseyTemplateServlet.java   |   6 +-
 .../aurora/scheduler/http/LeaderRedirect.java   |   2 +-
 .../scheduler/http/LeaderRedirectFilter.java    |   2 +-
 .../aurora/scheduler/http/Maintenance.java      |  24 +--
 .../org/apache/aurora/scheduler/http/Mname.java |  14 +-
 .../apache/aurora/scheduler/http/Offers.java    |   6 +-
 .../aurora/scheduler/http/PendingTasks.java     |   4 +-
 .../apache/aurora/scheduler/http/Quotas.java    |  12 +-
 .../aurora/scheduler/http/SchedulerzHome.java   |  19 ++-
 .../aurora/scheduler/http/SchedulerzJob.java    |  56 ++++---
 .../aurora/scheduler/http/SchedulerzRole.java   |  44 ++---
 .../aurora/scheduler/http/ServletModule.java    |  10 +-
 .../apache/aurora/scheduler/http/Slaves.java    |  18 +-
 .../aurora/scheduler/http/StructDump.java       |  30 ++--
 .../scheduler/http/TransformationUtils.java     |   6 +-
 .../aurora/scheduler/http/Utilization.java      |  19 ++-
 .../scheduler/local/FakeDriverFactory.java      |   9 +-
 .../local/IsolatedSchedulerModule.java          |  56 ++++---
 .../org/apache/aurora/scheduler/log/Log.java    |   2 +-
 .../scheduler/log/mesos/LogInterface.java       |   2 +-
 .../aurora/scheduler/log/mesos/MesosLog.java    |  23 +--
 .../log/mesos/MesosLogStreamModule.java         |  22 +--
 .../aurora/scheduler/log/testing/FileLog.java   |  13 +-
 .../log/testing/FileLogStreamModule.java        |   5 +-
 .../scheduler/metadata/MetadataModule.java      |   4 +-
 .../aurora/scheduler/metadata/NearestFit.java   |  17 +-
 .../scheduler/periodic/GcExecutorLauncher.java  |  39 ++---
 .../scheduler/quota/QuotaComparisonResult.java  |   4 +-
 .../aurora/scheduler/quota/QuotaFilter.java     |  24 +--
 .../aurora/scheduler/quota/QuotaManager.java    |  16 +-
 .../aurora/scheduler/quota/QuotaModule.java     |   8 +-
 .../apache/aurora/scheduler/quota/Quotas.java   |  10 +-
 .../aurora/scheduler/state/CronJobManager.java  |  47 +++---
 .../scheduler/state/ImmediateJobManager.java    |  10 +-
 .../aurora/scheduler/state/JobFilter.java       |   6 +-
 .../aurora/scheduler/state/JobManager.java      |  10 +-
 .../aurora/scheduler/state/LockManager.java     |   6 +-
 .../aurora/scheduler/state/LockManagerImpl.java |  23 +--
 .../scheduler/state/MaintenanceController.java  |  39 ++---
 .../aurora/scheduler/state/SchedulerCore.java   |  18 +-
 .../scheduler/state/SchedulerCoreImpl.java      |  41 ++---
 .../scheduler/state/SideEffectStorage.java      |  15 +-
 .../aurora/scheduler/state/StateManager.java    |  12 +-
 .../scheduler/state/StateManagerImpl.java       |  53 +++---
 .../aurora/scheduler/state/StateModule.java     |  14 +-
 .../aurora/scheduler/state/TaskAssigner.java    |  20 +--
 .../scheduler/state/TaskStateMachine.java       |  15 +-
 .../aurora/scheduler/state/UUIDGenerator.java   |   2 +-
 .../aurora/scheduler/state/WorkCommand.java     |   2 +-
 .../scheduler/stats/AsyncStatsModule.java       |  17 +-
 .../aurora/scheduler/stats/CachedCounters.java  |   2 +-
 .../aurora/scheduler/stats/ResourceCounter.java |  20 +--
 .../aurora/scheduler/stats/SlotSizeCounter.java |   8 +-
 .../scheduler/stats/TaskStatCalculator.java     |  10 +-
 .../scheduler/storage/AttributeStore.java       |  10 +-
 .../storage/CallOrderEnforcingStorage.java      |  11 +-
 .../storage/DistributedSnapshotStore.java       |   6 +-
 .../scheduler/storage/ForwardingStore.java      |  22 +--
 .../aurora/scheduler/storage/JobStore.java      |   6 +-
 .../aurora/scheduler/storage/LockStore.java     |   6 +-
 .../aurora/scheduler/storage/QuotaStore.java    |   4 +-
 .../scheduler/storage/ReadWriteLockManager.java |   2 +-
 .../scheduler/storage/SchedulerStore.java       |   2 +-
 .../aurora/scheduler/storage/SnapshotStore.java |   2 +-
 .../aurora/scheduler/storage/Storage.java       |  12 +-
 .../scheduler/storage/StorageBackfill.java      |  29 ++--
 .../aurora/scheduler/storage/TaskStore.java     |  10 +-
 .../scheduler/storage/backup/BackupModule.java  |  15 +-
 .../scheduler/storage/backup/Recovery.java      |  21 +--
 .../scheduler/storage/backup/StorageBackup.java |  11 +-
 .../storage/backup/TemporaryStorage.java        |  27 +--
 .../aurora/scheduler/storage/log/Entries.java   |  11 +-
 .../scheduler/storage/log/LogManager.java       |  45 ++---
 .../scheduler/storage/log/LogStorage.java       |  87 +++++-----
 .../scheduler/storage/log/LogStorageModule.java |  17 +-
 .../storage/log/SnapshotStoreImpl.java          |  41 ++---
 .../storage/log/testing/LogOpMatcher.java       |  22 +--
 .../aurora/scheduler/storage/mem/Interner.java  |   2 +-
 .../storage/mem/MemAttributeStore.java          |  10 +-
 .../scheduler/storage/mem/MemJobStore.java      |  10 +-
 .../scheduler/storage/mem/MemLockStore.java     |   8 +-
 .../scheduler/storage/mem/MemQuotaStore.java    |   6 +-
 .../storage/mem/MemSchedulerStore.java          |   4 +-
 .../scheduler/storage/mem/MemStorage.java       |  19 ++-
 .../scheduler/storage/mem/MemStorageModule.java |  33 ++--
 .../scheduler/storage/mem/MemTaskStore.java     |  27 +--
 .../aurora/scheduler/storage/mem/Util.java      |   2 +-
 .../storage/testing/StorageTestUtil.java        |  33 ++--
 .../scheduler/thrift/SchedulerAPIServlet.java   |   6 +-
 .../thrift/SchedulerThriftInterface.java        | 164 ++++++++++---------
 .../scheduler/thrift/ThriftConfiguration.java   |   2 +-
 .../aurora/scheduler/thrift/ThriftModule.java   |   7 +-
 .../aurora/scheduler/thrift/ThriftServer.java   |   6 +-
 .../scheduler/thrift/ThriftServerLauncher.java  |   7 +-
 .../thrift/aop/APIVersionInterceptor.java       |   6 +-
 .../aurora/scheduler/thrift/aop/AopModule.java  |  17 +-
 .../thrift/aop/FeatureToggleInterceptor.java    |   4 +-
 .../scheduler/thrift/aop/Interceptors.java      |   4 +-
 .../thrift/aop/LoggingInterceptor.java          |  14 +-
 .../aop/ThriftStatsExporterInterceptor.java     |   8 +-
 .../thrift/aop/UserCapabilityInterceptor.java   |  16 +-
 .../scheduler/thrift/auth/DecoratedThrift.java  |   2 +-
 .../aurora/scheduler/thrift/auth/Requires.java  |   4 +-
 .../scheduler/thrift/auth/ThriftAuthModule.java |   9 +-
 src/main/python/apache/aurora/admin/BUILD       |   6 +-
 .../apache/aurora/admin/mesos_maintenance.py    |   6 +-
 src/main/python/apache/aurora/client/BUILD      |  32 ++--
 src/main/python/apache/aurora/client/api/BUILD  |  34 ++--
 .../python/apache/aurora/client/api/__init__.py |  10 +-
 .../apache/aurora/client/api/command_runner.py  |  12 +-
 .../apache/aurora/client/api/disambiguator.py   |   6 +-
 .../apache/aurora/client/api/health_check.py    |   4 +-
 .../aurora/client/api/instance_watcher.py       |   2 +-
 .../apache/aurora/client/api/job_monitor.py     |   4 +-
 .../apache/aurora/client/api/restarter.py       |   4 +-
 .../aurora/client/api/scheduler_client.py       |   8 +-
 .../python/apache/aurora/client/api/updater.py  |   4 +-
 src/main/python/apache/aurora/client/base.py    |   2 +-
 src/main/python/apache/aurora/client/bin/BUILD  |  16 +-
 .../apache/aurora/client/bin/aurora_admin.py    |   6 +-
 .../apache/aurora/client/bin/aurora_client.py   |   6 +-
 src/main/python/apache/aurora/client/cli/BUILD  |  26 +--
 .../python/apache/aurora/client/cli/context.py  |  10 +-
 .../python/apache/aurora/client/cli/jobs.py     |  10 +-
 .../python/apache/aurora/client/cli/options.py  |   4 +-
 .../python/apache/aurora/client/commands/BUILD  |  56 +++----
 .../apache/aurora/client/commands/admin.py      |  12 +-
 .../apache/aurora/client/commands/core.py       |  20 +--
 .../apache/aurora/client/commands/help.py       |   2 +-
 .../python/apache/aurora/client/commands/run.py |  10 +-
 .../python/apache/aurora/client/commands/ssh.py |  10 +-
 src/main/python/apache/aurora/client/config.py  |  10 +-
 src/main/python/apache/aurora/client/factory.py |   6 +-
 .../python/apache/aurora/client/hooks/BUILD     |   6 +-
 .../apache/aurora/client/hooks/hooked_api.py    |   8 +-
 src/main/python/apache/aurora/client/options.py |   4 +-
 src/main/python/apache/aurora/common/BUILD      |  10 +-
 .../apache/aurora/common/aurora_job_key.py      |   4 +-
 src/main/python/apache/aurora/common/auth/BUILD |   2 +-
 .../apache/aurora/common/auth/auth_module.py    |   2 +-
 .../aurora/common/auth/auth_module_manager.py   |   2 +-
 src/main/python/apache/aurora/config/BUILD      |  16 +-
 .../python/apache/aurora/config/__init__.py     |   8 +-
 src/main/python/apache/aurora/config/loader.py  |   2 +-
 src/main/python/apache/aurora/config/repl.py    |   2 +-
 .../python/apache/aurora/config/schema/BUILD    |   6 +-
 .../python/apache/aurora/config/schema/base.py  |   4 +-
 src/main/python/apache/aurora/config/thrift.py  |   8 +-
 src/main/python/apache/aurora/executor/BUILD    |  86 +++++-----
 .../python/apache/aurora/executor/bin/BUILD     |  30 ++--
 .../aurora/executor/bin/gc_executor_main.py     |   6 +-
 .../executor/bin/thermos_executor_main.py       |  12 +-
 .../aurora/executor/bin/thermos_runner_main.py  |   2 +-
 .../python/apache/aurora/executor/common/BUILD  |  10 +-
 .../aurora/executor/common/health_checker.py    |   2 +-
 .../apache/aurora/executor/common/task_info.py  |   8 +-
 .../apache/aurora/executor/executor_base.py     |   6 +-
 .../apache/aurora/executor/gc_executor.py       |  18 +-
 .../apache/aurora/executor/thermos_runner.py    |   8 +-
 .../aurora/executor/thermos_task_runner.py      |  12 +-
 .../aurora/tools/java/organize_imports.py       |  12 +-
 .../aurora/tools/java/thrift_wrapper_codegen.py |   6 +-
 src/main/python/apache/thermos/BUILD            |  10 +-
 src/main/python/apache/thermos/README.md        |  14 +-
 src/main/python/apache/thermos/bin/BUILD        |  14 +-
 src/main/python/apache/thermos/bin/thermos.py   |  22 +--
 .../python/apache/thermos/bin/thermos_ckpt.py   |   4 +-
 src/main/python/apache/thermos/common/BUILD     |   8 +-
 src/main/python/apache/thermos/common/ckpt.py   |   2 +-
 src/main/python/apache/thermos/config/BUILD     |   8 +-
 .../apache/thermos/config/bin/config_load.py    |   2 +-
 .../apache/thermos/config/bin/config_repl.py    |   2 +-
 src/main/python/apache/thermos/config/loader.py |   6 +-
 src/main/python/apache/thermos/core/BUILD       |  36 ++--
 src/main/python/apache/thermos/core/helper.py   |   6 +-
 .../python/apache/thermos/core/inspector.py     |   6 +-
 src/main/python/apache/thermos/core/muxer.py    |   2 +-
 src/main/python/apache/thermos/core/process.py  |   2 +-
 src/main/python/apache/thermos/core/runner.py   |  12 +-
 src/main/python/apache/thermos/monitoring/BUILD |  16 +-
 .../apache/thermos/monitoring/detector.py       |   2 +-
 .../python/apache/thermos/monitoring/garbage.py |   4 +-
 .../python/apache/thermos/monitoring/monitor.py |   4 +-
 src/main/python/apache/thermos/observer/BUILD   |  30 ++--
 .../python/apache/thermos/observer/bin/BUILD    |  10 +-
 .../thermos/observer/bin/thermos_observer.py    |   6 +-
 .../python/apache/thermos/observer/http/BUILD   |   6 +-
 .../apache/thermos/observer/observed_task.py    |   8 +-
 .../apache/thermos/observer/task_observer.py    |  14 +-
 src/main/python/apache/thermos/testing/BUILD    |  12 +-
 .../python/apache/thermos/testing/runner.py     |  14 +-
 src/main/thrift/org/apache/aurora/gen/BUILD     |   2 +-
 .../thrift/org/apache/aurora/gen/api.thrift     |   4 +-
 .../org/apache/aurora/gen/internal_rpc.thrift   |   4 +-
 .../thrift/org/apache/aurora/gen/storage.thrift |   4 +-
 .../org/apache/aurora/gen/storage_local.thrift  |   2 +-
 .../thrift/org/apache/aurora/gen/test.thrift    |   4 +-
 src/main/thrift/org/apache/thermos/BUILD        |   2 +-
 .../org/apache/thermos/thermos_internal.thrift  |   2 +-
 .../java/org/apache/aurora/GuiceUtilsTest.java  |   6 +-
 .../aurora/codec/ThriftBinaryCodecTest.java     |   8 +-
 .../aurora/scheduler/DriverFactoryImplTest.java |   9 +-
 .../org/apache/aurora/scheduler/DriverTest.java |  12 +-
 .../scheduler/MesosSchedulerImplTest.java       |  38 +++--
 .../scheduler/MesosTaskFactoryImplTest.java     |  20 ++-
 .../scheduler/SchedulerLifecycleTest.java       |  30 ++--
 .../apache/aurora/scheduler/TaskVarsTest.java   |  51 +++---
 .../aurora/scheduler/UserTaskLauncherTest.java  |  27 +--
 .../aurora/scheduler/app/SchedulerIT.java       |  84 +++++-----
 .../scheduler/async/HistoryPrunerTest.java      |  59 +++----
 .../scheduler/async/OfferQueueImplTest.java     |  30 ++--
 .../apache/aurora/scheduler/async/Offers.java   |   2 +-
 .../scheduler/async/PreemptorImplTest.java      |  69 ++++----
 .../scheduler/async/TaskSchedulerImplTest.java  |  45 ++---
 .../scheduler/async/TaskSchedulerTest.java      |  94 ++++++-----
 .../aurora/scheduler/async/TaskTimeoutTest.java |  61 +++----
 .../aurora/scheduler/base/CommandUtilTest.java  |   2 +-
 .../aurora/scheduler/base/NumbersTest.java      |   2 +-
 .../configuration/ConfigurationManagerTest.java |  32 ++--
 .../scheduler/configuration/ResourcesTest.java  |  14 +-
 .../aurora/scheduler/cron/noop/NoopCronIT.java  |   8 +-
 .../events/NotifyingMethodInterceptorTest.java  |  17 +-
 .../events/NotifyingSchedulingFilterTest.java   |  22 +--
 .../filter/SchedulingFilterImplTest.java        |  77 ++++-----
 .../scheduler/http/LeaderRedirectTest.java      |  17 +-
 .../apache/aurora/scheduler/http/MnameTest.java |   8 +-
 .../scheduler/http/SchedulerzRoleTest.java      |  24 +--
 .../scheduler/log/mesos/MesosLogTest.java       |  19 ++-
 .../scheduler/log/testing/FileLogTest.java      |   2 +-
 .../scheduler/metadata/NearestFitTest.java      |  25 +--
 .../periodic/GcExecutorLauncherTest.java        |  44 ++---
 .../quota/QuotaComparisonResultTest.java        |  12 +-
 .../aurora/scheduler/quota/QuotaFilterTest.java |  42 ++---
 .../scheduler/quota/QuotaManagerImplTest.java   |  35 ++--
 .../state/BaseSchedulerCoreImplTest.java        | 118 ++++++-------
 .../scheduler/state/CronJobManagerTest.java     |  57 ++++---
 .../scheduler/state/LockManagerImplTest.java    |  34 ++--
 .../state/MaintenanceControllerImplTest.java    |  54 +++---
 .../aurora/scheduler/state/PubsubTestUtil.java  |   7 +-
 .../scheduler/state/StateManagerImplTest.java   |  62 +++----
 .../scheduler/state/TaskStateMachineTest.java   |  64 ++++----
 .../scheduler/stats/SlotSizeCounterTest.java    |  18 +-
 .../storage/ReadWriteLockManagerTest.java       |   8 +-
 .../scheduler/storage/StorageBackfillTest.java  |  33 ++--
 .../scheduler/storage/backup/RecoveryTest.java  |  63 +++----
 .../storage/backup/StorageBackupTest.java       |  38 +++--
 .../scheduler/storage/log/LogManagerTest.java   |  69 ++++----
 .../scheduler/storage/log/LogStorageTest.java   | 117 ++++++-------
 .../storage/log/SnapshotStoreImplTest.java      |  52 +++---
 .../scheduler/storage/mem/InternerTest.java     |   2 +-
 .../scheduler/storage/mem/MemJobStoreTest.java  |  14 +-
 .../scheduler/storage/mem/MemLockStoreTest.java |  16 +-
 .../mem/MemStorageSchedulerCoreImplTest.java    |   6 +-
 .../scheduler/storage/mem/MemStorageTest.java   |  34 ++--
 .../scheduler/storage/mem/MemTaskStoreTest.java |  32 ++--
 .../thrift/SchedulerThriftInterfaceTest.java    | 157 +++++++++---------
 .../aurora/scheduler/thrift/ThriftIT.java       |  50 +++---
 .../thrift/aop/APIVersionInterceptorTest.java   |  24 +--
 .../scheduler/thrift/aop/AopModuleTest.java     |  20 ++-
 .../aop/FeatureToggleInterceptorTest.java       |  19 ++-
 .../scheduler/thrift/aop/ForwardingThrift.java  |  34 ++--
 .../thrift/aop/MockDecoratedThrift.java         |   6 +-
 .../aop/ThriftStatsExporterInterceptorTest.java |  24 +--
 src/test/python/BUILD                           |   4 +-
 src/test/python/apache/aurora/BUILD             |  10 +-
 src/test/python/apache/aurora/admin/BUILD       |   8 +-
 .../aurora/admin/test_mesos_maintenance.py      |   8 +-
 src/test/python/apache/aurora/client/BUILD      |  18 +-
 src/test/python/apache/aurora/client/api/BUILD  |  44 ++---
 .../aurora/client/api/test_disambiguator.py     |  12 +-
 .../aurora/client/api/test_health_check.py      |   6 +-
 .../aurora/client/api/test_instance_watcher.py  |   8 +-
 .../aurora/client/api/test_job_monitor.py       |   8 +-
 .../apache/aurora/client/api/test_restarter.py  |  14 +-
 .../aurora/client/api/test_scheduler_client.py  |  10 +-
 .../apache/aurora/client/api/test_updater.py    |  12 +-
 src/test/python/apache/aurora/client/cli/BUILD  |  12 +-
 .../apache/aurora/client/cli/test_create.py     |  18 +-
 .../apache/aurora/client/cli/test_kill.py       |  24 +--
 .../python/apache/aurora/client/cli/util.py     |  10 +-
 .../python/apache/aurora/client/commands/BUILD  |  24 +--
 .../client/commands/test_cancel_update.py       |  24 +--
 .../aurora/client/commands/test_create.py       |  22 +--
 .../apache/aurora/client/commands/test_diff.py  |  18 +-
 .../apache/aurora/client/commands/test_kill.py  |  34 ++--
 .../aurora/client/commands/test_listjobs.py     |  18 +-
 .../aurora/client/commands/test_restart.py      |  26 +--
 .../apache/aurora/client/commands/test_run.py   |  14 +-
 .../apache/aurora/client/commands/test_ssh.py   |  12 +-
 .../aurora/client/commands/test_status.py       |  18 +-
 .../aurora/client/commands/test_update.py       |  32 ++--
 .../apache/aurora/client/commands/util.py       |   8 +-
 .../aurora/client/fake_scheduler_proxy.py       |   2 +-
 .../python/apache/aurora/client/hooks/BUILD     |  12 +-
 .../aurora/client/hooks/test_hooked_api.py      |   6 +-
 .../aurora/client/hooks/test_non_hooked_api.py  |   4 +-
 .../apache/aurora/client/test_binding_helper.py |   6 +-
 .../python/apache/aurora/client/test_config.py  |  10 +-
 src/test/python/apache/aurora/common/BUILD      |  18 +-
 .../apache/aurora/common/test_aurora_job_key.py |   2 +-
 .../python/apache/aurora/common/test_cluster.py |   2 +-
 .../apache/aurora/common/test_cluster_option.py |   6 +-
 .../apache/aurora/common/test_clusters.py       |   2 +-
 .../apache/aurora/common/test_http_signaler.py  |   2 +-
 src/test/python/apache/aurora/config/BUILD      |  14 +-
 .../python/apache/aurora/config/test_base.py    |   6 +-
 .../aurora/config/test_constraint_parsing.py    |   2 +-
 .../python/apache/aurora/config/test_loader.py  |   6 +-
 .../python/apache/aurora/config/test_thrift.py  |  14 +-
 src/test/python/apache/aurora/executor/BUILD    |  50 +++---
 .../python/apache/aurora/executor/common/BUILD  |  16 +-
 .../executor/common/test_directory_sandbox.py   |   2 +-
 .../executor/common/test_health_checker.py      |   2 +-
 .../executor/common/test_status_checker.py      |   2 +-
 .../aurora/executor/common/test_task_info.py    |   6 +-
 .../aurora/executor/test_executor_builds.py     |   4 +-
 .../aurora/executor/test_executor_detector.py   |   2 +-
 .../aurora/executor/test_executor_vars.py       |   2 +-
 .../apache/aurora/executor/test_gc_executor.py  |  20 +--
 .../aurora/executor/test_thermos_executor.py    |  28 ++--
 .../aurora/executor/test_thermos_task_runner.py |  10 +-
 src/test/python/apache/thermos/BUILD            |   8 +-
 src/test/python/apache/thermos/common/BUILD     |  12 +-
 .../apache/thermos/common/test_pathspec.py      |   2 +-
 .../apache/thermos/common/test_planner.py       |   2 +-
 .../apache/thermos/common/test_task_planner.py  |   4 +-
 src/test/python/apache/thermos/config/BUILD     |   2 +-
 .../python/apache/thermos/config/test_schema.py |   2 +-
 src/test/python/apache/thermos/core/BUILD       |  26 +--
 .../python/apache/thermos/core/test_angry.py    |   6 +-
 .../apache/thermos/core/test_ephemerals.py      |   6 +-
 .../apache/thermos/core/test_failing_runner.py  |   6 +-
 .../apache/thermos/core/test_failure_limit.py   |   6 +-
 .../apache/thermos/core/test_finalization.py    |   6 +-
 .../python/apache/thermos/core/test_helper.py   |   6 +-
 .../python/apache/thermos/core/test_process.py  |   6 +-
 .../thermos/core/test_runner_integration.py     |   6 +-
 .../apache/thermos/core/test_staged_kill.py     |  10 +-
 src/test/python/apache/thermos/monitoring/BUILD |   2 +-
 .../apache/thermos/monitoring/test_disk.py      |   4 +-
 403 files changed, 3450 insertions(+), 3258 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 7e33ed8..7cc1161 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,7 +38,7 @@ task sourceJar(type: Jar) {
   from sourceSets.main.allJava
 }
 
-group 'com.twitter.aurora'
+group 'org.apache.aurora'
 version = file('.auroraversion').text.trim().toUpperCase()
 
 publishing {
@@ -104,7 +104,7 @@ jar {
   from sourceSets.generated.output
   manifest {
     attributes('Created-By': 'Gradle')
-    attributes('Main-Class': 'com.twitter.aurora.scheduler.app.SchedulerMain')
+    attributes('Main-Class': 'org.apache.aurora.scheduler.app.SchedulerMain')
   }
 }
 
@@ -213,8 +213,8 @@ task generateSources(dependsOn: 'bootstrapThrift') {
       def structName = it
       exec {
         executable = 'python'
-        args = ['src/main/python/twitter/aurora/tools/java/thrift_wrapper_codegen.py',
-                'src/main/thrift/com/twitter/aurora/gen/api.thrift',
+        args = ['src/main/python/apache/aurora/tools/java/thrift_wrapper_codegen.py',
+                'src/main/thrift/org/apache/aurora/gen/api.thrift',
                 structName,
                 generatedJavaDir]
       }
@@ -252,7 +252,7 @@ idea {
 
 // Configuration parameters for the application plugin.
 applicationName = 'aurora-scheduler'
-mainClassName = 'com.twitter.aurora.scheduler.app.SchedulerMain'
+mainClassName = 'org.apache.aurora.scheduler.app.SchedulerMain'
 
 // Run a local scheduler with a local log file and fake jobs
 run {

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/config/checkstyle/checkstyle.xml
----------------------------------------------------------------------
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 24895da..f2b70d5 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -121,13 +121,13 @@ limitations under the License.
       <module name="UnusedImports"/>
       <module name="ImportOrder">
         <property name="groups"
-          value="/^javax?\./,scala,com,net,org,com.twitter"/>
+          value="/^javax?\./,scala,com,net,org"/>
         <property name="ordered" value="true"/>
         <property name="separated" value="true"/>
         <property name="option" value="bottom"/>
         <message key="import.ordering"
-          value="Wrong order for ''{0}'' import. Order should be: java, javax, scala, com, net, org,
-          com.twitter. Each group should be separated by a single blank line." />
+          value="Wrong order for ''{0}'' import. Order should be: java, javax, scala, com, net, org. 
+          Each group should be separated by a single blank line." />
       </module>
 
       <!-- Checks for Size Violations.                    -->

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/examples/vagrant/provision-dev-environment.sh
----------------------------------------------------------------------
diff --git a/examples/vagrant/provision-dev-environment.sh b/examples/vagrant/provision-dev-environment.sh
index 3e1bbbb..d8cc1fe 100755
--- a/examples/vagrant/provision-dev-environment.sh
+++ b/examples/vagrant/provision-dev-environment.sh
@@ -22,22 +22,22 @@ pushd aurora
   ./gradlew distTar
 
   # build clients
-  ./pants src/main/python/twitter/aurora/client/bin:aurora_admin
-  ./pants src/main/python/twitter/aurora/client/bin:aurora_client
+  ./pants src/main/python/apache/aurora/client/bin:aurora_admin
+  ./pants src/main/python/apache/aurora/client/bin:aurora_client
 
   # build executors/observers
-  ./pants src/main/python/twitter/aurora/executor/bin:gc_executor
-  ./pants src/main/python/twitter/aurora/executor/bin:thermos_executor
-  ./pants src/main/python/twitter/aurora/executor/bin:thermos_runner
-  ./pants src/main/python/twitter/thermos/observer/bin:thermos_observer
+  ./pants src/main/python/apache/aurora/executor/bin:gc_executor
+  ./pants src/main/python/apache/aurora/executor/bin:thermos_executor
+  ./pants src/main/python/apache/aurora/executor/bin:thermos_runner
+  ./pants src/main/python/apache/thermos/observer/bin:thermos_observer
 
   # package runner w/in executor
   python <<EOF
 import contextlib
 import zipfile
 with contextlib.closing(zipfile.ZipFile('dist/thermos_executor.pex', 'a')) as zf:
-  zf.writestr('twitter/aurora/executor/resources/__init__.py', '')
-  zf.write('dist/thermos_runner.pex', 'twitter/aurora/executor/resources/thermos_runner.pex')
+  zf.writestr('apache/aurora/executor/resources/__init__.py', '')
+  zf.write('dist/thermos_runner.pex', 'apache/aurora/executor/resources/thermos_runner.pex')
 EOF
 
   mkdir -p /vagrant/dist/distributions

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/GuiceUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/GuiceUtils.java b/src/main/java/org/apache/aurora/GuiceUtils.java
index 207535d..d4da34d 100644
--- a/src/main/java/org/apache/aurora/GuiceUtils.java
+++ b/src/main/java/org/apache/aurora/GuiceUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora;
+package org.apache.aurora;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -38,11 +38,11 @@ import com.google.inject.matcher.AbstractMatcher;
 import com.google.inject.matcher.Matcher;
 import com.google.inject.matcher.Matchers;
 
+import com.twitter.common.collections.Pair;
+
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 
-import com.twitter.common.collections.Pair;
-
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/Protobufs.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/Protobufs.java b/src/main/java/org/apache/aurora/Protobufs.java
index c3ddea4..85596cb 100644
--- a/src/main/java/org/apache/aurora/Protobufs.java
+++ b/src/main/java/org/apache/aurora/Protobufs.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora;
+package org.apache.aurora;
 
 import com.google.common.base.Function;
 import com.google.protobuf.Message;

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/auth/CapabilityValidator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/auth/CapabilityValidator.java b/src/main/java/org/apache/aurora/auth/CapabilityValidator.java
index 05958f0..448d8c5 100644
--- a/src/main/java/org/apache/aurora/auth/CapabilityValidator.java
+++ b/src/main/java/org/apache/aurora/auth/CapabilityValidator.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.auth;
+package org.apache.aurora.auth;
 
-import com.twitter.aurora.gen.SessionKey;
+import org.apache.aurora.gen.SessionKey;
 
 /**
  * A session validator that supports user capability matching.

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/auth/SessionValidator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/auth/SessionValidator.java b/src/main/java/org/apache/aurora/auth/SessionValidator.java
index 327c5ca..89c5b12 100644
--- a/src/main/java/org/apache/aurora/auth/SessionValidator.java
+++ b/src/main/java/org/apache/aurora/auth/SessionValidator.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.auth;
+package org.apache.aurora.auth;
 
 import java.util.Set;
 
-import com.twitter.aurora.gen.SessionKey;
+import org.apache.aurora.gen.SessionKey;
 
 /**
  * Validator for RPC sessions with Aurora.

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/auth/UnsecureAuthModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/auth/UnsecureAuthModule.java b/src/main/java/org/apache/aurora/auth/UnsecureAuthModule.java
index 8fe9953..841b574 100644
--- a/src/main/java/org/apache/aurora/auth/UnsecureAuthModule.java
+++ b/src/main/java/org/apache/aurora/auth/UnsecureAuthModule.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.auth;
+package org.apache.aurora.auth;
 
 import java.util.Set;
 import java.util.logging.Logger;
 
 import com.google.inject.AbstractModule;
 
-import com.twitter.aurora.gen.SessionKey;
+import org.apache.aurora.gen.SessionKey;
 
 /**
  * An authentication module that uses an {@link UnsecureSessionValidator}. This behavior

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/codec/ThriftBinaryCodec.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/codec/ThriftBinaryCodec.java b/src/main/java/org/apache/aurora/codec/ThriftBinaryCodec.java
index 2443078..4431e05 100644
--- a/src/main/java/org/apache/aurora/codec/ThriftBinaryCodec.java
+++ b/src/main/java/org/apache/aurora/codec/ThriftBinaryCodec.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.codec;
+package org.apache.aurora.codec;
 
 import javax.annotation.Nullable;
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/Driver.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/Driver.java b/src/main/java/org/apache/aurora/scheduler/Driver.java
index aa77887..cab8735 100644
--- a/src/main/java/org/apache/aurora/scheduler/Driver.java
+++ b/src/main/java/org/apache/aurora/scheduler/Driver.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler;
+package org.apache.aurora.scheduler;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Logger;
@@ -24,15 +24,15 @@ import com.google.common.base.Optional;
 import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableList;
 
+import com.twitter.common.stats.Stats;
+import com.twitter.common.util.StateMachine;
+
 import org.apache.mesos.Protos;
 import org.apache.mesos.Protos.OfferID;
 import org.apache.mesos.Protos.Status;
 import org.apache.mesos.Protos.TaskInfo;
 import org.apache.mesos.SchedulerDriver;
 
-import com.twitter.common.stats.Stats;
-import com.twitter.common.util.StateMachine;
-
 import static org.apache.mesos.Protos.Status.DRIVER_RUNNING;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/DriverFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/DriverFactory.java b/src/main/java/org/apache/aurora/scheduler/DriverFactory.java
index e39bb09..9db1c3a 100644
--- a/src/main/java/org/apache/aurora/scheduler/DriverFactory.java
+++ b/src/main/java/org/apache/aurora/scheduler/DriverFactory.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler;
+package org.apache.aurora.scheduler;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -33,6 +33,12 @@ import com.google.common.base.Preconditions;
 import com.google.common.base.Throwables;
 import com.google.protobuf.ByteString;
 
+import com.twitter.common.args.Arg;
+import com.twitter.common.args.CmdLine;
+import com.twitter.common.args.constraints.NotNull;
+import com.twitter.common.quantity.Amount;
+import com.twitter.common.quantity.Time;
+
 import org.apache.mesos.MesosSchedulerDriver;
 import org.apache.mesos.Protos.Credential;
 import org.apache.mesos.Protos.FrameworkID;
@@ -40,12 +46,6 @@ import org.apache.mesos.Protos.FrameworkInfo;
 import org.apache.mesos.Scheduler;
 import org.apache.mesos.SchedulerDriver;
 
-import com.twitter.common.args.Arg;
-import com.twitter.common.args.CmdLine;
-import com.twitter.common.args.constraints.NotNull;
-import com.twitter.common.quantity.Amount;
-import com.twitter.common.quantity.Time;
-
 /**
  * Factory to create scheduler driver instances.
  */

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/MesosSchedulerImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/MesosSchedulerImpl.java b/src/main/java/org/apache/aurora/scheduler/MesosSchedulerImpl.java
index fb41405..4755a97 100644
--- a/src/main/java/org/apache/aurora/scheduler/MesosSchedulerImpl.java
+++ b/src/main/java/org/apache/aurora/scheduler/MesosSchedulerImpl.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler;
+package org.apache.aurora.scheduler;
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
@@ -26,6 +26,23 @@ import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 
+import com.twitter.common.application.Lifecycle;
+import com.twitter.common.inject.TimedInterceptor.Timed;
+import com.twitter.common.stats.Stats;
+
+import org.apache.aurora.GuiceUtils.AllowUnchecked;
+import org.apache.aurora.codec.ThriftBinaryCodec;
+import org.apache.aurora.gen.comm.SchedulerMessage;
+import org.apache.aurora.scheduler.base.Conversions;
+import org.apache.aurora.scheduler.base.SchedulerException;
+import org.apache.aurora.scheduler.configuration.Resources;
+import org.apache.aurora.scheduler.events.PubsubEvent.Interceptors.Event;
+import org.apache.aurora.scheduler.events.PubsubEvent.Interceptors.SendNotification;
+import org.apache.aurora.scheduler.state.SchedulerCore;
+import org.apache.aurora.scheduler.storage.Storage;
+import org.apache.aurora.scheduler.storage.Storage.MutableStoreProvider;
+import org.apache.aurora.scheduler.storage.Storage.MutateWork;
+
 import org.apache.mesos.Protos.ExecutorID;
 import org.apache.mesos.Protos.FrameworkID;
 import org.apache.mesos.Protos.MasterInfo;
@@ -37,22 +54,6 @@ import org.apache.mesos.Protos.TaskStatus;
 import org.apache.mesos.Scheduler;
 import org.apache.mesos.SchedulerDriver;
 
-import com.twitter.aurora.GuiceUtils.AllowUnchecked;
-import com.twitter.aurora.codec.ThriftBinaryCodec;
-import com.twitter.aurora.gen.comm.SchedulerMessage;
-import com.twitter.aurora.scheduler.base.Conversions;
-import com.twitter.aurora.scheduler.base.SchedulerException;
-import com.twitter.aurora.scheduler.configuration.Resources;
-import com.twitter.aurora.scheduler.events.PubsubEvent.Interceptors.Event;
-import com.twitter.aurora.scheduler.events.PubsubEvent.Interceptors.SendNotification;
-import com.twitter.aurora.scheduler.state.SchedulerCore;
-import com.twitter.aurora.scheduler.storage.Storage;
-import com.twitter.aurora.scheduler.storage.Storage.MutableStoreProvider;
-import com.twitter.aurora.scheduler.storage.Storage.MutateWork;
-import com.twitter.common.application.Lifecycle;
-import com.twitter.common.inject.TimedInterceptor.Timed;
-import com.twitter.common.stats.Stats;
-
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/MesosTaskFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/MesosTaskFactory.java b/src/main/java/org/apache/aurora/scheduler/MesosTaskFactory.java
index 5f73f71..d47a8fc 100644
--- a/src/main/java/org/apache/aurora/scheduler/MesosTaskFactory.java
+++ b/src/main/java/org/apache/aurora/scheduler/MesosTaskFactory.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler;
+package org.apache.aurora.scheduler;
 
 import java.util.List;
 import java.util.logging.Level;
@@ -27,6 +27,19 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.protobuf.ByteString;
 
+import com.twitter.common.quantity.Data;
+
+import org.apache.aurora.Protobufs;
+import org.apache.aurora.codec.ThriftBinaryCodec;
+import org.apache.aurora.scheduler.base.CommandUtil;
+import org.apache.aurora.scheduler.base.JobKeys;
+import org.apache.aurora.scheduler.base.SchedulerException;
+import org.apache.aurora.scheduler.base.Tasks;
+import org.apache.aurora.scheduler.configuration.Resources;
+import org.apache.aurora.scheduler.storage.entities.IAssignedTask;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
+
 import org.apache.mesos.Protos.ExecutorID;
 import org.apache.mesos.Protos.ExecutorInfo;
 import org.apache.mesos.Protos.Resource;
@@ -34,18 +47,6 @@ import org.apache.mesos.Protos.SlaveID;
 import org.apache.mesos.Protos.TaskID;
 import org.apache.mesos.Protos.TaskInfo;
 
-import com.twitter.aurora.Protobufs;
-import com.twitter.aurora.codec.ThriftBinaryCodec;
-import com.twitter.aurora.scheduler.base.CommandUtil;
-import com.twitter.aurora.scheduler.base.JobKeys;
-import com.twitter.aurora.scheduler.base.SchedulerException;
-import com.twitter.aurora.scheduler.base.Tasks;
-import com.twitter.aurora.scheduler.configuration.Resources;
-import com.twitter.aurora.scheduler.storage.entities.IAssignedTask;
-import com.twitter.aurora.scheduler.storage.entities.IJobKey;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
-import com.twitter.common.quantity.Data;
-
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import static com.twitter.common.base.MorePreconditions.checkNotBlank;

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/ResourceSlot.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/ResourceSlot.java b/src/main/java/org/apache/aurora/scheduler/ResourceSlot.java
index a9c14e6..9b117af 100644
--- a/src/main/java/org/apache/aurora/scheduler/ResourceSlot.java
+++ b/src/main/java/org/apache/aurora/scheduler/ResourceSlot.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler;
+package org.apache.aurora.scheduler;
 
 import java.util.Arrays;
 
@@ -22,11 +22,12 @@ import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Ordering;
 
-import com.twitter.aurora.scheduler.configuration.Resources;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
 import com.twitter.common.quantity.Amount;
 import com.twitter.common.quantity.Data;
 
+import org.apache.aurora.scheduler.configuration.Resources;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
+
 import static org.apache.mesos.Protos.Offer;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/SchedulerLifecycle.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/SchedulerLifecycle.java b/src/main/java/org/apache/aurora/scheduler/SchedulerLifecycle.java
index f90869d..d9c48d9 100644
--- a/src/main/java/org/apache/aurora/scheduler/SchedulerLifecycle.java
+++ b/src/main/java/org/apache/aurora/scheduler/SchedulerLifecycle.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler;
+package org.apache.aurora.scheduler;
 
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -33,17 +33,6 @@ import com.google.common.base.Supplier;
 import com.google.common.eventbus.Subscribe;
 import com.google.common.util.concurrent.Atomics;
 
-import org.apache.mesos.Protos;
-import org.apache.mesos.SchedulerDriver;
-
-import com.twitter.aurora.scheduler.events.PubsubEvent.DriverRegistered;
-import com.twitter.aurora.scheduler.events.PubsubEvent.EventSubscriber;
-import com.twitter.aurora.scheduler.storage.Storage.MutableStoreProvider;
-import com.twitter.aurora.scheduler.storage.Storage.MutateWork;
-import com.twitter.aurora.scheduler.storage.Storage.NonVolatileStorage;
-import com.twitter.aurora.scheduler.storage.Storage.StoreProvider;
-import com.twitter.aurora.scheduler.storage.Storage.Work;
-import com.twitter.aurora.scheduler.storage.StorageBackfill;
 import com.twitter.common.application.Lifecycle;
 import com.twitter.common.base.Closure;
 import com.twitter.common.base.Closures;
@@ -58,6 +47,18 @@ import com.twitter.common.zookeeper.Group.JoinException;
 import com.twitter.common.zookeeper.ServerSet;
 import com.twitter.common.zookeeper.SingletonService.LeaderControl;
 
+import org.apache.aurora.scheduler.events.PubsubEvent.DriverRegistered;
+import org.apache.aurora.scheduler.events.PubsubEvent.EventSubscriber;
+import org.apache.aurora.scheduler.storage.Storage.MutableStoreProvider;
+import org.apache.aurora.scheduler.storage.Storage.MutateWork;
+import org.apache.aurora.scheduler.storage.Storage.NonVolatileStorage;
+import org.apache.aurora.scheduler.storage.Storage.StoreProvider;
+import org.apache.aurora.scheduler.storage.Storage.Work;
+import org.apache.aurora.scheduler.storage.StorageBackfill;
+
+import org.apache.mesos.Protos;
+import org.apache.mesos.SchedulerDriver;
+
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import static com.twitter.common.zookeeper.SingletonService.LeadershipListener;

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/SchedulerModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/SchedulerModule.java b/src/main/java/org/apache/aurora/scheduler/SchedulerModule.java
index be4c2b1..446a7a2 100644
--- a/src/main/java/org/apache/aurora/scheduler/SchedulerModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/SchedulerModule.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler;
+package org.apache.aurora.scheduler;
 
 import java.util.List;
 import java.util.concurrent.Executors;
@@ -30,21 +30,22 @@ import com.google.inject.PrivateModule;
 import com.google.inject.Provides;
 import com.google.inject.TypeLiteral;
 
-import org.apache.mesos.Scheduler;
-import org.apache.mesos.SchedulerDriver;
-
-import com.twitter.aurora.scheduler.Driver.DriverImpl;
-import com.twitter.aurora.scheduler.SchedulerLifecycle.DriverReference;
-import com.twitter.aurora.scheduler.SchedulerLifecycle.LeadingOptions;
-import com.twitter.aurora.scheduler.TaskIdGenerator.TaskIdGeneratorImpl;
-import com.twitter.aurora.scheduler.events.PubsubEventModule;
-import com.twitter.aurora.scheduler.periodic.GcExecutorLauncher;
-import com.twitter.aurora.scheduler.periodic.GcExecutorLauncher.GcExecutorSettings;
 import com.twitter.common.args.Arg;
 import com.twitter.common.args.CmdLine;
 import com.twitter.common.quantity.Amount;
 import com.twitter.common.quantity.Time;
 
+import org.apache.aurora.scheduler.Driver.DriverImpl;
+import org.apache.aurora.scheduler.SchedulerLifecycle.DriverReference;
+import org.apache.aurora.scheduler.SchedulerLifecycle.LeadingOptions;
+import org.apache.aurora.scheduler.TaskIdGenerator.TaskIdGeneratorImpl;
+import org.apache.aurora.scheduler.events.PubsubEventModule;
+import org.apache.aurora.scheduler.periodic.GcExecutorLauncher;
+import org.apache.aurora.scheduler.periodic.GcExecutorLauncher.GcExecutorSettings;
+
+import org.apache.mesos.Scheduler;
+import org.apache.mesos.SchedulerDriver;
+
 /**
  * Binding module for top-level scheduling logic.
  */

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/TaskIdGenerator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/TaskIdGenerator.java b/src/main/java/org/apache/aurora/scheduler/TaskIdGenerator.java
index 240649e..9d04c0e 100644
--- a/src/main/java/org/apache/aurora/scheduler/TaskIdGenerator.java
+++ b/src/main/java/org/apache/aurora/scheduler/TaskIdGenerator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler;
+package org.apache.aurora.scheduler;
 
 import java.util.UUID;
 
@@ -21,9 +21,10 @@ import javax.inject.Inject;
 
 import com.google.common.base.Preconditions;
 
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
 import com.twitter.common.util.Clock;
 
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
+
 /**
  * A function that generates universally-unique (not guaranteed, but highly confident) task IDs.
  */

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/TaskLauncher.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/TaskLauncher.java b/src/main/java/org/apache/aurora/scheduler/TaskLauncher.java
index aade6da..52425f4 100644
--- a/src/main/java/org/apache/aurora/scheduler/TaskLauncher.java
+++ b/src/main/java/org/apache/aurora/scheduler/TaskLauncher.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler;
+package org.apache.aurora.scheduler;
 
 import com.google.common.base.Optional;
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/TaskVars.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/TaskVars.java b/src/main/java/org/apache/aurora/scheduler/TaskVars.java
index 5574631..c0d6108 100644
--- a/src/main/java/org/apache/aurora/scheduler/TaskVars.java
+++ b/src/main/java/org/apache/aurora/scheduler/TaskVars.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler;
+package org.apache.aurora.scheduler;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Logger;
@@ -31,20 +31,21 @@ import com.google.common.collect.FluentIterable;
 import com.google.common.collect.Iterables;
 import com.google.common.eventbus.Subscribe;
 
-import com.twitter.aurora.gen.Attribute;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.events.PubsubEvent.EventSubscriber;
-import com.twitter.aurora.scheduler.events.PubsubEvent.StorageStarted;
-import com.twitter.aurora.scheduler.events.PubsubEvent.TaskStateChange;
-import com.twitter.aurora.scheduler.events.PubsubEvent.TasksDeleted;
-import com.twitter.aurora.scheduler.storage.AttributeStore;
-import com.twitter.aurora.scheduler.storage.Storage;
-import com.twitter.aurora.scheduler.storage.Storage.StoreProvider;
-import com.twitter.aurora.scheduler.storage.Storage.Work;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
 import com.twitter.common.stats.StatsProvider;
 
+import org.apache.aurora.gen.Attribute;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.events.PubsubEvent.EventSubscriber;
+import org.apache.aurora.scheduler.events.PubsubEvent.StorageStarted;
+import org.apache.aurora.scheduler.events.PubsubEvent.TaskStateChange;
+import org.apache.aurora.scheduler.events.PubsubEvent.TasksDeleted;
+import org.apache.aurora.scheduler.storage.AttributeStore;
+import org.apache.aurora.scheduler.storage.Storage;
+import org.apache.aurora.scheduler.storage.Storage.StoreProvider;
+import org.apache.aurora.scheduler.storage.Storage.Work;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/UserTaskLauncher.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/UserTaskLauncher.java b/src/main/java/org/apache/aurora/scheduler/UserTaskLauncher.java
index 0fb3bbb..438284a 100644
--- a/src/main/java/org/apache/aurora/scheduler/UserTaskLauncher.java
+++ b/src/main/java/org/apache/aurora/scheduler/UserTaskLauncher.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler;
+package org.apache.aurora.scheduler;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -24,18 +24,18 @@ import javax.inject.Inject;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Optional;
 
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.scheduler.async.OfferQueue;
+import org.apache.aurora.scheduler.base.Conversions;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.base.SchedulerException;
+import org.apache.aurora.scheduler.state.StateManager;
+
 import org.apache.mesos.Protos.Offer;
 import org.apache.mesos.Protos.OfferID;
 import org.apache.mesos.Protos.TaskInfo;
 import org.apache.mesos.Protos.TaskStatus;
 
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.scheduler.async.OfferQueue;
-import com.twitter.aurora.scheduler.base.Conversions;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.base.SchedulerException;
-import com.twitter.aurora.scheduler.state.StateManager;
-
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/app/AppModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/app/AppModule.java b/src/main/java/org/apache/aurora/scheduler/app/AppModule.java
index 24702b0..e0e8e22 100644
--- a/src/main/java/org/apache/aurora/scheduler/app/AppModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/app/AppModule.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler.app;
+package org.apache.aurora.scheduler.app;
 
 import java.util.Arrays;
 import java.util.List;
@@ -29,20 +29,6 @@ import com.google.inject.AbstractModule;
 import com.google.inject.Key;
 import com.google.inject.Provides;
 
-import org.apache.mesos.Scheduler;
-import org.apache.zookeeper.data.ACL;
-
-import com.twitter.aurora.GuiceUtils;
-import com.twitter.aurora.scheduler.SchedulerModule;
-import com.twitter.aurora.scheduler.async.AsyncModule;
-import com.twitter.aurora.scheduler.events.PubsubEventModule;
-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;
 import com.twitter.common.application.modules.LifecycleModule;
 import com.twitter.common.base.Command;
@@ -60,6 +46,22 @@ import com.twitter.common.zookeeper.ZooKeeperUtils;
 import com.twitter.common.zookeeper.guice.client.ZooKeeperClientModule.ClientConfig;
 import com.twitter.thrift.ServiceInstance;
 
+import org.apache.aurora.GuiceUtils;
+import org.apache.aurora.scheduler.SchedulerModule;
+import org.apache.aurora.scheduler.async.AsyncModule;
+import org.apache.aurora.scheduler.events.PubsubEventModule;
+import org.apache.aurora.scheduler.filter.SchedulingFilterImpl;
+import org.apache.aurora.scheduler.http.ClusterName;
+import org.apache.aurora.scheduler.http.ServletModule;
+import org.apache.aurora.scheduler.metadata.MetadataModule;
+import org.apache.aurora.scheduler.quota.QuotaModule;
+import org.apache.aurora.scheduler.state.StateModule;
+import org.apache.aurora.scheduler.stats.AsyncStatsModule;
+
+import org.apache.mesos.Scheduler;
+
+import org.apache.zookeeper.data.ACL;
+
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import static com.twitter.common.base.MorePreconditions.checkNotBlank;

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/app/Log4jConfigurator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/app/Log4jConfigurator.java b/src/main/java/org/apache/aurora/scheduler/app/Log4jConfigurator.java
index 0ea2204..aeb0b8d 100644
--- a/src/main/java/org/apache/aurora/scheduler/app/Log4jConfigurator.java
+++ b/src/main/java/org/apache/aurora/scheduler/app/Log4jConfigurator.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler.app;
+package org.apache.aurora.scheduler.app;
 
 import com.google.common.base.Preconditions;
 
+import com.twitter.common.logging.RootLogConfig;
+import com.twitter.common.logging.RootLogConfig.Configuration;
+import com.twitter.common.logging.log4j.GlogLayout;
+
 import org.apache.log4j.BasicConfigurator;
 import org.apache.log4j.ConsoleAppender;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 
-import com.twitter.common.logging.RootLogConfig;
-import com.twitter.common.logging.RootLogConfig.Configuration;
-import com.twitter.common.logging.log4j.GlogLayout;
-
 /**
  * Configures log4j logging.
  */

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/app/Modules.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/app/Modules.java b/src/main/java/org/apache/aurora/scheduler/app/Modules.java
index 72a80e1..b241991 100644
--- a/src/main/java/org/apache/aurora/scheduler/app/Modules.java
+++ b/src/main/java/org/apache/aurora/scheduler/app/Modules.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler.app;
+package org.apache.aurora.scheduler.app;
 
 import com.google.inject.Module;
 import com.google.inject.PrivateModule;

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java b/src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java
index 693c364..0fa22bc 100644
--- a/src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java
+++ b/src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler.app;
+package org.apache.aurora.scheduler.app;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -33,26 +33,6 @@ import com.google.common.collect.ImmutableList.Builder;
 import com.google.inject.AbstractModule;
 import com.google.inject.Module;
 
-import com.twitter.aurora.auth.CapabilityValidator;
-import com.twitter.aurora.auth.SessionValidator;
-import com.twitter.aurora.auth.UnsecureAuthModule;
-import com.twitter.aurora.scheduler.DriverFactory;
-import com.twitter.aurora.scheduler.DriverFactory.DriverFactoryImpl;
-import com.twitter.aurora.scheduler.MesosTaskFactory.ExecutorConfig;
-import com.twitter.aurora.scheduler.SchedulerLifecycle;
-import com.twitter.aurora.scheduler.cron.CronPredictor;
-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.storage.backup.BackupModule;
-import com.twitter.aurora.scheduler.storage.log.LogStorage;
-import com.twitter.aurora.scheduler.storage.log.LogStorageModule;
-import com.twitter.aurora.scheduler.storage.log.SnapshotStoreImpl;
-import com.twitter.aurora.scheduler.storage.mem.MemStorageModule;
-import com.twitter.aurora.scheduler.thrift.ThriftConfiguration;
-import com.twitter.aurora.scheduler.thrift.ThriftModule;
-import com.twitter.aurora.scheduler.thrift.auth.ThriftAuthModule;
 import com.twitter.common.application.AbstractApplication;
 import com.twitter.common.application.AppLauncher;
 import com.twitter.common.application.Lifecycle;
@@ -73,6 +53,27 @@ import com.twitter.common.zookeeper.guice.client.ZooKeeperClientModule;
 import com.twitter.common.zookeeper.guice.client.ZooKeeperClientModule.ClientConfig;
 import com.twitter.common.zookeeper.guice.client.flagged.FlaggedClientConfig;
 
+import org.apache.aurora.auth.CapabilityValidator;
+import org.apache.aurora.auth.SessionValidator;
+import org.apache.aurora.auth.UnsecureAuthModule;
+import org.apache.aurora.scheduler.DriverFactory;
+import org.apache.aurora.scheduler.DriverFactory.DriverFactoryImpl;
+import org.apache.aurora.scheduler.MesosTaskFactory.ExecutorConfig;
+import org.apache.aurora.scheduler.SchedulerLifecycle;
+import org.apache.aurora.scheduler.cron.CronPredictor;
+import org.apache.aurora.scheduler.cron.CronScheduler;
+import org.apache.aurora.scheduler.cron.noop.NoopCronModule;
+import org.apache.aurora.scheduler.local.IsolatedSchedulerModule;
+import org.apache.aurora.scheduler.log.mesos.MesosLogStreamModule;
+import org.apache.aurora.scheduler.storage.backup.BackupModule;
+import org.apache.aurora.scheduler.storage.log.LogStorage;
+import org.apache.aurora.scheduler.storage.log.LogStorageModule;
+import org.apache.aurora.scheduler.storage.log.SnapshotStoreImpl;
+import org.apache.aurora.scheduler.storage.mem.MemStorageModule;
+import org.apache.aurora.scheduler.thrift.ThriftConfiguration;
+import org.apache.aurora.scheduler.thrift.ThriftModule;
+import org.apache.aurora.scheduler.thrift.auth.ThriftAuthModule;
+
 /**
  * Launcher for the aurora scheduler.
  */

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/async/AsyncModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/async/AsyncModule.java b/src/main/java/org/apache/aurora/scheduler/async/AsyncModule.java
index faf3269..1e5c040 100644
--- a/src/main/java/org/apache/aurora/scheduler/async/AsyncModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/async/AsyncModule.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler.async;
+package org.apache.aurora.scheduler.async;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -34,12 +34,6 @@ import com.google.inject.Key;
 import com.google.inject.PrivateModule;
 import com.google.inject.TypeLiteral;
 
-import com.twitter.aurora.scheduler.async.OfferQueue.OfferQueueImpl;
-import com.twitter.aurora.scheduler.async.OfferQueue.OfferReturnDelay;
-import com.twitter.aurora.scheduler.async.RescheduleCalculator.RescheduleCalculatorImpl;
-import com.twitter.aurora.scheduler.async.TaskGroups.TaskGroupsSettings;
-import com.twitter.aurora.scheduler.async.TaskScheduler.TaskSchedulerImpl;
-import com.twitter.aurora.scheduler.events.PubsubEventModule;
 import com.twitter.common.args.Arg;
 import com.twitter.common.args.CmdLine;
 import com.twitter.common.quantity.Amount;
@@ -50,15 +44,22 @@ import com.twitter.common.stats.StatsProvider;
 import com.twitter.common.util.Random;
 import com.twitter.common.util.TruncatedBinaryBackoff;
 
+import org.apache.aurora.scheduler.async.OfferQueue.OfferQueueImpl;
+import org.apache.aurora.scheduler.async.OfferQueue.OfferReturnDelay;
+import org.apache.aurora.scheduler.async.RescheduleCalculator.RescheduleCalculatorImpl;
+import org.apache.aurora.scheduler.async.TaskGroups.TaskGroupsSettings;
+import org.apache.aurora.scheduler.async.TaskScheduler.TaskSchedulerImpl;
+import org.apache.aurora.scheduler.events.PubsubEventModule;
+
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-import static com.twitter.aurora.scheduler.async.HistoryPruner.PruneThreshold;
-import static com.twitter.aurora.scheduler.async.Preemptor.PreemptorImpl;
-import static com.twitter.aurora.scheduler.async.Preemptor.PreemptorImpl.PreemptionDelay;
-import static com.twitter.aurora.scheduler.async.TaskScheduler.TaskSchedulerImpl.ReservationDuration;
+import static org.apache.aurora.scheduler.async.HistoryPruner.PruneThreshold;
+import static org.apache.aurora.scheduler.async.Preemptor.PreemptorImpl;
+import static org.apache.aurora.scheduler.async.Preemptor.PreemptorImpl.PreemptionDelay;
+import static org.apache.aurora.scheduler.async.TaskScheduler.TaskSchedulerImpl.ReservationDuration;
 
 /**
  * Binding module for async task management.

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/async/HistoryPruner.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/async/HistoryPruner.java b/src/main/java/org/apache/aurora/scheduler/async/HistoryPruner.java
index 9af6d36..5ca79bb 100644
--- a/src/main/java/org/apache/aurora/scheduler/async/HistoryPruner.java
+++ b/src/main/java/org/apache/aurora/scheduler/async/HistoryPruner.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler.async;
+package org.apache.aurora.scheduler.async;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -38,16 +38,17 @@ import com.google.common.collect.Multimaps;
 import com.google.common.eventbus.Subscribe;
 import com.google.inject.BindingAnnotation;
 
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.base.Tasks;
-import com.twitter.aurora.scheduler.state.StateManager;
-import com.twitter.aurora.scheduler.storage.Storage;
-import com.twitter.aurora.scheduler.storage.entities.IJobKey;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
 import com.twitter.common.quantity.Amount;
 import com.twitter.common.quantity.Time;
 import com.twitter.common.util.Clock;
 
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.base.Tasks;
+import org.apache.aurora.scheduler.state.StateManager;
+import org.apache.aurora.scheduler.storage.Storage;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
@@ -55,11 +56,11 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import static com.twitter.aurora.scheduler.base.Tasks.LATEST_ACTIVITY;
-import static com.twitter.aurora.scheduler.events.PubsubEvent.EventSubscriber;
-import static com.twitter.aurora.scheduler.events.PubsubEvent.StorageStarted;
-import static com.twitter.aurora.scheduler.events.PubsubEvent.TaskStateChange;
-import static com.twitter.aurora.scheduler.events.PubsubEvent.TasksDeleted;
+import static org.apache.aurora.scheduler.base.Tasks.LATEST_ACTIVITY;
+import static org.apache.aurora.scheduler.events.PubsubEvent.EventSubscriber;
+import static org.apache.aurora.scheduler.events.PubsubEvent.StorageStarted;
+import static org.apache.aurora.scheduler.events.PubsubEvent.TaskStateChange;
+import static org.apache.aurora.scheduler.events.PubsubEvent.TasksDeleted;
 
 /**
  * Prunes tasks in a job based on per-job history and an inactive time threshold by observing tasks

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/async/OfferQueue.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/async/OfferQueue.java b/src/main/java/org/apache/aurora/scheduler/async/OfferQueue.java
index 95334ff..a45c696 100644
--- a/src/main/java/org/apache/aurora/scheduler/async/OfferQueue.java
+++ b/src/main/java/org/apache/aurora/scheduler/async/OfferQueue.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler.async;
+package org.apache.aurora.scheduler.async;
 
 import java.util.Comparator;
 import java.util.List;
@@ -37,25 +37,26 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Ordering;
 import com.google.common.eventbus.Subscribe;
 
-import org.apache.mesos.Protos.Offer;
-import org.apache.mesos.Protos.OfferID;
-import org.apache.mesos.Protos.TaskInfo;
-
-import com.twitter.aurora.gen.HostStatus;
-import com.twitter.aurora.gen.MaintenanceMode;
-import com.twitter.aurora.scheduler.Driver;
-import com.twitter.aurora.scheduler.events.PubsubEvent.DriverDisconnected;
-import com.twitter.aurora.scheduler.events.PubsubEvent.EventSubscriber;
-import com.twitter.aurora.scheduler.events.PubsubEvent.HostMaintenanceStateChange;
-import com.twitter.aurora.scheduler.state.MaintenanceController;
 import com.twitter.common.quantity.Amount;
 import com.twitter.common.quantity.Time;
 import com.twitter.common.stats.Stats;
 
-import static com.twitter.aurora.gen.MaintenanceMode.DRAINED;
-import static com.twitter.aurora.gen.MaintenanceMode.DRAINING;
-import static com.twitter.aurora.gen.MaintenanceMode.NONE;
-import static com.twitter.aurora.gen.MaintenanceMode.SCHEDULED;
+import org.apache.aurora.gen.HostStatus;
+import org.apache.aurora.gen.MaintenanceMode;
+import org.apache.aurora.scheduler.Driver;
+import org.apache.aurora.scheduler.events.PubsubEvent.DriverDisconnected;
+import org.apache.aurora.scheduler.events.PubsubEvent.EventSubscriber;
+import org.apache.aurora.scheduler.events.PubsubEvent.HostMaintenanceStateChange;
+import org.apache.aurora.scheduler.state.MaintenanceController;
+
+import org.apache.mesos.Protos.Offer;
+import org.apache.mesos.Protos.OfferID;
+import org.apache.mesos.Protos.TaskInfo;
+
+import static org.apache.aurora.gen.MaintenanceMode.DRAINED;
+import static org.apache.aurora.gen.MaintenanceMode.DRAINING;
+import static org.apache.aurora.gen.MaintenanceMode.NONE;
+import static org.apache.aurora.gen.MaintenanceMode.SCHEDULED;
 
 /**
  * Tracks the Offers currently known by the scheduler

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/async/Preemptor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/async/Preemptor.java b/src/main/java/org/apache/aurora/scheduler/async/Preemptor.java
index a01790c..387d8c9 100644
--- a/src/main/java/org/apache/aurora/scheduler/async/Preemptor.java
+++ b/src/main/java/org/apache/aurora/scheduler/async/Preemptor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler.async;
+package org.apache.aurora.scheduler.async;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -42,32 +42,33 @@ import com.google.common.collect.Ordering;
 import com.google.common.collect.Sets;
 import com.google.inject.BindingAnnotation;
 
-import com.twitter.aurora.scheduler.ResourceSlot;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.base.ScheduleException;
-import com.twitter.aurora.scheduler.base.Tasks;
-import com.twitter.aurora.scheduler.filter.SchedulingFilter;
-import com.twitter.aurora.scheduler.state.SchedulerCore;
-import com.twitter.aurora.scheduler.storage.Storage;
-import com.twitter.aurora.scheduler.storage.entities.IAssignedTask;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
 import com.twitter.common.quantity.Amount;
 import com.twitter.common.quantity.Time;
 import com.twitter.common.stats.Stats;
 import com.twitter.common.util.Clock;
 
+import org.apache.aurora.scheduler.ResourceSlot;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.base.ScheduleException;
+import org.apache.aurora.scheduler.base.Tasks;
+import org.apache.aurora.scheduler.filter.SchedulingFilter;
+import org.apache.aurora.scheduler.state.SchedulerCore;
+import org.apache.aurora.scheduler.storage.Storage;
+import org.apache.aurora.scheduler.storage.entities.IAssignedTask;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+
+import org.apache.mesos.Protos.Offer;
+
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-import org.apache.mesos.Protos.Offer;
-
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import static com.twitter.aurora.gen.ScheduleStatus.PENDING;
-import static com.twitter.aurora.gen.ScheduleStatus.PREEMPTING;
-import static com.twitter.aurora.scheduler.base.Tasks.SCHEDULED_TO_ASSIGNED;
+import static org.apache.aurora.gen.ScheduleStatus.PENDING;
+import static org.apache.aurora.gen.ScheduleStatus.PREEMPTING;
+import static org.apache.aurora.scheduler.base.Tasks.SCHEDULED_TO_ASSIGNED;
 
 /**
  * Preempts active tasks in favor of higher priority tasks.

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/async/RescheduleCalculator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/async/RescheduleCalculator.java b/src/main/java/org/apache/aurora/scheduler/async/RescheduleCalculator.java
index eefc03a..738d51a 100644
--- a/src/main/java/org/apache/aurora/scheduler/async/RescheduleCalculator.java
+++ b/src/main/java/org/apache/aurora/scheduler/async/RescheduleCalculator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler.async;
+package org.apache.aurora.scheduler.async;
 
 import java.util.EnumSet;
 import java.util.List;
@@ -31,22 +31,23 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.base.Tasks;
-import com.twitter.aurora.scheduler.storage.Storage;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.entities.ITaskEvent;
 import com.twitter.common.quantity.Amount;
 import com.twitter.common.quantity.Time;
 import com.twitter.common.util.BackoffStrategy;
 import com.twitter.common.util.Clock;
 import com.twitter.common.util.Random;
 
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.base.Tasks;
+import org.apache.aurora.scheduler.storage.Storage;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+import org.apache.aurora.scheduler.storage.entities.ITaskEvent;
+
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import static com.twitter.aurora.gen.ScheduleStatus.KILLING;
-import static com.twitter.aurora.gen.ScheduleStatus.RESTARTING;
+import static org.apache.aurora.gen.ScheduleStatus.KILLING;
+import static org.apache.aurora.gen.ScheduleStatus.RESTARTING;
 
 /**
  * Calculates scheduling delays for tasks.

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/async/TaskGroup.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/async/TaskGroup.java b/src/main/java/org/apache/aurora/scheduler/async/TaskGroup.java
index 018022b..623b0fd 100644
--- a/src/main/java/org/apache/aurora/scheduler/async/TaskGroup.java
+++ b/src/main/java/org/apache/aurora/scheduler/async/TaskGroup.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler.async;
+package org.apache.aurora.scheduler.async;
 
 import java.util.Queue;
 import java.util.Set;
@@ -26,10 +26,11 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Ordering;
 
-import com.twitter.aurora.scheduler.async.TaskGroups.GroupKey;
 import com.twitter.common.base.Function;
 import com.twitter.common.util.BackoffStrategy;
 
+import org.apache.aurora.scheduler.async.TaskGroups.GroupKey;
+
 /**
  * A group of task IDs that are eligible for scheduling, but may be waiting for a backoff to expire.
  */

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/async/TaskGroups.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/async/TaskGroups.java b/src/main/java/org/apache/aurora/scheduler/async/TaskGroups.java
index a59e5c8..3465cde 100644
--- a/src/main/java/org/apache/aurora/scheduler/async/TaskGroups.java
+++ b/src/main/java/org/apache/aurora/scheduler/async/TaskGroups.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler.async;
+package org.apache.aurora.scheduler.async;
 
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
@@ -32,17 +32,6 @@ import com.google.common.eventbus.Subscribe;
 import com.google.common.util.concurrent.RateLimiter;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
-import com.twitter.aurora.scheduler.base.JobKeys;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.base.Tasks;
-import com.twitter.aurora.scheduler.events.PubsubEvent.EventSubscriber;
-import com.twitter.aurora.scheduler.events.PubsubEvent.StorageStarted;
-import com.twitter.aurora.scheduler.events.PubsubEvent.TaskStateChange;
-import com.twitter.aurora.scheduler.events.PubsubEvent.TasksDeleted;
-import com.twitter.aurora.scheduler.storage.Storage;
-import com.twitter.aurora.scheduler.storage.entities.IAssignedTask;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
 import com.twitter.common.application.ShutdownRegistry;
 import com.twitter.common.base.Command;
 import com.twitter.common.quantity.Amount;
@@ -52,10 +41,22 @@ import com.twitter.common.util.BackoffStrategy;
 import com.twitter.common.util.Clock;
 import com.twitter.common.util.concurrent.ExecutorServiceShutdown;
 
+import org.apache.aurora.scheduler.base.JobKeys;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.base.Tasks;
+import org.apache.aurora.scheduler.events.PubsubEvent.EventSubscriber;
+import org.apache.aurora.scheduler.events.PubsubEvent.StorageStarted;
+import org.apache.aurora.scheduler.events.PubsubEvent.TaskStateChange;
+import org.apache.aurora.scheduler.events.PubsubEvent.TasksDeleted;
+import org.apache.aurora.scheduler.storage.Storage;
+import org.apache.aurora.scheduler.storage.entities.IAssignedTask;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
+
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import static com.twitter.aurora.gen.ScheduleStatus.PENDING;
-import static com.twitter.aurora.scheduler.async.TaskGroup.GroupState;
+import static org.apache.aurora.gen.ScheduleStatus.PENDING;
+import static org.apache.aurora.scheduler.async.TaskGroup.GroupState;
 
 /**
  * A collection of task groups, where a task group is a collection of tasks that are known to be
@@ -214,7 +215,7 @@ public class TaskGroups implements EventSubscriber {
   /**
    * Informs the task groups of a task state change.
    * <p>
-   * This is used to observe {@link com.twitter.aurora.gen.ScheduleStatus#PENDING} tasks and begin
+   * This is used to observe {@link org.apache.aurora.gen.ScheduleStatus#PENDING} tasks and begin
    * attempting to schedule them.
    *
    * @param stateChange State change notification.
@@ -231,7 +232,7 @@ public class TaskGroups implements EventSubscriber {
   /**
    * Signals that storage has started and is consistent.
    * <p>
-   * Upon this signal, all {@link com.twitter.aurora.gen.ScheduleStatus#PENDING} tasks in the stoage
+   * Upon this signal, all {@link org.apache.aurora.gen.ScheduleStatus#PENDING} tasks in the stoage
    * will become eligible for scheduling.
    *
    * @param event Storage started notification.

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/async/TaskScheduler.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/async/TaskScheduler.java b/src/main/java/org/apache/aurora/scheduler/async/TaskScheduler.java
index 0ad9e13..efa5666 100644
--- a/src/main/java/org/apache/aurora/scheduler/async/TaskScheduler.java
+++ b/src/main/java/org/apache/aurora/scheduler/async/TaskScheduler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler.async;
+package org.apache.aurora.scheduler.async;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -34,19 +34,6 @@ import com.google.common.collect.Iterables;
 import com.google.common.eventbus.Subscribe;
 import com.google.inject.BindingAnnotation;
 
-import org.apache.mesos.Protos.Offer;
-import org.apache.mesos.Protos.SlaveID;
-import org.apache.mesos.Protos.TaskInfo;
-
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.events.PubsubEvent.EventSubscriber;
-import com.twitter.aurora.scheduler.events.PubsubEvent.TaskStateChange;
-import com.twitter.aurora.scheduler.state.StateManager;
-import com.twitter.aurora.scheduler.state.TaskAssigner;
-import com.twitter.aurora.scheduler.storage.Storage;
-import com.twitter.aurora.scheduler.storage.Storage.MutableStoreProvider;
-import com.twitter.aurora.scheduler.storage.Storage.MutateWork;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
 import com.twitter.common.inject.TimedInterceptor.Timed;
 import com.twitter.common.quantity.Amount;
 import com.twitter.common.quantity.Time;
@@ -54,6 +41,20 @@ import com.twitter.common.stats.StatImpl;
 import com.twitter.common.stats.Stats;
 import com.twitter.common.util.Clock;
 
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.events.PubsubEvent.EventSubscriber;
+import org.apache.aurora.scheduler.events.PubsubEvent.TaskStateChange;
+import org.apache.aurora.scheduler.state.StateManager;
+import org.apache.aurora.scheduler.state.TaskAssigner;
+import org.apache.aurora.scheduler.storage.Storage;
+import org.apache.aurora.scheduler.storage.Storage.MutableStoreProvider;
+import org.apache.aurora.scheduler.storage.Storage.MutateWork;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+
+import org.apache.mesos.Protos.Offer;
+import org.apache.mesos.Protos.SlaveID;
+import org.apache.mesos.Protos.TaskInfo;
+
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
@@ -61,8 +62,8 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import static com.twitter.aurora.gen.ScheduleStatus.LOST;
-import static com.twitter.aurora.gen.ScheduleStatus.PENDING;
+import static org.apache.aurora.gen.ScheduleStatus.LOST;
+import static org.apache.aurora.gen.ScheduleStatus.PENDING;
 
 /**
  * Enables scheduling and preemption of tasks.

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/async/TaskTimeout.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/async/TaskTimeout.java b/src/main/java/org/apache/aurora/scheduler/async/TaskTimeout.java
index 19848c7..5e3b2a3 100644
--- a/src/main/java/org/apache/aurora/scheduler/async/TaskTimeout.java
+++ b/src/main/java/org/apache/aurora/scheduler/async/TaskTimeout.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler.async;
+package org.apache.aurora.scheduler.async;
 
 import java.util.EnumSet;
 import java.util.Map;
@@ -37,20 +37,21 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Ordering;
 import com.google.common.eventbus.Subscribe;
 
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.base.Tasks;
-import com.twitter.aurora.scheduler.events.PubsubEvent.EventSubscriber;
-import com.twitter.aurora.scheduler.events.PubsubEvent.StorageStarted;
-import com.twitter.aurora.scheduler.events.PubsubEvent.TaskStateChange;
-import com.twitter.aurora.scheduler.state.StateManager;
-import com.twitter.aurora.scheduler.storage.Storage;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
 import com.twitter.common.quantity.Amount;
 import com.twitter.common.quantity.Time;
 import com.twitter.common.stats.StatsProvider;
 import com.twitter.common.util.Clock;
 
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.base.Tasks;
+import org.apache.aurora.scheduler.events.PubsubEvent.EventSubscriber;
+import org.apache.aurora.scheduler.events.PubsubEvent.StorageStarted;
+import org.apache.aurora.scheduler.events.PubsubEvent.TaskStateChange;
+import org.apache.aurora.scheduler.state.StateManager;
+import org.apache.aurora.scheduler.storage.Storage;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**


Mime
View raw message