You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by wf...@apache.org on 2013/12/31 22:28:02 UTC
[1/9] Refactors java and python code to the Apache namespace.
Updated Branches:
refs/heads/master bc1635df8 -> cfb13f659
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/commands/test_ssh.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_ssh.py b/src/test/python/apache/aurora/client/commands/test_ssh.py
index af97b36..64dc896 100644
--- a/src/test/python/apache/aurora/client/commands/test_ssh.py
+++ b/src/test/python/apache/aurora/client/commands/test_ssh.py
@@ -1,9 +1,9 @@
import contextlib
-from twitter.aurora.client.commands.ssh import ssh
-from twitter.aurora.client.commands.util import AuroraClientCommandTest
+from apache.aurora.client.commands.ssh import ssh
+from apache.aurora.client.commands.util import AuroraClientCommandTest
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
AssignedTask,
Identity,
JobKey,
@@ -79,10 +79,10 @@ class TestSshCommand(AuroraClientCommandTest):
mock_scheduler.getTasksStatus.return_value = self.create_status_response()
sandbox_args = {'slave_root': '/slaveroot', 'slave_run_directory': 'slaverun'}
with contextlib.nested(
- patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
- patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
+ patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
+ patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
patch('twitter.common.app.get_options', return_value=mock_options),
- patch('twitter.aurora.client.api.command_runner.DistributedCommandRunner.sandbox_args',
+ patch('apache.aurora.client.api.command_runner.DistributedCommandRunner.sandbox_args',
return_value=sandbox_args),
patch('subprocess.call', return_value=0)) as (
mock_scheduler_proxy_class,
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/commands/test_status.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_status.py b/src/test/python/apache/aurora/client/commands/test_status.py
index 89f602d..9241631 100644
--- a/src/test/python/apache/aurora/client/commands/test_status.py
+++ b/src/test/python/apache/aurora/client/commands/test_status.py
@@ -1,12 +1,12 @@
import contextlib
import unittest
-from twitter.aurora.common.cluster import Cluster
-from twitter.aurora.common.clusters import Clusters
-from twitter.aurora.client.commands.core import status
-from twitter.aurora.client.commands.util import AuroraClientCommandTest
+from apache.aurora.common.cluster import Cluster
+from apache.aurora.common.clusters import Clusters
+from apache.aurora.client.commands.core import status
+from apache.aurora.client.commands.util import AuroraClientCommandTest
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
AssignedTask,
Identity,
JobKey,
@@ -77,8 +77,8 @@ class TestListJobs(AuroraClientCommandTest):
(mock_api, mock_scheduler) = self.create_mock_api()
mock_scheduler.getTasksStatus.return_value = self.create_status_response()
with contextlib.nested(
- patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
- patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
+ patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
+ patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
patch('twitter.common.app.get_options', return_value=mock_options)) as (
mock_scheduler_proxy_class,
mock_clusters,
@@ -97,8 +97,8 @@ class TestListJobs(AuroraClientCommandTest):
(mock_api, mock_scheduler) = self.create_mock_api()
mock_scheduler.getTasksStatus.return_value = self.create_failed_status_response()
with contextlib.nested(
- patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
- patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
+ patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
+ patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
patch('twitter.common.app.get_options', return_value=mock_options)) as (
mock_scheduler_proxy_class,
mock_clusters,
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/commands/test_update.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_update.py b/src/test/python/apache/aurora/client/commands/test_update.py
index 9aa2ba7..ccc3ee9 100644
--- a/src/test/python/apache/aurora/client/commands/test_update.py
+++ b/src/test/python/apache/aurora/client/commands/test_update.py
@@ -2,17 +2,17 @@ import contextlib
import functools
import unittest
-from twitter.aurora.common.cluster import Cluster
-from twitter.aurora.common.clusters import Clusters
-from twitter.aurora.client.commands.core import update
-from twitter.aurora.client.commands.util import AuroraClientCommandTest
-from twitter.aurora.client.api.updater import Updater
-from twitter.aurora.client.api.health_check import InstanceWatcherHealthCheck, Retriable
-from twitter.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
-from twitter.aurora.config import AuroraConfig
+from apache.aurora.common.cluster import Cluster
+from apache.aurora.common.clusters import Clusters
+from apache.aurora.client.commands.core import update
+from apache.aurora.client.commands.util import AuroraClientCommandTest
+from apache.aurora.client.api.updater import Updater
+from apache.aurora.client.api.health_check import InstanceWatcherHealthCheck, Retriable
+from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
+from apache.aurora.config import AuroraConfig
from twitter.common.contextutil import temporary_file
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
AcquireLockResult,
AddInstancesConfig,
AssignedTask,
@@ -62,9 +62,9 @@ class TestUpdateCommand(AuroraClientCommandTest):
mock_options = self.setup_mock_options()
(mock_api, mock_scheduler) = self.create_mock_api()
with contextlib.nested(
- patch('twitter.aurora.client.commands.core.make_client', return_value=mock_api),
+ patch('apache.aurora.client.commands.core.make_client', return_value=mock_api),
patch('twitter.common.app.get_options', return_value=mock_options),
- patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS)
+ patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS)
) as (make_client,
options,
test_clusters):
@@ -86,9 +86,9 @@ class TestUpdateCommand(AuroraClientCommandTest):
(mock_api, mock_scheduler) = self.create_mock_api()
# Set up the context to capture the make_client and get_options calls.
with contextlib.nested(
- patch('twitter.aurora.client.commands.core.make_client', return_value=mock_api),
+ patch('apache.aurora.client.commands.core.make_client', return_value=mock_api),
patch('twitter.common.app.get_options', return_value=mock_options),
- patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS)
+ patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS)
) as (make_client,
options,
test_clusters):
@@ -196,9 +196,9 @@ class TestUpdateCommand(AuroraClientCommandTest):
with contextlib.nested(
patch('twitter.common.app.get_options', return_value=mock_options),
- patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler.scheduler),
- patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
- patch('twitter.aurora.client.api.instance_watcher.InstanceWatcherHealthCheck',
+ patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler.scheduler),
+ patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
+ patch('apache.aurora.client.api.instance_watcher.InstanceWatcherHealthCheck',
return_value=mock_health_check),
patch('time.time', side_effect=functools.partial(self.fake_time, self)),
patch('time.sleep', return_value=None)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/commands/util.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/util.py b/src/test/python/apache/aurora/client/commands/util.py
index fd06f0a..22694a2 100644
--- a/src/test/python/apache/aurora/client/commands/util.py
+++ b/src/test/python/apache/aurora/client/commands/util.py
@@ -1,10 +1,10 @@
import unittest
-from twitter.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
-from twitter.aurora.common.cluster import Cluster
-from twitter.aurora.common.clusters import Clusters
+from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
+from apache.aurora.common.cluster import Cluster
+from apache.aurora.common.clusters import Clusters
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
Response,
ResponseCode,
Result,
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/fake_scheduler_proxy.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/fake_scheduler_proxy.py b/src/test/python/apache/aurora/client/fake_scheduler_proxy.py
index 80c99f4..7565814 100644
--- a/src/test/python/apache/aurora/client/fake_scheduler_proxy.py
+++ b/src/test/python/apache/aurora/client/fake_scheduler_proxy.py
@@ -1,4 +1,4 @@
-from twitter.aurora.client.api.scheduler_client import SchedulerProxy
+from apache.aurora.client.api.scheduler_client import SchedulerProxy
class FakeSchedulerProxy(SchedulerProxy):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/hooks/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/hooks/BUILD b/src/test/python/apache/aurora/client/hooks/BUILD
index 71a69e1..67c6e41 100644
--- a/src/test/python/apache/aurora/client/hooks/BUILD
+++ b/src/test/python/apache/aurora/client/hooks/BUILD
@@ -8,17 +8,17 @@ python_test_suite(name = 'all',
python_tests(name = 'hooked_api',
sources = ['test_hooked_api.py'],
dependencies = [
- pants('src/main/python/twitter/aurora/common:cluster'),
- pants('src/main/python/twitter/aurora/client:api'),
- pants('src/main/python/twitter/aurora/client/hooks'),
- pants('src/main/python/twitter/aurora/BUILD.thirdparty:mock'),
+ pants('src/main/python/apache/aurora/common:cluster'),
+ pants('src/main/python/apache/aurora/client:api'),
+ pants('src/main/python/apache/aurora/client/hooks'),
+ pants('src/main/python/apache/aurora/BUILD.thirdparty:mock'),
]
)
python_tests(name = 'non_hooked_api',
sources = ['test_non_hooked_api.py'],
dependencies = [
- pants('src/main/python/twitter/aurora/common:aurora_job_key'),
- pants('src/main/python/twitter/aurora/client/hooks'),
+ pants('src/main/python/apache/aurora/common:aurora_job_key'),
+ pants('src/main/python/apache/aurora/client/hooks'),
],
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/hooks/test_hooked_api.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/hooks/test_hooked_api.py b/src/test/python/apache/aurora/client/hooks/test_hooked_api.py
index a3cc616..2226613 100644
--- a/src/test/python/apache/aurora/client/hooks/test_hooked_api.py
+++ b/src/test/python/apache/aurora/client/hooks/test_hooked_api.py
@@ -1,8 +1,8 @@
from inspect import getargspec
-from twitter.aurora.client.hooks.hooked_api import HookedAuroraClientAPI, NonHookedAuroraClientAPI
-from twitter.aurora.client.api import AuroraClientAPI
-from twitter.aurora.common.cluster import Cluster
+from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI, NonHookedAuroraClientAPI
+from apache.aurora.client.api import AuroraClientAPI
+from apache.aurora.common.cluster import Cluster
from mock import Mock
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/hooks/test_non_hooked_api.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/hooks/test_non_hooked_api.py b/src/test/python/apache/aurora/client/hooks/test_non_hooked_api.py
index 6ff1e82..1cb1fd4 100644
--- a/src/test/python/apache/aurora/client/hooks/test_non_hooked_api.py
+++ b/src/test/python/apache/aurora/client/hooks/test_non_hooked_api.py
@@ -1,8 +1,8 @@
import functools
import unittest
-from twitter.aurora.common.aurora_job_key import AuroraJobKey
-from twitter.aurora.client.hooks.hooked_api import NonHookedAuroraClientAPI
+from apache.aurora.common.aurora_job_key import AuroraJobKey
+from apache.aurora.client.hooks.hooked_api import NonHookedAuroraClientAPI
API_METHODS = ('cancel_update', 'create_job', 'kill_job', 'restart', 'start_cronjob', 'update_job')
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/test_binding_helper.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/test_binding_helper.py b/src/test/python/apache/aurora/client/test_binding_helper.py
index 7ef951b..9bbda4c 100644
--- a/src/test/python/apache/aurora/client/test_binding_helper.py
+++ b/src/test/python/apache/aurora/client/test_binding_helper.py
@@ -1,8 +1,8 @@
import textwrap
-from twitter.aurora.client import binding_helper
-from twitter.aurora.client.binding_helper import BindingHelper, CachingBindingHelper
-from twitter.aurora.config import AuroraConfig
+from apache.aurora.client import binding_helper
+from apache.aurora.client.binding_helper import BindingHelper, CachingBindingHelper
+from apache.aurora.config import AuroraConfig
from twitter.common.contextutil import temporary_file
from pystachio import Ref
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/test_config.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/test_config.py b/src/test/python/apache/aurora/client/test_config.py
index 70f30a5..ae7d9b7 100644
--- a/src/test/python/apache/aurora/client/test_config.py
+++ b/src/test/python/apache/aurora/client/test_config.py
@@ -2,12 +2,12 @@ import os
from twitter.common.contextutil import temporary_dir, temporary_file
-from twitter.aurora.client import config
-from twitter.aurora.config import AuroraConfig
-from twitter.aurora.config.loader import AuroraConfigLoader
-from twitter.aurora.config.schema.base import Announcer, Job, MB, Resources, Task
+from apache.aurora.client import config
+from apache.aurora.config import AuroraConfig
+from apache.aurora.config.loader import AuroraConfigLoader
+from apache.aurora.config.schema.base import Announcer, Job, MB, Resources, Task
-from gen.twitter.aurora.constants import DEFAULT_ENVIRONMENT
+from gen.apache.aurora.constants import DEFAULT_ENVIRONMENT
import pytest
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/common/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/common/BUILD b/src/test/python/apache/aurora/common/BUILD
index 326aeba..9eeae2d 100644
--- a/src/test/python/apache/aurora/common/BUILD
+++ b/src/test/python/apache/aurora/common/BUILD
@@ -12,7 +12,7 @@ python_test_suite(
python_tests(name = 'test_aurora_job_key',
sources = ['test_aurora_job_key.py'],
dependencies = [
- pants('src/main/python/twitter/aurora/common:aurora_job_key')
+ pants('src/main/python/apache/aurora/common:aurora_job_key')
],
)
@@ -20,7 +20,7 @@ python_tests(
name = 'test_cluster',
sources = ['test_cluster.py'],
dependencies = [
- pants('src/main/python/twitter/aurora/common:cluster'),
+ pants('src/main/python/apache/aurora/common:cluster'),
]
)
@@ -28,9 +28,9 @@ python_tests(
name = 'test_clusters',
sources = ['test_clusters.py'],
dependencies = [
- pants('src/main/python/twitter/aurora/BUILD.thirdparty:pyyaml'),
+ pants('src/main/python/apache/aurora/BUILD.thirdparty:pyyaml'),
pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
- pants('src/main/python/twitter/aurora/common:clusters'),
+ pants('src/main/python/apache/aurora/common:clusters'),
]
)
@@ -39,9 +39,9 @@ python_tests(
sources = ['test_cluster_option.py'],
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/options'),
- pants('src/main/python/twitter/aurora/common:cluster'),
- pants('src/main/python/twitter/aurora/common:cluster_option'),
- pants('src/main/python/twitter/aurora/common:clusters'),
+ pants('src/main/python/apache/aurora/common:cluster'),
+ pants('src/main/python/apache/aurora/common:cluster_option'),
+ pants('src/main/python/apache/aurora/common:clusters'),
]
)
@@ -49,7 +49,7 @@ python_tests(
name = 'test_http_signaler',
sources = ['test_http_signaler.py'],
dependencies = [
- pants('src/main/python/twitter/aurora/BUILD.thirdparty:mox'),
- pants('src/main/python/twitter/aurora/common:http_signaler'),
+ pants('src/main/python/apache/aurora/BUILD.thirdparty:mox'),
+ pants('src/main/python/apache/aurora/common:http_signaler'),
]
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/common/test_aurora_job_key.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/common/test_aurora_job_key.py b/src/test/python/apache/aurora/common/test_aurora_job_key.py
index 94d46e8..8cf746e 100644
--- a/src/test/python/apache/aurora/common/test_aurora_job_key.py
+++ b/src/test/python/apache/aurora/common/test_aurora_job_key.py
@@ -1,6 +1,6 @@
import unittest
-from twitter.aurora.common.aurora_job_key import AuroraJobKey
+from apache.aurora.common.aurora_job_key import AuroraJobKey
# TODO(ksweeney): Moar coverage
class AuroraJobKeyTest(unittest.TestCase):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/common/test_cluster.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/common/test_cluster.py b/src/test/python/apache/aurora/common/test_cluster.py
index 14cf6b1..39f1fa4 100644
--- a/src/test/python/apache/aurora/common/test_cluster.py
+++ b/src/test/python/apache/aurora/common/test_cluster.py
@@ -1,4 +1,4 @@
-from twitter.aurora.common.cluster import Cluster
+from apache.aurora.common.cluster import Cluster
from pystachio import (
Default,
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/common/test_cluster_option.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/common/test_cluster_option.py b/src/test/python/apache/aurora/common/test_cluster_option.py
index 65860be..2d47b95 100644
--- a/src/test/python/apache/aurora/common/test_cluster_option.py
+++ b/src/test/python/apache/aurora/common/test_cluster_option.py
@@ -2,9 +2,9 @@ import pytest
from twitter.common import options
-from twitter.aurora.common.cluster import Cluster
-from twitter.aurora.common.clusters import Clusters
-from twitter.aurora.common.cluster_option import ClusterOption
+from apache.aurora.common.cluster import Cluster
+from apache.aurora.common.clusters import Clusters
+from apache.aurora.common.cluster_option import ClusterOption
CLUSTER_LIST = Clusters((
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/common/test_clusters.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/common/test_clusters.py b/src/test/python/apache/aurora/common/test_clusters.py
index bf3e6bd..f5a3526 100644
--- a/src/test/python/apache/aurora/common/test_clusters.py
+++ b/src/test/python/apache/aurora/common/test_clusters.py
@@ -1,7 +1,7 @@
import json
import os
-from twitter.aurora.common.clusters import Clusters, Parser
+from apache.aurora.common.clusters import Clusters, Parser
from twitter.common.contextutil import temporary_dir
import pytest
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/common/test_http_signaler.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/common/test_http_signaler.py b/src/test/python/apache/aurora/common/test_http_signaler.py
index 4970e1b..29a28b5 100644
--- a/src/test/python/apache/aurora/common/test_http_signaler.py
+++ b/src/test/python/apache/aurora/common/test_http_signaler.py
@@ -3,7 +3,7 @@ import unittest
from twitter.common.lang import Compatibility
-from twitter.aurora.common.http_signaler import HttpSignaler
+from apache.aurora.common.http_signaler import HttpSignaler
import mox
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/config/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/config/BUILD b/src/test/python/apache/aurora/config/BUILD
index 7a55538..3b59521 100644
--- a/src/test/python/apache/aurora/config/BUILD
+++ b/src/test/python/apache/aurora/config/BUILD
@@ -11,7 +11,7 @@ python_tests(name = 'test_base',
sources = ['test_base.py'],
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
- pants('src/main/python/twitter/aurora/config'),
+ pants('src/main/python/apache/aurora/config'),
]
)
@@ -19,25 +19,25 @@ python_tests(name = 'test_loader',
sources = ['test_loader.py'],
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
- pants('src/main/python/twitter/aurora/config'),
+ pants('src/main/python/apache/aurora/config'),
],
coverage = [
- 'twitter.aurora.config',
- 'twitter.thermos.config'
+ 'apache.aurora.config',
+ 'apache.thermos.config'
]
)
python_tests(name = 'test_constraint_parsing',
sources = ['test_constraint_parsing.py'],
dependencies = [
- pants('src/main/python/twitter/aurora/config'),
+ pants('src/main/python/apache/aurora/config'),
]
)
python_tests(name = 'test_thrift',
sources = ['test_thrift.py'],
dependencies = [
- pants('src/main/python/twitter/aurora/config'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift-test'),
+ pants('src/main/python/apache/aurora/config'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift-test'),
]
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/config/test_base.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/config/test_base.py b/src/test/python/apache/aurora/config/test_base.py
index 27bb794..d8ffdc6 100644
--- a/src/test/python/apache/aurora/config/test_base.py
+++ b/src/test/python/apache/aurora/config/test_base.py
@@ -2,8 +2,8 @@ import pytest
from twitter.common.contextutil import temporary_file
-from twitter.aurora.config import AuroraConfig, PortResolver
-from twitter.aurora.config.schema.base import (
+from apache.aurora.config import AuroraConfig, PortResolver
+from apache.aurora.config.schema.base import (
Announcer,
Empty,
Integer,
@@ -13,7 +13,7 @@ from twitter.aurora.config.schema.base import (
Task,
)
-from gen.twitter.aurora.ttypes import Identity
+from gen.apache.aurora.ttypes import Identity
resolve = PortResolver.resolve
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/config/test_constraint_parsing.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/config/test_constraint_parsing.py b/src/test/python/apache/aurora/config/test_constraint_parsing.py
index ac105c3..e1e7763 100644
--- a/src/test/python/apache/aurora/config/test_constraint_parsing.py
+++ b/src/test/python/apache/aurora/config/test_constraint_parsing.py
@@ -1,7 +1,7 @@
import pytest
import unittest
-from twitter.aurora.config.thrift import constraints_to_thrift
+from apache.aurora.config.thrift import constraints_to_thrift
def test_parsing_constraints():
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/config/test_loader.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/config/test_loader.py b/src/test/python/apache/aurora/config/test_loader.py
index b92981a..7c05c87 100644
--- a/src/test/python/apache/aurora/config/test_loader.py
+++ b/src/test/python/apache/aurora/config/test_loader.py
@@ -3,9 +3,9 @@ import tempfile
from twitter.common.contextutil import temporary_file
-from twitter.aurora.config import AuroraConfig
-from twitter.aurora.config.loader import AuroraConfigLoader
-from twitter.thermos.config.loader import ThermosTaskWrapper
+from apache.aurora.config import AuroraConfig
+from apache.aurora.config.loader import AuroraConfigLoader
+from apache.thermos.config.loader import ThermosTaskWrapper
from pystachio import Environment
import pytest
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/config/test_thrift.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/config/test_thrift.py b/src/test/python/apache/aurora/config/test_thrift.py
index f7f6b4f..494ed81 100644
--- a/src/test/python/apache/aurora/config/test_thrift.py
+++ b/src/test/python/apache/aurora/config/test_thrift.py
@@ -1,25 +1,25 @@
import getpass
import re
-from twitter.aurora.config import AuroraConfig
-from twitter.aurora.config.schema.base import Job, SimpleTask
-from twitter.aurora.config.thrift import (
+from apache.aurora.config import AuroraConfig
+from apache.aurora.config.schema.base import Job, SimpleTask
+from apache.aurora.config.thrift import (
convert as convert_pystachio_to_thrift,
InvalidConfig,
task_instance_from_job,
)
-from twitter.thermos.config.schema import (
+from apache.thermos.config.schema import (
Process,
Resources,
Task,
)
-from gen.twitter.aurora.constants import GOOD_IDENTIFIER_PATTERN_PYTHON
-from gen.twitter.aurora.test.constants import (
+from gen.apache.aurora.constants import GOOD_IDENTIFIER_PATTERN_PYTHON
+from gen.apache.aurora.test.constants import (
INVALID_IDENTIFIERS,
VALID_IDENTIFIERS,
)
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
CronCollisionPolicy,
JobKey,
Identity,
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/executor/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/BUILD b/src/test/python/apache/aurora/executor/BUILD
index 9316b64..b9d1318 100644
--- a/src/test/python/apache/aurora/executor/BUILD
+++ b/src/test/python/apache/aurora/executor/BUILD
@@ -7,24 +7,24 @@ python_test_suite(name = 'all',
# pants(':gc_executor'),
# pants(':thermos_executor'),
pants(':thermos_task_runner'),
- pants('src/test/python/twitter/aurora/executor/common:all'),
+ pants('src/test/python/apache/aurora/executor/common:all'),
]
)
python_tests(name = 'gc_executor',
sources = ['test_gc_executor.py'],
dependencies = [
- pants('src/main/python/twitter/aurora/BUILD.thirdparty:mock'),
+ pants('src/main/python/apache/aurora/BUILD.thirdparty:mock'),
pants('aurora/twitterdeps/src/python/twitter/common/app'),
pants('aurora/twitterdeps/src/python/twitter/common/concurrent'),
pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
pants('aurora/twitterdeps/src/python/twitter/common/testing'),
- pants('src/main/python/twitter/thermos/common:path'),
- pants('src/main/python/twitter/thermos/config'),
- pants('src/main/python/twitter/thermos/core:runner'),
- pants('src/main/thrift/com/twitter/thermos:py-thrift'),
- pants('src/main/python/twitter/aurora/executor:gc_executor'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+ pants('src/main/python/apache/thermos/common:path'),
+ pants('src/main/python/apache/thermos/config'),
+ pants('src/main/python/apache/thermos/core:runner'),
+ pants('src/main/thrift/org/apache/thermos:py-thrift'),
+ pants('src/main/python/apache/aurora/executor:gc_executor'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
],
coverage = 'twitter.mesos.executor.gc_executor'
)
@@ -34,7 +34,7 @@ python_tests(name = 'executor_detector',
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
pants('aurora/twitterdeps/src/python/twitter/common/dirutil'),
- pants('src/main/python/twitter/aurora/executor:executor_detector')
+ pants('src/main/python/apache/aurora/executor:executor_detector')
]
)
@@ -45,17 +45,17 @@ python_tests(name = 'thermos_executor',
pants('aurora/twitterdeps/src/python/twitter/common/app'),
pants('aurora/twitterdeps/src/python/twitter/common/exceptions'),
pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
- pants('src/main/python/twitter/thermos/common'),
- pants('src/main/python/twitter/thermos/core'),
- pants('src/main/python/twitter/thermos/monitoring:monitor'),
- pants('src/main/python/twitter/aurora/config:schema'),
- pants('src/main/python/twitter/aurora/executor/common:executor_timeout'),
- pants('src/main/python/twitter/aurora/executor/common:health_checker'),
- pants('src/main/python/twitter/aurora/executor/common:sandbox'),
- pants('src/main/python/twitter/aurora/executor/common:task_runner'),
- pants('src/main/python/twitter/aurora/executor:thermos_executor'),
- pants('src/main/python/twitter/aurora/executor:thermos_task_runner'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+ pants('src/main/python/apache/thermos/common'),
+ pants('src/main/python/apache/thermos/core'),
+ pants('src/main/python/apache/thermos/monitoring:monitor'),
+ pants('src/main/python/apache/aurora/config:schema'),
+ pants('src/main/python/apache/aurora/executor/common:executor_timeout'),
+ pants('src/main/python/apache/aurora/executor/common:health_checker'),
+ pants('src/main/python/apache/aurora/executor/common:sandbox'),
+ pants('src/main/python/apache/aurora/executor/common:task_runner'),
+ pants('src/main/python/apache/aurora/executor:thermos_executor'),
+ pants('src/main/python/apache/aurora/executor:thermos_task_runner'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
]
)
@@ -66,10 +66,10 @@ python_tests(name = 'thermos_task_runner',
pants('aurora/twitterdeps/src/python/twitter/common/dirutil'),
pants('aurora/twitterdeps/src/python/twitter/common/log'),
pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
- pants('src/main/python/twitter/aurora/config:schema'),
- pants('src/main/python/twitter/aurora/executor/common:sandbox'),
- pants('src/main/python/twitter/aurora/executor/common:status_checker'),
- pants('src/main/python/twitter/aurora/executor:thermos_task_runner'),
+ pants('src/main/python/apache/aurora/config:schema'),
+ pants('src/main/python/apache/aurora/executor/common:sandbox'),
+ pants('src/main/python/apache/aurora/executor/common:status_checker'),
+ pants('src/main/python/apache/aurora/executor:thermos_task_runner'),
]
)
@@ -77,7 +77,7 @@ python_tests(name = 'executor_vars',
sources = ['test_executor_vars.py'],
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
- pants('src/main/python/twitter/aurora/executor:executor_vars'),
+ pants('src/main/python/apache/aurora/executor:executor_vars'),
]
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/executor/common/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/common/BUILD b/src/test/python/apache/aurora/executor/common/BUILD
index 88db9a6..bece036 100644
--- a/src/test/python/apache/aurora/executor/common/BUILD
+++ b/src/test/python/apache/aurora/executor/common/BUILD
@@ -12,9 +12,9 @@ python_tests(
name = 'directory_sandbox',
sources = ['test_directory_sandbox.py'],
dependencies = [
- pants('src/main/python/twitter/aurora/BUILD.thirdparty:mock'),
+ pants('src/main/python/apache/aurora/BUILD.thirdparty:mock'),
pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
- pants('src/main/python/twitter/aurora/executor/common:sandbox'),
+ pants('src/main/python/apache/aurora/executor/common:sandbox'),
],
)
@@ -22,9 +22,9 @@ python_tests(
name = 'health_checker',
sources = ['test_health_checker.py'],
dependencies = [
- pants('src/main/python/twitter/aurora/BUILD.thirdparty:mox'),
+ pants('src/main/python/apache/aurora/BUILD.thirdparty:mox'),
pants('aurora/twitterdeps/src/python/twitter/common/testing'),
- pants('src/main/python/twitter/aurora/executor/common:health_checker'),
+ pants('src/main/python/apache/aurora/executor/common:health_checker'),
]
)
@@ -32,7 +32,7 @@ python_tests(
name = 'status_checker',
sources = ['test_status_checker.py'],
dependencies = [
- pants('src/main/python/twitter/aurora/executor/common:status_checker'),
+ pants('src/main/python/apache/aurora/executor/common:status_checker'),
]
)
@@ -40,8 +40,8 @@ python_tests(
name = 'task_info',
sources = ['test_task_info.py'],
dependencies = [
- pants('src/main/python/twitter/aurora/executor/common:task_info'),
- pants('src/main/python/twitter/aurora/config/schema'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+ pants('src/main/python/apache/aurora/executor/common:task_info'),
+ pants('src/main/python/apache/aurora/config/schema'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
]
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/executor/common/test_directory_sandbox.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/common/test_directory_sandbox.py b/src/test/python/apache/aurora/executor/common/test_directory_sandbox.py
index c7b75de..513e722 100644
--- a/src/test/python/apache/aurora/executor/common/test_directory_sandbox.py
+++ b/src/test/python/apache/aurora/executor/common/test_directory_sandbox.py
@@ -1,6 +1,6 @@
import os
-from twitter.aurora.executor.common.sandbox import DirectorySandbox
+from apache.aurora.executor.common.sandbox import DirectorySandbox
from twitter.common.contextutil import temporary_dir
import mock
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/executor/common/test_health_checker.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/common/test_health_checker.py b/src/test/python/apache/aurora/executor/common/test_health_checker.py
index a784958..23457c8 100644
--- a/src/test/python/apache/aurora/executor/common/test_health_checker.py
+++ b/src/test/python/apache/aurora/executor/common/test_health_checker.py
@@ -3,7 +3,7 @@ import unittest
from twitter.common.testing.clock import ThreadedClock
-from twitter.aurora.executor.common.health_checker import HealthCheckerThread
+from apache.aurora.executor.common.health_checker import HealthCheckerThread
import mox
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/executor/common/test_status_checker.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/common/test_status_checker.py b/src/test/python/apache/aurora/executor/common/test_status_checker.py
index 7d269f7..d463139 100644
--- a/src/test/python/apache/aurora/executor/common/test_status_checker.py
+++ b/src/test/python/apache/aurora/executor/common/test_status_checker.py
@@ -1,6 +1,6 @@
import threading
-from twitter.aurora.executor.common.status_checker import (
+from apache.aurora.executor.common.status_checker import (
ChainedStatusChecker,
ExitState,
Healthy,
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/executor/common/test_task_info.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/common/test_task_info.py b/src/test/python/apache/aurora/executor/common/test_task_info.py
index 76fae05..1523ee7 100644
--- a/src/test/python/apache/aurora/executor/common/test_task_info.py
+++ b/src/test/python/apache/aurora/executor/common/test_task_info.py
@@ -1,6 +1,6 @@
import getpass
-from twitter.aurora.config.schema.base import (
+from apache.aurora.config.schema.base import (
MB,
MesosJob,
MesosTaskInstance,
@@ -8,9 +8,9 @@ from twitter.aurora.config.schema.base import (
Resources,
Task,
)
-from twitter.aurora.executor.common.task_info import mesos_task_instance_from_assigned_task
+from apache.aurora.executor.common.task_info import mesos_task_instance_from_assigned_task
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
AssignedTask,
ExecutorConfig,
TaskConfig,
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/executor/test_executor_builds.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/test_executor_builds.py b/src/test/python/apache/aurora/executor/test_executor_builds.py
index cd119f4..a5db8af 100644
--- a/src/test/python/apache/aurora/executor/test_executor_builds.py
+++ b/src/test/python/apache/aurora/executor/test_executor_builds.py
@@ -12,10 +12,10 @@ def build_and_execute_pex_target(target, binary):
def test_thermos_executor_build():
- build_and_execute_pex_target('src/main/python/twitter/aurora/executor/bin:thermos_executor',
+ build_and_execute_pex_target('src/main/python/apache/aurora/executor/bin:thermos_executor',
'dist/thermos_executor.pex')
def test_gc_executor_build():
- build_and_execute_pex_target('src/main/python/twitter/aurora/executor/bin:gc_executor',
+ build_and_execute_pex_target('src/main/python/apache/aurora/executor/bin:gc_executor',
'dist/gc_executor.pex')
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/executor/test_executor_detector.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/test_executor_detector.py b/src/test/python/apache/aurora/executor/test_executor_detector.py
index 0a3343b..81158e3 100644
--- a/src/test/python/apache/aurora/executor/test_executor_detector.py
+++ b/src/test/python/apache/aurora/executor/test_executor_detector.py
@@ -1,7 +1,7 @@
import itertools
import os
-from twitter.aurora.executor.executor_detector import ExecutorDetector
+from apache.aurora.executor.executor_detector import ExecutorDetector
from twitter.common.contextutil import temporary_dir
from twitter.common.dirutil import safe_mkdir
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/executor/test_executor_vars.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/test_executor_vars.py b/src/test/python/apache/aurora/executor/test_executor_vars.py
index 2414ab5..e81ffa8 100644
--- a/src/test/python/apache/aurora/executor/test_executor_vars.py
+++ b/src/test/python/apache/aurora/executor/test_executor_vars.py
@@ -1,6 +1,6 @@
from twitter.common.contextutil import temporary_file, open_zip
-from twitter.aurora.executor.executor_vars import ExecutorVars
+from apache.aurora.executor.executor_vars import ExecutorVars
def test_release_from_tag():
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/executor/test_gc_executor.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/test_gc_executor.py b/src/test/python/apache/aurora/executor/test_gc_executor.py
index 6539904..0a2fa35 100644
--- a/src/test/python/apache/aurora/executor/test_gc_executor.py
+++ b/src/test/python/apache/aurora/executor/test_gc_executor.py
@@ -8,20 +8,20 @@ import threading
import time
import unittest
-from twitter.aurora.executor.gc_executor import ThermosGCExecutor
+from apache.aurora.executor.gc_executor import ThermosGCExecutor
from twitter.common.concurrent import deadline, Timeout
from twitter.common.contextutil import temporary_dir
from twitter.common.dirutil import safe_rmtree
from twitter.common.quantity import Amount, Time
from twitter.common.testing.clock import ThreadedClock
-from twitter.thermos.common.path import TaskPath
-from twitter.thermos.config.schema import SimpleTask
-from twitter.thermos.core.runner import TaskRunner
+from apache.thermos.common.path import TaskPath
+from apache.thermos.config.schema import SimpleTask
+from apache.thermos.core.runner import TaskRunner
-from gen.twitter.aurora.comm.ttypes import AdjustRetainedTasks, SchedulerMessage
-from gen.twitter.aurora.constants import LIVE_STATES, TERMINAL_STATES
-from gen.twitter.aurora.ttypes import ScheduleStatus
-from gen.twitter.thermos.ttypes import ProcessState, TaskState
+from gen.apache.aurora.comm.ttypes import AdjustRetainedTasks, SchedulerMessage
+from gen.apache.aurora.constants import LIVE_STATES, TERMINAL_STATES
+from gen.apache.aurora.ttypes import ScheduleStatus
+from gen.apache.thermos.ttypes import ProcessState, TaskState
import mock
from thrift.TSerialization import serialize as thrift_serialize
@@ -66,7 +66,7 @@ def setup_tree(td, lose=False):
safe_rmtree(td)
# TODO(wickman) These should be referred as resources= in the python_target instead.
- shutil.copytree('src/resources/com/twitter/thermos/root', td)
+ shutil.copytree('src/resources/org/apache/thermos/root', td)
if lose:
lost_age = time.time() - (
@@ -544,7 +544,7 @@ def test_gc_lifetime():
assert not executor._stop_event.is_set()
-DIRECTORY_SANDBOX = 'twitter.aurora.executor.gc_executor.DirectorySandbox'
+DIRECTORY_SANDBOX = 'apache.aurora.executor.gc_executor.DirectorySandbox'
class TestRealGC(unittest.TestCase):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/executor/test_thermos_executor.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/test_thermos_executor.py b/src/test/python/apache/aurora/executor/test_thermos_executor.py
index bd61545..2166c9a 100644
--- a/src/test/python/apache/aurora/executor/test_thermos_executor.py
+++ b/src/test/python/apache/aurora/executor/test_thermos_executor.py
@@ -8,7 +8,7 @@ import tempfile
import threading
import time
-from twitter.aurora.config.schema.base import (
+from apache.aurora.config.schema.base import (
HealthCheckConfig,
MB,
MesosJob,
@@ -17,28 +17,28 @@ from twitter.aurora.config.schema.base import (
Resources,
Task,
)
-from twitter.aurora.executor.common.executor_timeout import ExecutorTimeout
-from twitter.aurora.executor.common.health_checker import HealthCheckerProvider
-from twitter.aurora.executor.common.sandbox import DirectorySandbox, SandboxProvider
-from twitter.aurora.executor.common.task_runner import TaskError
-from twitter.aurora.executor.status_manager import StatusManager
-from twitter.aurora.executor.thermos_task_runner import (
+from apache.aurora.executor.common.executor_timeout import ExecutorTimeout
+from apache.aurora.executor.common.health_checker import HealthCheckerProvider
+from apache.aurora.executor.common.sandbox import DirectorySandbox, SandboxProvider
+from apache.aurora.executor.common.task_runner import TaskError
+from apache.aurora.executor.status_manager import StatusManager
+from apache.aurora.executor.thermos_task_runner import (
DefaultThermosTaskRunnerProvider,
ThermosTaskRunner,
)
-from twitter.aurora.executor.thermos_executor import ThermosExecutor
+from apache.aurora.executor.thermos_executor import ThermosExecutor
from twitter.common import log
from twitter.common.contextutil import temporary_dir
from twitter.common.dirutil import safe_mkdtemp, safe_rmtree
from twitter.common.exceptions import ExceptionalThread
from twitter.common.log.options import LogOptions
from twitter.common.quantity import Amount, Time
-from twitter.thermos.common.path import TaskPath
-from twitter.thermos.core.runner import TaskRunner
-from twitter.thermos.monitoring.monitor import TaskMonitor
+from apache.thermos.common.path import TaskPath
+from apache.thermos.core.runner import TaskRunner
+from apache.thermos.monitoring.monitor import TaskMonitor
-from gen.twitter.aurora.constants import AURORA_EXECUTOR_NAME
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.constants import AURORA_EXECUTOR_NAME
+from gen.apache.aurora.ttypes import (
AssignedTask,
ExecutorConfig,
Identity,
@@ -251,7 +251,7 @@ class TestThermosExecutor(object):
log.init('executor_logger')
if not cls.PANTS_BUILT and 'SKIP_PANTS_BUILD' not in os.environ:
assert subprocess.call(["./pants",
- "src/main/python/twitter/aurora/executor/bin:thermos_runner"]) == 0
+ "src/main/python/apache/aurora/executor/bin:thermos_runner"]) == 0
cls.PANTS_BUILT = True
@classmethod
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/executor/test_thermos_task_runner.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/test_thermos_task_runner.py b/src/test/python/apache/aurora/executor/test_thermos_task_runner.py
index 42163d3..eb0eb7b 100644
--- a/src/test/python/apache/aurora/executor/test_thermos_task_runner.py
+++ b/src/test/python/apache/aurora/executor/test_thermos_task_runner.py
@@ -6,16 +6,16 @@ import sys
import tempfile
import time
-from twitter.aurora.config.schema.base import (
+from apache.aurora.config.schema.base import (
MB,
MesosTaskInstance,
Process,
Resources,
Task,
)
-from twitter.aurora.executor.common.sandbox import DirectorySandbox
-from twitter.aurora.executor.common.status_checker import ExitState
-from twitter.aurora.executor.thermos_task_runner import ThermosTaskRunner
+from apache.aurora.executor.common.sandbox import DirectorySandbox
+from apache.aurora.executor.common.status_checker import ExitState
+from apache.aurora.executor.thermos_task_runner import ThermosTaskRunner
from twitter.common import log
from twitter.common.log.options import LogOptions
from twitter.common.dirutil import safe_rmtree
@@ -48,7 +48,7 @@ class TestThermosTaskRunnerIntegration(object):
log.init('executor_logger')
if not cls.PANTS_BUILT and 'SKIP_PANTS_BUILD' not in os.environ:
assert subprocess.call(["./pants",
- "src/main/python/twitter/aurora/executor/bin:thermos_runner"]) == 0
+ "src/main/python/apache/aurora/executor/bin:thermos_runner"]) == 0
cls.PANTS_BUILT = True
@classmethod
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/BUILD b/src/test/python/apache/thermos/BUILD
index 92f41da..38c2f4b 100644
--- a/src/test/python/apache/thermos/BUILD
+++ b/src/test/python/apache/thermos/BUILD
@@ -1,9 +1,9 @@
python_test_suite(
name = 'all',
dependencies = [
- pants('src/test/python/twitter/thermos/common:all'),
- pants('src/test/python/twitter/thermos/config:all'),
- pants('src/test/python/twitter/thermos/core:all'),
- pants('src/test/python/twitter/thermos/monitoring:all'),
+ pants('src/test/python/apache/thermos/common:all'),
+ pants('src/test/python/apache/thermos/config:all'),
+ pants('src/test/python/apache/thermos/core:all'),
+ pants('src/test/python/apache/thermos/monitoring:all'),
]
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/common/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/common/BUILD b/src/test/python/apache/thermos/common/BUILD
index 832067f..04de70c 100644
--- a/src/test/python/apache/thermos/common/BUILD
+++ b/src/test/python/apache/thermos/common/BUILD
@@ -9,24 +9,24 @@ python_test_suite(name = 'all',
python_tests(name = 'test_pathspec',
sources = ['test_pathspec.py'],
dependencies = [
- pants('src/main/python/twitter/thermos/common:path'),
+ pants('src/main/python/apache/thermos/common:path'),
],
- coverage = 'twitter.thermos.base.path'
+ coverage = 'apache.thermos.base.path'
)
python_tests(name = 'test_planner',
sources = ['test_planner.py'],
dependencies = [
- pants('src/main/python/twitter/thermos/common:planner'),
+ pants('src/main/python/apache/thermos/common:planner'),
],
- coverage = 'twitter.thermos.base.planner'
+ coverage = 'apache.thermos.base.planner'
)
python_tests(name = 'test_task_planner',
sources = ['test_task_planner.py'],
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/testing'),
- pants('src/main/python/twitter/thermos/common:planner'),
- pants('src/main/python/twitter/thermos/config:schema'),
+ pants('src/main/python/apache/thermos/common:planner'),
+ pants('src/main/python/apache/thermos/config:schema'),
],
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/common/test_pathspec.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/common/test_pathspec.py b/src/test/python/apache/thermos/common/test_pathspec.py
index 105d9e9..275004c 100644
--- a/src/test/python/apache/thermos/common/test_pathspec.py
+++ b/src/test/python/apache/thermos/common/test_pathspec.py
@@ -1,6 +1,6 @@
import os
-from twitter.thermos.common.path import TaskPath
+from apache.thermos.common.path import TaskPath
def test_legacy_task_roots():
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/common/test_planner.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/common/test_planner.py b/src/test/python/apache/thermos/common/test_planner.py
index 8fc7d46..879cf29 100644
--- a/src/test/python/apache/thermos/common/test_planner.py
+++ b/src/test/python/apache/thermos/common/test_planner.py
@@ -1,5 +1,5 @@
import pytest
-from twitter.thermos.common.planner import Planner
+from apache.thermos.common.planner import Planner
def details(planner):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/common/test_task_planner.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/common/test_task_planner.py b/src/test/python/apache/thermos/common/test_task_planner.py
index 59bdc08..0c5b9fb 100644
--- a/src/test/python/apache/thermos/common/test_task_planner.py
+++ b/src/test/python/apache/thermos/common/test_task_planner.py
@@ -1,7 +1,7 @@
import pytest
from twitter.common.testing.clock import ThreadedClock
-from twitter.thermos.common.planner import TaskPlanner
-from twitter.thermos.config.schema import *
+from apache.thermos.common.planner import TaskPlanner
+from apache.thermos.config.schema import *
p1 = Process(name = "p1", cmdline = "")
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/config/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/config/BUILD b/src/test/python/apache/thermos/config/BUILD
index b80277c..5ff96ea 100644
--- a/src/test/python/apache/thermos/config/BUILD
+++ b/src/test/python/apache/thermos/config/BUILD
@@ -8,6 +8,6 @@ python_tests(name = 'test_schema',
sources = ['test_schema.py'],
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/collections'),
- pants('src/main/python/twitter/thermos/config:schema')
+ pants('src/main/python/apache/thermos/config:schema')
]
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/config/test_schema.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/config/test_schema.py b/src/test/python/apache/thermos/config/test_schema.py
index c1ae00d..1d99f6e 100644
--- a/src/test/python/apache/thermos/config/test_schema.py
+++ b/src/test/python/apache/thermos/config/test_schema.py
@@ -1,7 +1,7 @@
import pytest
from twitter.common.collections import OrderedDict
-from twitter.thermos.config.schema import (
+from apache.thermos.config.schema import (
Constraint,
List,
Process,
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/core/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/core/BUILD b/src/test/python/apache/thermos/core/BUILD
index fd0487d..8cfbe83 100644
--- a/src/test/python/apache/thermos/core/BUILD
+++ b/src/test/python/apache/thermos/core/BUILD
@@ -33,14 +33,14 @@ python_test_suite(name = 'large',
python_tests(name = 'test_runner_integration',
sources = ['test_runner_integration.py'],
dependencies = [
- pants('src/main/python/twitter/thermos/testing:runner'),
+ pants('src/main/python/apache/thermos/testing:runner'),
],
)
python_tests(name = 'test_angry',
sources = ['test_angry.py'],
dependencies = [
- pants('src/main/python/twitter/thermos/testing:runner'),
+ pants('src/main/python/apache/thermos/testing:runner'),
],
timeout = Amount(5, Time.MINUTES)
)
@@ -48,45 +48,45 @@ python_tests(name = 'test_angry',
python_tests(name = 'test_ephemerals',
sources = ['test_ephemerals.py'],
dependencies = [
- pants('src/main/python/twitter/thermos/testing:runner'),
+ pants('src/main/python/apache/thermos/testing:runner'),
],
)
python_tests(name = 'test_failing_runner',
sources = ['test_failing_runner.py'],
dependencies = [
- pants('src/main/python/twitter/thermos/testing:runner'),
+ pants('src/main/python/apache/thermos/testing:runner'),
],
)
python_tests(name = 'test_finalization',
sources = ['test_finalization.py'],
dependencies = [
- pants('src/main/python/twitter/thermos/testing:runner'),
+ pants('src/main/python/apache/thermos/testing:runner'),
],
)
python_tests(name = 'test_failure_limit',
sources = ['test_failure_limit.py'],
dependencies = [
- pants('src/main/python/twitter/thermos/testing:runner'),
+ pants('src/main/python/apache/thermos/testing:runner'),
],
)
python_tests(name = 'test_helper',
sources = ['test_helper.py'],
dependencies = [
- pants('src/main/python/twitter/thermos/BUILD.thirdparty:mock'),
- pants('src/main/python/twitter/thermos/BUILD.thirdparty:psutil'),
- pants('src/main/python/twitter/thermos/core:helper'),
+ pants('src/main/python/apache/thermos/BUILD.thirdparty:mock'),
+ pants('src/main/python/apache/thermos/BUILD.thirdparty:psutil'),
+ pants('src/main/python/apache/thermos/core:helper'),
]
)
python_tests(name = 'test_process',
sources = ['test_process.py'],
dependencies = [
- pants('src/main/python/twitter/thermos/BUILD.thirdparty:mock'),
- pants('src/main/python/twitter/thermos/testing:runner'),
+ pants('src/main/python/apache/thermos/BUILD.thirdparty:mock'),
+ pants('src/main/python/apache/thermos/testing:runner'),
pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
],
)
@@ -94,8 +94,8 @@ python_tests(name = 'test_process',
python_tests(name = 'test_staged_kill',
sources = ['test_staged_kill.py'],
dependencies = [
- pants('src/main/python/twitter/thermos/testing:runner'),
+ pants('src/main/python/apache/thermos/testing:runner'),
pants('aurora/twitterdeps/src/python/twitter/common/process'),
- pants('src/main/python/twitter/thermos/monitoring:monitor'),
+ pants('src/main/python/apache/thermos/monitoring:monitor'),
]
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/core/test_angry.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/core/test_angry.py b/src/test/python/apache/thermos/core/test_angry.py
index a91bafb..fbe457c 100644
--- a/src/test/python/apache/thermos/core/test_angry.py
+++ b/src/test/python/apache/thermos/core/test_angry.py
@@ -1,8 +1,8 @@
import random
-from twitter.thermos.config.schema import Task, Process
-from twitter.thermos.testing.runner import Runner
-from gen.twitter.thermos.ttypes import TaskState, ProcessState
+from apache.thermos.config.schema import Task, Process
+from apache.thermos.testing.runner import Runner
+from gen.apache.thermos.ttypes import TaskState, ProcessState
def flaky_task():
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/core/test_ephemerals.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/core/test_ephemerals.py b/src/test/python/apache/thermos/core/test_ephemerals.py
index ca8353b..f8339dc 100644
--- a/src/test/python/apache/thermos/core/test_ephemerals.py
+++ b/src/test/python/apache/thermos/core/test_ephemerals.py
@@ -1,9 +1,9 @@
-from twitter.thermos.config.schema import (
+from apache.thermos.config.schema import (
Task,
Resources,
Process)
-from twitter.thermos.testing.runner import RunnerTestBase
-from gen.twitter.thermos.ttypes import (
+from apache.thermos.testing.runner import RunnerTestBase
+from gen.apache.thermos.ttypes import (
TaskState,
ProcessState
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/core/test_failing_runner.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/core/test_failing_runner.py b/src/test/python/apache/thermos/core/test_failing_runner.py
index 3a69daa..2d6f7b3 100644
--- a/src/test/python/apache/thermos/core/test_failing_runner.py
+++ b/src/test/python/apache/thermos/core/test_failing_runner.py
@@ -1,6 +1,6 @@
-from twitter.thermos.config.schema import Task, Resources, Process
-from twitter.thermos.testing.runner import RunnerTestBase
-from gen.twitter.thermos.ttypes import (
+from apache.thermos.config.schema import Task, Resources, Process
+from apache.thermos.testing.runner import RunnerTestBase
+from gen.apache.thermos.ttypes import (
TaskState,
ProcessState
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/core/test_failure_limit.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/core/test_failure_limit.py b/src/test/python/apache/thermos/core/test_failure_limit.py
index f983fe7..d79dd87 100644
--- a/src/test/python/apache/thermos/core/test_failure_limit.py
+++ b/src/test/python/apache/thermos/core/test_failure_limit.py
@@ -1,9 +1,9 @@
-from twitter.thermos.config.schema import (
+from apache.thermos.config.schema import (
Task,
Resources,
Process)
-from twitter.thermos.testing.runner import RunnerTestBase
-from gen.twitter.thermos.ttypes import (
+from apache.thermos.testing.runner import RunnerTestBase
+from gen.apache.thermos.ttypes import (
TaskState,
ProcessState
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/core/test_finalization.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/core/test_finalization.py b/src/test/python/apache/thermos/core/test_finalization.py
index 9a863cf..56576d7 100644
--- a/src/test/python/apache/thermos/core/test_finalization.py
+++ b/src/test/python/apache/thermos/core/test_finalization.py
@@ -1,10 +1,10 @@
-from twitter.thermos.config.schema import (
+from apache.thermos.config.schema import (
Constraint,
Process,
Task
)
-from twitter.thermos.testing.runner import RunnerTestBase
-from gen.twitter.thermos.ttypes import ProcessState, TaskState
+from apache.thermos.testing.runner import RunnerTestBase
+from gen.apache.thermos.ttypes import ProcessState, TaskState
class TestRegularFinalizingTask(RunnerTestBase):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/core/test_helper.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/core/test_helper.py b/src/test/python/apache/thermos/core/test_helper.py
index bdea9d3..c8d0916 100644
--- a/src/test/python/apache/thermos/core/test_helper.py
+++ b/src/test/python/apache/thermos/core/test_helper.py
@@ -1,9 +1,9 @@
import time
from twitter.common.quantity import Time
-from twitter.thermos.core.helper import TaskRunnerHelper as TRH
+from apache.thermos.core.helper import TaskRunnerHelper as TRH
-from gen.twitter.thermos.ttypes import (
+from gen.apache.thermos.ttypes import (
ProcessStatus,
RunnerHeader,
RunnerState,
@@ -44,7 +44,7 @@ def test_this_is_really_our_pid():
process.create_time - (TRH.MAX_START_TIME_DRIFT.as_(Time.SECONDS) + 1))
-TRH_PATH = 'twitter.thermos.core.helper.TaskRunnerHelper'
+TRH_PATH = 'apache.thermos.core.helper.TaskRunnerHelper'
PSUTIL_PATH = 'psutil.Process'
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/core/test_process.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/core/test_process.py b/src/test/python/apache/thermos/core/test_process.py
index 4216e9b..fcf26eb 100644
--- a/src/test/python/apache/thermos/core/test_process.py
+++ b/src/test/python/apache/thermos/core/test_process.py
@@ -9,10 +9,10 @@ from twitter.common.contextutil import temporary_dir
from twitter.common.dirutil import safe_mkdir
from twitter.common.recordio import ThriftRecordReader
-from twitter.thermos.common.path import TaskPath
-from twitter.thermos.core.process import Process
+from apache.thermos.common.path import TaskPath
+from apache.thermos.core.process import Process
-from gen.twitter.thermos.ttypes import RunnerCkpt
+from gen.apache.thermos.ttypes import RunnerCkpt
import mock
import pytest
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/core/test_runner_integration.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/core/test_runner_integration.py b/src/test/python/apache/thermos/core/test_runner_integration.py
index 67d9df3..f63cb84 100644
--- a/src/test/python/apache/thermos/core/test_runner_integration.py
+++ b/src/test/python/apache/thermos/core/test_runner_integration.py
@@ -1,7 +1,7 @@
import os
from textwrap import dedent
-from twitter.thermos.config.schema import (
+from apache.thermos.config.schema import (
order,
Process,
Resources,
@@ -9,9 +9,9 @@ from twitter.thermos.config.schema import (
Task,
Tasks,
)
-from twitter.thermos.testing.runner import RunnerTestBase
+from apache.thermos.testing.runner import RunnerTestBase
-from gen.twitter.thermos.ttypes import (
+from gen.apache.thermos.ttypes import (
TaskState,
ProcessState
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/core/test_staged_kill.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/core/test_staged_kill.py b/src/test/python/apache/thermos/core/test_staged_kill.py
index f0f1aa9..d2a207f 100644
--- a/src/test/python/apache/thermos/core/test_staged_kill.py
+++ b/src/test/python/apache/thermos/core/test_staged_kill.py
@@ -6,15 +6,15 @@ import time
from twitter.common.process import ProcessProviderFactory
from twitter.common.quantity import Amount, Time
-from twitter.thermos.config.schema import (
+from apache.thermos.config.schema import (
Task,
Resources,
Process)
-from twitter.thermos.core.runner import TaskRunner
-from twitter.thermos.monitoring.monitor import TaskMonitor
-from twitter.thermos.testing.runner import Runner
+from apache.thermos.core.runner import TaskRunner
+from apache.thermos.monitoring.monitor import TaskMonitor
+from apache.thermos.testing.runner import Runner
-from gen.twitter.thermos.ttypes import (
+from gen.apache.thermos.ttypes import (
TaskState,
ProcessState
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/monitoring/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/monitoring/BUILD b/src/test/python/apache/thermos/monitoring/BUILD
index 7b3bd82..1654e37 100644
--- a/src/test/python/apache/thermos/monitoring/BUILD
+++ b/src/test/python/apache/thermos/monitoring/BUILD
@@ -7,7 +7,7 @@ python_test_suite(name = 'all',
python_tests(name = 'test_disk',
sources = ['test_disk.py'],
dependencies = [
- pants('src/main/python/twitter/thermos/monitoring:disk'),
+ pants('src/main/python/apache/thermos/monitoring:disk'),
]
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/monitoring/test_disk.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/monitoring/test_disk.py b/src/test/python/apache/thermos/monitoring/test_disk.py
index 8506ad3..8ce3ea0 100644
--- a/src/test/python/apache/thermos/monitoring/test_disk.py
+++ b/src/test/python/apache/thermos/monitoring/test_disk.py
@@ -6,8 +6,8 @@ import sys
from twitter.common.quantity import Amount, Data, Time
from twitter.common.dirutil import safe_mkdtemp
-from twitter.thermos.monitoring.disk import DiskCollector
-from twitter.thermos.monitoring.disk import InotifyDiskCollector
+from apache.thermos.monitoring.disk import DiskCollector
+from apache.thermos.monitoring.disk import InotifyDiskCollector
import pytest
[8/9] Refactors java and python code to the Apache namespace.
Posted by wf...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/base/CommandUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/base/CommandUtil.java b/src/main/java/org/apache/aurora/scheduler/base/CommandUtil.java
index b11c683..8d76ffe 100644
--- a/src/main/java/org/apache/aurora/scheduler/base/CommandUtil.java
+++ b/src/main/java/org/apache/aurora/scheduler/base/CommandUtil.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.base;
+package org.apache.aurora.scheduler.base;
+
+import com.twitter.common.base.MorePreconditions;
import org.apache.mesos.Protos.CommandInfo;
import org.apache.mesos.Protos.CommandInfo.URI;
-import com.twitter.common.base.MorePreconditions;
-
/**
* Utility class for constructing {@link CommandInfo} objects given an executor URI.
*/
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/base/Conversions.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/base/Conversions.java b/src/main/java/org/apache/aurora/scheduler/base/Conversions.java
index 2f84b5c..ab4d4ec 100644
--- a/src/main/java/org/apache/aurora/scheduler/base/Conversions.java
+++ b/src/main/java/org/apache/aurora/scheduler/base/Conversions.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.base;
+package org.apache.aurora.scheduler.base;
import java.util.Collection;
import java.util.Map;
@@ -28,14 +28,14 @@ import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Multimap;
import com.google.common.collect.Multimaps;
+import org.apache.aurora.gen.Attribute;
+import org.apache.aurora.gen.HostAttributes;
+import org.apache.aurora.gen.ScheduleStatus;
+
import org.apache.mesos.Protos;
import org.apache.mesos.Protos.Offer;
import org.apache.mesos.Protos.TaskState;
-import com.twitter.aurora.gen.Attribute;
-import com.twitter.aurora.gen.HostAttributes;
-import com.twitter.aurora.gen.ScheduleStatus;
-
/**
* Collection of utility functions to convert mesos protobuf types to internal thrift types.
*/
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/base/JobKeys.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/base/JobKeys.java b/src/main/java/org/apache/aurora/scheduler/base/JobKeys.java
index 008e1cb..b7b5aa1 100644
--- a/src/main/java/org/apache/aurora/scheduler/base/JobKeys.java
+++ b/src/main/java/org/apache/aurora/scheduler/base/JobKeys.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.base;
+package org.apache.aurora.scheduler.base;
import javax.annotation.Nullable;
@@ -22,11 +22,11 @@ import com.google.common.base.Functions;
import com.google.common.base.Optional;
import com.google.common.base.Strings;
-import com.twitter.aurora.gen.JobKey;
-import com.twitter.aurora.gen.TaskQuery;
-import com.twitter.aurora.scheduler.storage.entities.IJobConfiguration;
-import com.twitter.aurora.scheduler.storage.entities.IJobKey;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
+import org.apache.aurora.gen.JobKey;
+import org.apache.aurora.gen.TaskQuery;
+import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
import static com.google.common.base.Preconditions.checkArgument;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/base/Numbers.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/base/Numbers.java b/src/main/java/org/apache/aurora/scheduler/base/Numbers.java
index 74b5e0b..3fa58ba 100644
--- a/src/main/java/org/apache/aurora/scheduler/base/Numbers.java
+++ b/src/main/java/org/apache/aurora/scheduler/base/Numbers.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.base;
+package org.apache.aurora.scheduler.base;
import java.util.Set;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/base/Query.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/base/Query.java b/src/main/java/org/apache/aurora/scheduler/base/Query.java
index d02ef87..8e0adba 100644
--- a/src/main/java/org/apache/aurora/scheduler/base/Query.java
+++ b/src/main/java/org/apache/aurora/scheduler/base/Query.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.base;
+package org.apache.aurora.scheduler.base;
import java.util.EnumSet;
@@ -23,11 +23,11 @@ import com.google.common.base.Supplier;
import com.google.common.collect.ImmutableSet;
import com.google.common.primitives.Ints;
-import com.twitter.aurora.gen.Identity;
-import com.twitter.aurora.gen.InstanceKey;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.TaskQuery;
-import com.twitter.aurora.scheduler.storage.entities.IJobKey;
+import org.apache.aurora.gen.Identity;
+import org.apache.aurora.gen.InstanceKey;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.TaskQuery;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
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/base/ScheduleException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/base/ScheduleException.java b/src/main/java/org/apache/aurora/scheduler/base/ScheduleException.java
index 0420ee9..16ce2d9 100644
--- a/src/main/java/org/apache/aurora/scheduler/base/ScheduleException.java
+++ b/src/main/java/org/apache/aurora/scheduler/base/ScheduleException.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.base;
+package org.apache.aurora.scheduler.base;
/**
* Exception class to signal a failure to schedule a task or job.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/base/SchedulerException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/base/SchedulerException.java b/src/main/java/org/apache/aurora/scheduler/base/SchedulerException.java
index a51c4e0..0b2eca8 100644
--- a/src/main/java/org/apache/aurora/scheduler/base/SchedulerException.java
+++ b/src/main/java/org/apache/aurora/scheduler/base/SchedulerException.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.base;
+package org.apache.aurora.scheduler.base;
/**
* Indicates some form of unexpected scheduler exception.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/base/Tasks.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/base/Tasks.java b/src/main/java/org/apache/aurora/scheduler/base/Tasks.java
index d98da3f..edfa3b2 100644
--- a/src/main/java/org/apache/aurora/scheduler/base/Tasks.java
+++ b/src/main/java/org/apache/aurora/scheduler/base/Tasks.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.base;
+package org.apache.aurora.scheduler.base;
import java.util.EnumSet;
import java.util.Map;
@@ -30,13 +30,13 @@ import com.google.common.collect.Multimap;
import com.google.common.collect.Multimaps;
import com.google.common.collect.Ordering;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.apiConstants;
-import com.twitter.aurora.scheduler.storage.entities.IAssignedTask;
-import com.twitter.aurora.scheduler.storage.entities.IJobKey;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.apiConstants;
+import org.apache.aurora.scheduler.storage.entities.IAssignedTask;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
/**
* Utility class providing convenience functions relating to tasks.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/configuration/ConfigurationManager.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/configuration/ConfigurationManager.java b/src/main/java/org/apache/aurora/scheduler/configuration/ConfigurationManager.java
index 4839d0f..b1489e6 100644
--- a/src/main/java/org/apache/aurora/scheduler/configuration/ConfigurationManager.java
+++ b/src/main/java/org/apache/aurora/scheduler/configuration/ConfigurationManager.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.configuration;
+package org.apache.aurora.scheduler.configuration;
import java.util.regex.Pattern;
@@ -29,26 +29,27 @@ import com.google.common.collect.Iterables;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
-import org.apache.commons.lang.StringUtils;
-
-import com.twitter.aurora.gen.Constraint;
-import com.twitter.aurora.gen.JobConfiguration;
-import com.twitter.aurora.gen.LimitConstraint;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.gen.TaskConfig._Fields;
-import com.twitter.aurora.gen.TaskConstraint;
-import com.twitter.aurora.scheduler.base.JobKeys;
-import com.twitter.aurora.scheduler.storage.entities.IConstraint;
-import com.twitter.aurora.scheduler.storage.entities.IIdentity;
-import com.twitter.aurora.scheduler.storage.entities.IJobConfiguration;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConstraint;
-import com.twitter.aurora.scheduler.storage.entities.IValueConstraint;
import com.twitter.common.base.Closure;
import com.twitter.common.base.MorePreconditions;
-import static com.twitter.aurora.gen.apiConstants.DEFAULT_ENVIRONMENT;
-import static com.twitter.aurora.gen.apiConstants.GOOD_IDENTIFIER_PATTERN_JVM;
+import org.apache.aurora.gen.Constraint;
+import org.apache.aurora.gen.JobConfiguration;
+import org.apache.aurora.gen.LimitConstraint;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.gen.TaskConfig._Fields;
+import org.apache.aurora.gen.TaskConstraint;
+import org.apache.aurora.scheduler.base.JobKeys;
+import org.apache.aurora.scheduler.storage.entities.IConstraint;
+import org.apache.aurora.scheduler.storage.entities.IIdentity;
+import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
+import org.apache.aurora.scheduler.storage.entities.ITaskConstraint;
+import org.apache.aurora.scheduler.storage.entities.IValueConstraint;
+
+import org.apache.commons.lang.StringUtils;
+
+import static org.apache.aurora.gen.apiConstants.DEFAULT_ENVIRONMENT;
+import static org.apache.aurora.gen.apiConstants.GOOD_IDENTIFIER_PATTERN_JVM;
/**
* Manages translation from a string-mapped configuration to a concrete configuration type, and
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/configuration/Resources.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/configuration/Resources.java b/src/main/java/org/apache/aurora/scheduler/configuration/Resources.java
index 51e9973..3641465 100644
--- a/src/main/java/org/apache/aurora/scheduler/configuration/Resources.java
+++ b/src/main/java/org/apache/aurora/scheduler/configuration/Resources.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.configuration;
+package org.apache.aurora.scheduler.configuration;
import java.util.Collections;
import java.util.List;
@@ -33,7 +33,14 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Ordering;
import com.google.common.collect.Sets;
+import com.twitter.common.quantity.Amount;
+import com.twitter.common.quantity.Data;
+
+import org.apache.aurora.scheduler.base.Numbers;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
+
import org.apache.commons.lang.builder.EqualsBuilder;
+
import org.apache.mesos.Protos.Offer;
import org.apache.mesos.Protos.Resource;
import org.apache.mesos.Protos.Value.Range;
@@ -41,11 +48,6 @@ import org.apache.mesos.Protos.Value.Ranges;
import org.apache.mesos.Protos.Value.Scalar;
import org.apache.mesos.Protos.Value.Type;
-import com.twitter.aurora.scheduler.base.Numbers;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
-import com.twitter.common.quantity.Amount;
-import com.twitter.common.quantity.Data;
-
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/configuration/SanitizedConfiguration.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/configuration/SanitizedConfiguration.java b/src/main/java/org/apache/aurora/scheduler/configuration/SanitizedConfiguration.java
index 890acbb..2353915 100644
--- a/src/main/java/org/apache/aurora/scheduler/configuration/SanitizedConfiguration.java
+++ b/src/main/java/org/apache/aurora/scheduler/configuration/SanitizedConfiguration.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.configuration;
+package org.apache.aurora.scheduler.configuration;
import java.util.Map;
@@ -25,9 +25,9 @@ import com.google.common.collect.DiscreteDomain;
import com.google.common.collect.Maps;
import com.google.common.collect.Range;
-import com.twitter.aurora.scheduler.configuration.ConfigurationManager.TaskDescriptionException;
-import com.twitter.aurora.scheduler.storage.entities.IJobConfiguration;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
+import org.apache.aurora.scheduler.configuration.ConfigurationManager.TaskDescriptionException;
+import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
/**
* Wrapper for a configuration that has been fully-sanitized and populated with defaults.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/cron/CronException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/cron/CronException.java b/src/main/java/org/apache/aurora/scheduler/cron/CronException.java
index c29a578..28b551d 100644
--- a/src/main/java/org/apache/aurora/scheduler/cron/CronException.java
+++ b/src/main/java/org/apache/aurora/scheduler/cron/CronException.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.cron;
+package org.apache.aurora.scheduler.cron;
/**
* Exception class to signal a failure in the underlying cron implementation.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/cron/CronPredictor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/cron/CronPredictor.java b/src/main/java/org/apache/aurora/scheduler/cron/CronPredictor.java
index d01e2f8..9804b68 100644
--- a/src/main/java/org/apache/aurora/scheduler/cron/CronPredictor.java
+++ b/src/main/java/org/apache/aurora/scheduler/cron/CronPredictor.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.cron;
+package org.apache.aurora.scheduler.cron;
import java.util.Date;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/cron/CronScheduler.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/cron/CronScheduler.java b/src/main/java/org/apache/aurora/scheduler/cron/CronScheduler.java
index 0ea9b65..72504ab 100644
--- a/src/main/java/org/apache/aurora/scheduler/cron/CronScheduler.java
+++ b/src/main/java/org/apache/aurora/scheduler/cron/CronScheduler.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.cron;
+package org.apache.aurora.scheduler.cron;
import javax.annotation.Nullable;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/cron/noop/NoopCronModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/cron/noop/NoopCronModule.java b/src/main/java/org/apache/aurora/scheduler/cron/noop/NoopCronModule.java
index d1c5419..3541600 100644
--- a/src/main/java/org/apache/aurora/scheduler/cron/noop/NoopCronModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/cron/noop/NoopCronModule.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.cron.noop;
+package org.apache.aurora.scheduler.cron.noop;
import javax.inject.Singleton;
import com.google.inject.AbstractModule;
-import com.twitter.aurora.scheduler.cron.CronPredictor;
-import com.twitter.aurora.scheduler.cron.CronScheduler;
+import org.apache.aurora.scheduler.cron.CronPredictor;
+import org.apache.aurora.scheduler.cron.CronScheduler;
/**
* A Module to wire up a cron scheduler that does not actually schedule cron jobs.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/cron/noop/NoopCronPredictor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/cron/noop/NoopCronPredictor.java b/src/main/java/org/apache/aurora/scheduler/cron/noop/NoopCronPredictor.java
index a779d2b..c2fb899 100644
--- a/src/main/java/org/apache/aurora/scheduler/cron/noop/NoopCronPredictor.java
+++ b/src/main/java/org/apache/aurora/scheduler/cron/noop/NoopCronPredictor.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.cron.noop;
+package org.apache.aurora.scheduler.cron.noop;
import java.util.Date;
-import com.twitter.aurora.scheduler.cron.CronPredictor;
+import org.apache.aurora.scheduler.cron.CronPredictor;
/**
* A cron predictor that always suggests that the next run is Unix epoch time.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/cron/noop/NoopCronScheduler.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/cron/noop/NoopCronScheduler.java b/src/main/java/org/apache/aurora/scheduler/cron/noop/NoopCronScheduler.java
index 2893a6a..6a99652 100644
--- a/src/main/java/org/apache/aurora/scheduler/cron/noop/NoopCronScheduler.java
+++ b/src/main/java/org/apache/aurora/scheduler/cron/noop/NoopCronScheduler.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.cron.noop;
+package org.apache.aurora.scheduler.cron.noop;
import java.util.Collections;
import java.util.Set;
@@ -24,8 +24,8 @@ import javax.annotation.Nullable;
import com.google.common.base.Optional;
import com.google.common.collect.Sets;
-import com.twitter.aurora.scheduler.cron.CronException;
-import com.twitter.aurora.scheduler.cron.CronScheduler;
+import org.apache.aurora.scheduler.cron.CronException;
+import org.apache.aurora.scheduler.cron.CronScheduler;
/**
* A cron scheduler that accepts cron jobs but never runs them. Useful if you want to hook up an
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/cron/testing/AbstractCronIT.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/cron/testing/AbstractCronIT.java b/src/main/java/org/apache/aurora/scheduler/cron/testing/AbstractCronIT.java
index 6bfc909..8ae2c47 100644
--- a/src/main/java/org/apache/aurora/scheduler/cron/testing/AbstractCronIT.java
+++ b/src/main/java/org/apache/aurora/scheduler/cron/testing/AbstractCronIT.java
@@ -13,20 +13,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.cron.testing;
+package org.apache.aurora.scheduler.cron.testing;
import java.util.concurrent.CountDownLatch;
+import com.twitter.common.testing.easymock.EasyMockTest;
+
+import org.apache.aurora.scheduler.cron.CronPredictor;
+import org.apache.aurora.scheduler.cron.CronScheduler;
+
import org.junit.Test;
-import com.twitter.aurora.scheduler.cron.CronPredictor;
-import com.twitter.aurora.scheduler.cron.CronScheduler;
-import com.twitter.common.testing.easymock.EasyMockTest;
+import static org.apache.aurora.gen.test.testConstants.VALID_CRON_SCHEDULES;
import static org.junit.Assert.assertTrue;
-import static com.twitter.aurora.gen.test.testConstants.VALID_CRON_SCHEDULES;
-
/**
* Abstract test to verify conformance with the {@link CronScheduler} interface.
*/
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/events/NotifyingMethodInterceptor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/events/NotifyingMethodInterceptor.java b/src/main/java/org/apache/aurora/scheduler/events/NotifyingMethodInterceptor.java
index 2656766..ec35d6d 100644
--- a/src/main/java/org/apache/aurora/scheduler/events/NotifyingMethodInterceptor.java
+++ b/src/main/java/org/apache/aurora/scheduler/events/NotifyingMethodInterceptor.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.events;
+package org.apache.aurora.scheduler.events;
import java.lang.reflect.Method;
import java.util.logging.Logger;
@@ -22,12 +22,13 @@ import javax.inject.Inject;
import com.google.common.base.Preconditions;
+import com.twitter.common.base.Closure;
+
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
-import com.twitter.aurora.scheduler.events.PubsubEvent.Interceptors.Event;
-import com.twitter.aurora.scheduler.events.PubsubEvent.Interceptors.SendNotification;
-import com.twitter.common.base.Closure;
+import org.apache.aurora.scheduler.events.PubsubEvent.Interceptors.Event;
+import org.apache.aurora.scheduler.events.PubsubEvent.Interceptors.SendNotification;
/**
* A method interceptor that sends pubsub notifications before and/or after a method annotated
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/events/NotifyingSchedulingFilter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/events/NotifyingSchedulingFilter.java b/src/main/java/org/apache/aurora/scheduler/events/NotifyingSchedulingFilter.java
index ffb952c..2337e72 100644
--- a/src/main/java/org/apache/aurora/scheduler/events/NotifyingSchedulingFilter.java
+++ b/src/main/java/org/apache/aurora/scheduler/events/NotifyingSchedulingFilter.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.events;
+package org.apache.aurora.scheduler.events;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
@@ -23,12 +23,13 @@ import javax.inject.Inject;
import com.google.inject.BindingAnnotation;
-import com.twitter.aurora.scheduler.ResourceSlot;
-import com.twitter.aurora.scheduler.events.PubsubEvent.Vetoed;
-import com.twitter.aurora.scheduler.filter.SchedulingFilter;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
import com.twitter.common.base.Closure;
+import org.apache.aurora.scheduler.ResourceSlot;
+import org.apache.aurora.scheduler.events.PubsubEvent.Vetoed;
+import org.apache.aurora.scheduler.filter.SchedulingFilter;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
+
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.PARAMETER;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/events/PubsubEvent.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/events/PubsubEvent.java b/src/main/java/org/apache/aurora/scheduler/events/PubsubEvent.java
index 400d8b7..0f93782 100644
--- a/src/main/java/org/apache/aurora/scheduler/events/PubsubEvent.java
+++ b/src/main/java/org/apache/aurora/scheduler/events/PubsubEvent.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.events;
+package org.apache.aurora.scheduler.events;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
@@ -21,11 +21,11 @@ import java.util.Set;
import com.google.common.base.Objects;
-import com.twitter.aurora.gen.HostStatus;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.scheduler.base.Tasks;
-import com.twitter.aurora.scheduler.filter.SchedulingFilter.Veto;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
+import org.apache.aurora.gen.HostStatus;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.scheduler.base.Tasks;
+import org.apache.aurora.scheduler.filter.SchedulingFilter.Veto;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
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/scheduler/events/PubsubEventModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/events/PubsubEventModule.java b/src/main/java/org/apache/aurora/scheduler/events/PubsubEventModule.java
index a8b5633..e686369 100644
--- a/src/main/java/org/apache/aurora/scheduler/events/PubsubEventModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/events/PubsubEventModule.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.events;
+package org.apache.aurora.scheduler.events;
import java.util.Set;
import java.util.logging.Logger;
@@ -31,16 +31,17 @@ import com.google.inject.TypeLiteral;
import com.google.inject.matcher.Matchers;
import com.google.inject.multibindings.Multibinder;
-import org.aopalliance.intercept.MethodInterceptor;
-
-import com.twitter.aurora.scheduler.events.NotifyingSchedulingFilter.NotifyDelegate;
-import com.twitter.aurora.scheduler.events.PubsubEvent.EventSubscriber;
-import com.twitter.aurora.scheduler.events.PubsubEvent.Interceptors.SendNotification;
-import com.twitter.aurora.scheduler.filter.SchedulingFilter;
import com.twitter.common.application.modules.LifecycleModule;
import com.twitter.common.base.Closure;
import com.twitter.common.base.Command;
+import org.aopalliance.intercept.MethodInterceptor;
+
+import org.apache.aurora.scheduler.events.NotifyingSchedulingFilter.NotifyDelegate;
+import org.apache.aurora.scheduler.events.PubsubEvent.EventSubscriber;
+import org.apache.aurora.scheduler.events.PubsubEvent.Interceptors.SendNotification;
+import org.apache.aurora.scheduler.filter.SchedulingFilter;
+
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/filter/AttributeFilter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/filter/AttributeFilter.java b/src/main/java/org/apache/aurora/scheduler/filter/AttributeFilter.java
index 66327fa..4ab048d 100644
--- a/src/main/java/org/apache/aurora/scheduler/filter/AttributeFilter.java
+++ b/src/main/java/org/apache/aurora/scheduler/filter/AttributeFilter.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.filter;
+package org.apache.aurora.scheduler.filter;
import java.util.Set;
@@ -23,12 +23,12 @@ import com.google.common.base.Predicates;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
-import com.twitter.aurora.gen.Attribute;
-import com.twitter.aurora.scheduler.base.Tasks;
-import com.twitter.aurora.scheduler.filter.SchedulingFilterImpl.AttributeLoader;
-import com.twitter.aurora.scheduler.storage.entities.IJobKey;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.entities.IValueConstraint;
+import org.apache.aurora.gen.Attribute;
+import org.apache.aurora.scheduler.base.Tasks;
+import org.apache.aurora.scheduler.filter.SchedulingFilterImpl.AttributeLoader;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+import org.apache.aurora.scheduler.storage.entities.IValueConstraint;
/**
* Utility class that matches attributes to constraints.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/filter/ConstraintFilter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/filter/ConstraintFilter.java b/src/main/java/org/apache/aurora/scheduler/filter/ConstraintFilter.java
index 2612cb8..9046148 100644
--- a/src/main/java/org/apache/aurora/scheduler/filter/ConstraintFilter.java
+++ b/src/main/java/org/apache/aurora/scheduler/filter/ConstraintFilter.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.filter;
+package org.apache.aurora.scheduler.filter;
import java.util.Collection;
import java.util.Set;
@@ -27,14 +27,14 @@ import com.google.common.base.Supplier;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
-import com.twitter.aurora.gen.Attribute;
-import com.twitter.aurora.scheduler.base.SchedulerException;
-import com.twitter.aurora.scheduler.filter.SchedulingFilter.Veto;
-import com.twitter.aurora.scheduler.filter.SchedulingFilterImpl.AttributeLoader;
-import com.twitter.aurora.scheduler.storage.entities.IConstraint;
-import com.twitter.aurora.scheduler.storage.entities.IJobKey;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConstraint;
+import org.apache.aurora.gen.Attribute;
+import org.apache.aurora.scheduler.base.SchedulerException;
+import org.apache.aurora.scheduler.filter.SchedulingFilter.Veto;
+import org.apache.aurora.scheduler.filter.SchedulingFilterImpl.AttributeLoader;
+import org.apache.aurora.scheduler.storage.entities.IConstraint;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+import org.apache.aurora.scheduler.storage.entities.ITaskConstraint;
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/filter/SchedulingFilter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/filter/SchedulingFilter.java b/src/main/java/org/apache/aurora/scheduler/filter/SchedulingFilter.java
index 7e8fbdb..00f2278 100644
--- a/src/main/java/org/apache/aurora/scheduler/filter/SchedulingFilter.java
+++ b/src/main/java/org/apache/aurora/scheduler/filter/SchedulingFilter.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.filter;
+package org.apache.aurora.scheduler.filter;
import java.util.Set;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Objects;
-import com.twitter.aurora.scheduler.ResourceSlot;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
+import org.apache.aurora.scheduler.ResourceSlot;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
/**
* Determines whether a proposed scheduling assignment should be allowed.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/filter/SchedulingFilterImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/filter/SchedulingFilterImpl.java b/src/main/java/org/apache/aurora/scheduler/filter/SchedulingFilterImpl.java
index 33272ce..185b17c 100644
--- a/src/main/java/org/apache/aurora/scheduler/filter/SchedulingFilterImpl.java
+++ b/src/main/java/org/apache/aurora/scheduler/filter/SchedulingFilterImpl.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.filter;
+package org.apache.aurora.scheduler.filter;
import java.util.Collection;
import java.util.Comparator;
@@ -33,34 +33,35 @@ import com.google.common.collect.Iterables;
import com.google.common.collect.Ordering;
import com.google.common.collect.Sets;
-import com.twitter.aurora.gen.Attribute;
-import com.twitter.aurora.gen.MaintenanceMode;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.TaskConstraint;
-import com.twitter.aurora.scheduler.ResourceSlot;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.base.Tasks;
-import com.twitter.aurora.scheduler.configuration.ConfigurationManager;
-import com.twitter.aurora.scheduler.state.MaintenanceController;
-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.Quiet;
-import com.twitter.aurora.scheduler.storage.entities.IConstraint;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
import com.twitter.common.quantity.Amount;
import com.twitter.common.quantity.Data;
+import org.apache.aurora.gen.Attribute;
+import org.apache.aurora.gen.MaintenanceMode;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.TaskConstraint;
+import org.apache.aurora.scheduler.ResourceSlot;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.base.Tasks;
+import org.apache.aurora.scheduler.configuration.ConfigurationManager;
+import org.apache.aurora.scheduler.state.MaintenanceController;
+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.Quiet;
+import org.apache.aurora.scheduler.storage.entities.IConstraint;
+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.MaintenanceMode.DRAINED;
-import static com.twitter.aurora.gen.MaintenanceMode.DRAINING;
-import static com.twitter.aurora.scheduler.configuration.ConfigurationManager.DEDICATED_ATTRIBUTE;
-import static com.twitter.aurora.scheduler.filter.SchedulingFilterImpl.ResourceVector.CPU;
-import static com.twitter.aurora.scheduler.filter.SchedulingFilterImpl.ResourceVector.DISK;
-import static com.twitter.aurora.scheduler.filter.SchedulingFilterImpl.ResourceVector.PORTS;
-import static com.twitter.aurora.scheduler.filter.SchedulingFilterImpl.ResourceVector.RAM;
+import static org.apache.aurora.gen.MaintenanceMode.DRAINED;
+import static org.apache.aurora.gen.MaintenanceMode.DRAINING;
+import static org.apache.aurora.scheduler.configuration.ConfigurationManager.DEDICATED_ATTRIBUTE;
+import static org.apache.aurora.scheduler.filter.SchedulingFilterImpl.ResourceVector.CPU;
+import static org.apache.aurora.scheduler.filter.SchedulingFilterImpl.ResourceVector.DISK;
+import static org.apache.aurora.scheduler.filter.SchedulingFilterImpl.ResourceVector.PORTS;
+import static org.apache.aurora.scheduler.filter.SchedulingFilterImpl.ResourceVector.RAM;
/**
* Implementation of the scheduling filter that ensures resource requirements of tasks are
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/http/ClusterName.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/ClusterName.java b/src/main/java/org/apache/aurora/scheduler/http/ClusterName.java
index 90c87a7..6402a5e 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/ClusterName.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/ClusterName.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.http;
+package org.apache.aurora.scheduler.http;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/http/Cron.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/Cron.java b/src/main/java/org/apache/aurora/scheduler/http/Cron.java
index 8c97b5e..f1b2739 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/Cron.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/Cron.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.http;
+package org.apache.aurora.scheduler.http;
import java.util.Map;
@@ -26,7 +26,7 @@ import javax.ws.rs.core.Response;
import com.google.common.collect.ImmutableMap;
-import com.twitter.aurora.scheduler.state.CronJobManager;
+import org.apache.aurora.scheduler.state.CronJobManager;
/**
* HTTP interface to dump state of the internal cron scheduler.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/http/DisplayUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/DisplayUtils.java b/src/main/java/org/apache/aurora/scheduler/http/DisplayUtils.java
index b4a2762..4f4035a 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/DisplayUtils.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/DisplayUtils.java
@@ -13,18 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.http;
+package org.apache.aurora.scheduler.http;
import com.google.common.base.Function;
import com.google.common.collect.Ordering;
-import com.twitter.aurora.scheduler.MesosTaskFactory.MesosTaskFactoryImpl;
-import com.twitter.aurora.scheduler.http.SchedulerzHome.Role;
-import com.twitter.aurora.scheduler.http.SchedulerzRole.Job;
-import com.twitter.aurora.scheduler.storage.entities.IJobKey;
import com.twitter.common.args.Arg;
import com.twitter.common.args.CmdLine;
+import org.apache.aurora.scheduler.MesosTaskFactory.MesosTaskFactoryImpl;
+import org.apache.aurora.scheduler.http.SchedulerzHome.Role;
+import org.apache.aurora.scheduler.http.SchedulerzRole.Job;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
+
/**
* Utility class to hold common display helper functions.
*/
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/http/HttpStatsFilter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/HttpStatsFilter.java b/src/main/java/org/apache/aurora/scheduler/http/HttpStatsFilter.java
index a846383..798f81a 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/HttpStatsFilter.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/HttpStatsFilter.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.http;
+package org.apache.aurora.scheduler.http;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/http/JerseyTemplateServlet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/JerseyTemplateServlet.java b/src/main/java/org/apache/aurora/scheduler/http/JerseyTemplateServlet.java
index 5c13de5..ccd1d36 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/JerseyTemplateServlet.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/JerseyTemplateServlet.java
@@ -13,19 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.http;
+package org.apache.aurora.scheduler.http;
import java.io.StringWriter;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
-import org.antlr.stringtemplate.StringTemplate;
-
import com.twitter.common.base.Closure;
import com.twitter.common.util.templating.StringTemplateHelper;
import com.twitter.common.util.templating.StringTemplateHelper.TemplateException;
+import org.antlr.stringtemplate.StringTemplate;
+
/**
* Base class for common functions needed in a jersey stringtemplate servlet.
*/
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/http/LeaderRedirect.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/LeaderRedirect.java b/src/main/java/org/apache/aurora/scheduler/http/LeaderRedirect.java
index 20e4446..2b68dd6 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/LeaderRedirect.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/LeaderRedirect.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.http;
+package org.apache.aurora.scheduler.http;
import java.net.InetSocketAddress;
import java.util.concurrent.atomic.AtomicReference;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/http/LeaderRedirectFilter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/LeaderRedirectFilter.java b/src/main/java/org/apache/aurora/scheduler/http/LeaderRedirectFilter.java
index 86f0567..37935fb 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/LeaderRedirectFilter.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/LeaderRedirectFilter.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.http;
+package org.apache.aurora.scheduler.http;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/http/Maintenance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/Maintenance.java b/src/main/java/org/apache/aurora/scheduler/http/Maintenance.java
index fb71539..4679cb6 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/Maintenance.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/Maintenance.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.http;
+package org.apache.aurora.scheduler.http;
import java.util.Map;
@@ -31,18 +31,18 @@ import com.google.common.collect.Maps;
import com.google.common.collect.Multimap;
import com.google.common.collect.Multimaps;
-import com.twitter.aurora.gen.HostAttributes;
-import com.twitter.aurora.gen.MaintenanceMode;
-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.Storage.StoreProvider;
-import com.twitter.aurora.scheduler.storage.Storage.Work;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
+import org.apache.aurora.gen.HostAttributes;
+import org.apache.aurora.gen.MaintenanceMode;
+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.Storage.StoreProvider;
+import org.apache.aurora.scheduler.storage.Storage.Work;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
-import static com.twitter.aurora.gen.MaintenanceMode.DRAINED;
-import static com.twitter.aurora.gen.MaintenanceMode.DRAINING;
-import static com.twitter.aurora.gen.MaintenanceMode.SCHEDULED;
+import static org.apache.aurora.gen.MaintenanceMode.DRAINED;
+import static org.apache.aurora.gen.MaintenanceMode.DRAINING;
+import static org.apache.aurora.gen.MaintenanceMode.SCHEDULED;
/**
* Servlet that exposes the maintenance state of hosts.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/http/Mname.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/Mname.java b/src/main/java/org/apache/aurora/scheduler/http/Mname.java
index c97560f..bfe77d4 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/Mname.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/Mname.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.http;
+package org.apache.aurora.scheduler.http;
import java.util.List;
import java.util.Map;
@@ -41,17 +41,17 @@ import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
-import com.twitter.aurora.scheduler.base.JobKeys;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.storage.Storage;
-import com.twitter.aurora.scheduler.storage.entities.IAssignedTask;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
+import org.apache.aurora.scheduler.base.JobKeys;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.storage.Storage;
+import org.apache.aurora.scheduler.storage.entities.IAssignedTask;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
import static javax.ws.rs.core.Response.Status.NOT_FOUND;
import static com.google.common.base.Preconditions.checkNotNull;
-import static com.twitter.aurora.gen.ScheduleStatus.RUNNING;
+import static org.apache.aurora.gen.ScheduleStatus.RUNNING;
/**
* Simple redirector from the canonical name of a task to its configured HTTP port.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/http/Offers.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/Offers.java b/src/main/java/org/apache/aurora/scheduler/http/Offers.java
index e90f1cc..54fa2e2 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/Offers.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/Offers.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.http;
+package org.apache.aurora.scheduler.http;
import java.util.Map;
@@ -29,14 +29,14 @@ import com.google.common.base.Preconditions;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableMap;
+import org.apache.aurora.scheduler.async.OfferQueue;
+
import org.apache.mesos.Protos.Attribute;
import org.apache.mesos.Protos.ExecutorID;
import org.apache.mesos.Protos.Offer;
import org.apache.mesos.Protos.Resource;
import org.apache.mesos.Protos.Value.Range;
-import com.twitter.aurora.scheduler.async.OfferQueue;
-
/**
* Servlet that exposes resource offers that the scheduler is currently retaining.
*/
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/http/PendingTasks.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/PendingTasks.java b/src/main/java/org/apache/aurora/scheduler/http/PendingTasks.java
index 359fb97..151a94f 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/PendingTasks.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/PendingTasks.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.http;
+package org.apache.aurora.scheduler.http;
import javax.inject.Inject;
import javax.ws.rs.GET;
@@ -24,7 +24,7 @@ import javax.ws.rs.core.Response;
import com.google.common.base.Preconditions;
-import com.twitter.aurora.scheduler.async.TaskGroups;
+import org.apache.aurora.scheduler.async.TaskGroups;
/**
* Servlet that exposes detailed information about tasks that are pending.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/http/Quotas.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/Quotas.java b/src/main/java/org/apache/aurora/scheduler/http/Quotas.java
index 1183275..c3b8d19 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/Quotas.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/Quotas.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.http;
+package org.apache.aurora.scheduler.http;
import java.util.Map;
@@ -31,12 +31,12 @@ import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
-import org.codehaus.jackson.annotate.JsonProperty;
+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.IQuota;
-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.IQuota;
+import org.codehaus.jackson.annotate.JsonProperty;
/**
* Servlet that exposes allocated resource quotas.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/http/SchedulerzHome.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/SchedulerzHome.java b/src/main/java/org/apache/aurora/scheduler/http/SchedulerzHome.java
index 07a3259..b4ed279 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/SchedulerzHome.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/SchedulerzHome.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.http;
+package org.apache.aurora.scheduler.http;
import java.util.Set;
@@ -31,16 +31,17 @@ import com.google.common.cache.LoadingCache;
import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
+import com.twitter.common.base.Closure;
+
import org.antlr.stringtemplate.StringTemplate;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.base.Tasks;
-import com.twitter.aurora.scheduler.state.CronJobManager;
-import com.twitter.aurora.scheduler.storage.Storage;
-import com.twitter.aurora.scheduler.storage.entities.IJobConfiguration;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
-import com.twitter.common.base.Closure;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.base.Tasks;
+import org.apache.aurora.scheduler.state.CronJobManager;
+import org.apache.aurora.scheduler.storage.Storage;
+import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
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/http/SchedulerzJob.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/SchedulerzJob.java b/src/main/java/org/apache/aurora/scheduler/http/SchedulerzJob.java
index 12b0bec..9c88846 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/SchedulerzJob.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/SchedulerzJob.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.http;
+package org.apache.aurora.scheduler.http;
import java.util.Collection;
import java.util.Collections;
@@ -48,39 +48,41 @@ import com.google.common.collect.Multimap;
import com.google.common.collect.Multimaps;
import com.google.common.collect.Ordering;
+import com.twitter.common.base.Closure;
+
import org.antlr.stringtemplate.StringTemplate;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.apiConstants;
-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.filter.SchedulingFilter.Veto;
-import com.twitter.aurora.scheduler.metadata.NearestFit;
-import com.twitter.aurora.scheduler.state.CronJobManager;
-import com.twitter.aurora.scheduler.storage.Storage;
-import com.twitter.aurora.scheduler.storage.entities.IAssignedTask;
-import com.twitter.aurora.scheduler.storage.entities.IConstraint;
-import com.twitter.aurora.scheduler.storage.entities.IJobKey;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConstraint;
-import com.twitter.aurora.scheduler.storage.entities.ITaskEvent;
-import com.twitter.common.base.Closure;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.apiConstants;
+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.filter.SchedulingFilter.Veto;
+import org.apache.aurora.scheduler.metadata.NearestFit;
+import org.apache.aurora.scheduler.state.CronJobManager;
+import org.apache.aurora.scheduler.storage.Storage;
+import org.apache.aurora.scheduler.storage.entities.IAssignedTask;
+import org.apache.aurora.scheduler.storage.entities.IConstraint;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
+import org.apache.aurora.scheduler.storage.entities.ITaskConstraint;
+import org.apache.aurora.scheduler.storage.entities.ITaskEvent;
import static com.google.common.base.Preconditions.checkNotNull;
-import static com.twitter.aurora.gen.ScheduleStatus.ASSIGNED;
-import static com.twitter.aurora.gen.ScheduleStatus.FAILED;
-import static com.twitter.aurora.gen.ScheduleStatus.FINISHED;
-import static com.twitter.aurora.gen.ScheduleStatus.KILLED;
-import static com.twitter.aurora.gen.ScheduleStatus.KILLING;
-import static com.twitter.aurora.gen.ScheduleStatus.LOST;
-import static com.twitter.aurora.gen.ScheduleStatus.PENDING;
-import static com.twitter.aurora.gen.ScheduleStatus.RUNNING;
-import static com.twitter.aurora.gen.ScheduleStatus.STARTING;
import static com.twitter.common.base.MorePreconditions.checkNotBlank;
+import static org.apache.aurora.gen.ScheduleStatus.ASSIGNED;
+import static org.apache.aurora.gen.ScheduleStatus.FAILED;
+import static org.apache.aurora.gen.ScheduleStatus.FINISHED;
+import static org.apache.aurora.gen.ScheduleStatus.KILLED;
+import static org.apache.aurora.gen.ScheduleStatus.KILLING;
+import static org.apache.aurora.gen.ScheduleStatus.LOST;
+import static org.apache.aurora.gen.ScheduleStatus.PENDING;
+import static org.apache.aurora.gen.ScheduleStatus.RUNNING;
+import static org.apache.aurora.gen.ScheduleStatus.STARTING;
+
/**
* HTTP interface to view information about a job in the aurora scheduler.
*/
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/http/SchedulerzRole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/SchedulerzRole.java b/src/main/java/org/apache/aurora/scheduler/http/SchedulerzRole.java
index 756c672..e093697 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/SchedulerzRole.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/SchedulerzRole.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.http;
+package org.apache.aurora.scheduler.http;
import java.util.Collection;
import java.util.Date;
@@ -47,34 +47,36 @@ import com.google.common.collect.Multimap;
import com.google.common.collect.Ordering;
import com.google.common.collect.Sets;
-import org.antlr.stringtemplate.StringTemplate;
-
-import com.twitter.aurora.gen.CronCollisionPolicy;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.apiConstants;
-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.cron.CronPredictor;
-import com.twitter.aurora.scheduler.quota.QuotaManager;
-import com.twitter.aurora.scheduler.quota.Quotas;
-import com.twitter.aurora.scheduler.state.CronJobManager;
-import com.twitter.aurora.scheduler.storage.Storage;
-import com.twitter.aurora.scheduler.storage.entities.IJobConfiguration;
-import com.twitter.aurora.scheduler.storage.entities.IJobKey;
-import com.twitter.aurora.scheduler.storage.entities.IQuota;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
import com.twitter.common.base.Closure;
import com.twitter.common.quantity.Amount;
import com.twitter.common.quantity.Time;
+import org.antlr.stringtemplate.StringTemplate;
+
+import org.apache.aurora.gen.CronCollisionPolicy;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.apiConstants;
+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.cron.CronPredictor;
+import org.apache.aurora.scheduler.quota.QuotaManager;
+import org.apache.aurora.scheduler.quota.Quotas;
+import org.apache.aurora.scheduler.state.CronJobManager;
+import org.apache.aurora.scheduler.storage.Storage;
+import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
+import org.apache.aurora.scheduler.storage.entities.IQuota;
+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.scheduler.base.Tasks.GET_STATUS;
-import static com.twitter.aurora.scheduler.base.Tasks.LATEST_ACTIVITY;
import static com.twitter.common.base.MorePreconditions.checkNotBlank;
+import static org.apache.aurora.scheduler.base.Tasks.GET_STATUS;
+import static org.apache.aurora.scheduler.base.Tasks.LATEST_ACTIVITY;
+
/**
* HTTP interface to provide information about jobs for a specific role.
*/
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java b/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
index 825e2e1..9d28df8 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.http;
+package org.apache.aurora.scheduler.http;
import java.util.Map;
@@ -28,13 +28,11 @@ import com.google.inject.AbstractModule;
import com.google.inject.Key;
import com.google.inject.TypeLiteral;
import com.google.inject.servlet.GuiceFilter;
+
import com.sun.jersey.api.container.filter.GZIPContentEncodingFilter;
import com.sun.jersey.guice.JerseyServletModule;
import com.sun.jersey.guice.spi.container.servlet.GuiceContainer;
-import com.twitter.aurora.scheduler.quota.QuotaManager;
-import com.twitter.aurora.scheduler.state.CronJobManager;
-import com.twitter.aurora.scheduler.state.SchedulerCore;
import com.twitter.common.application.http.Registration;
import com.twitter.common.application.modules.LifecycleModule;
import com.twitter.common.application.modules.LocalServiceRegistry;
@@ -43,6 +41,10 @@ import com.twitter.common.net.pool.DynamicHostSet;
import com.twitter.common.net.pool.DynamicHostSet.MonitorException;
import com.twitter.thrift.ServiceInstance;
+import org.apache.aurora.scheduler.quota.QuotaManager;
+import org.apache.aurora.scheduler.state.CronJobManager;
+import org.apache.aurora.scheduler.state.SchedulerCore;
+
import static com.sun.jersey.api.core.ResourceConfig.PROPERTY_CONTAINER_REQUEST_FILTERS;
import static com.sun.jersey.api.core.ResourceConfig.PROPERTY_CONTAINER_RESPONSE_FILTERS;
import static com.sun.jersey.api.json.JSONConfiguration.FEATURE_POJO_MAPPING;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/http/Slaves.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/Slaves.java b/src/main/java/org/apache/aurora/scheduler/http/Slaves.java
index 401ee30..cb9de6b 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/Slaves.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/Slaves.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.http;
+package org.apache.aurora.scheduler.http;
import javax.inject.Inject;
import javax.ws.rs.GET;
@@ -28,20 +28,22 @@ import com.google.common.collect.FluentIterable;
import com.google.common.collect.Iterables;
import com.google.common.collect.Ordering;
+import com.twitter.common.base.Closure;
+
import org.antlr.stringtemplate.StringTemplate;
-import com.twitter.aurora.gen.Attribute;
-import com.twitter.aurora.gen.HostAttributes;
-import com.twitter.aurora.gen.MaintenanceMode;
-import com.twitter.aurora.scheduler.storage.Storage;
-import com.twitter.common.base.Closure;
+import org.apache.aurora.gen.Attribute;
+import org.apache.aurora.gen.HostAttributes;
+import org.apache.aurora.gen.MaintenanceMode;
+import org.apache.aurora.scheduler.storage.Storage;
import static com.google.common.base.Preconditions.checkNotNull;
-import static com.twitter.aurora.scheduler.storage.Storage.StoreProvider;
-import static com.twitter.aurora.scheduler.storage.Storage.Work;
import static com.twitter.common.base.MorePreconditions.checkNotBlank;
+import static org.apache.aurora.scheduler.storage.Storage.StoreProvider;
+import static org.apache.aurora.scheduler.storage.Storage.Work;
+
/**
* HTTP interface to serve as a HUD for the mesos slaves tracked in the scheduler.
*/
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/http/StructDump.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/StructDump.java b/src/main/java/org/apache/aurora/scheduler/http/StructDump.java
index 8da8b80..fa841fb 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/StructDump.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/StructDump.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.http;
+package org.apache.aurora.scheduler.http;
import javax.inject.Inject;
import javax.ws.rs.GET;
@@ -28,22 +28,24 @@ import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.collect.Iterables;
-import org.antlr.stringtemplate.StringTemplate;
-import org.apache.thrift.TBase;
-
-import com.twitter.aurora.gen.JobConfiguration;
-import com.twitter.aurora.scheduler.base.JobKeys;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.state.CronJobManager;
-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.Storage.Work.Quiet;
-import com.twitter.aurora.scheduler.storage.entities.IJobConfiguration;
-import com.twitter.aurora.scheduler.storage.entities.IJobKey;
import com.twitter.common.base.Closure;
import com.twitter.common.thrift.Util;
+import org.antlr.stringtemplate.StringTemplate;
+
+import org.apache.aurora.gen.JobConfiguration;
+import org.apache.aurora.scheduler.base.JobKeys;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.state.CronJobManager;
+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.Storage.Work.Quiet;
+import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
+
+import org.apache.thrift.TBase;
+
/**
* Servlet that prints out the raw configuration for a specified struct.
*/
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/http/TransformationUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/TransformationUtils.java b/src/main/java/org/apache/aurora/scheduler/http/TransformationUtils.java
index 2f531a7..6960a08 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/TransformationUtils.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/TransformationUtils.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.http;
+package org.apache.aurora.scheduler.http;
import java.util.Collection;
@@ -22,8 +22,8 @@ import com.google.common.base.Joiner;
import com.google.common.collect.Iterables;
import com.google.common.collect.Range;
-import com.twitter.aurora.scheduler.base.Numbers;
-import com.twitter.aurora.scheduler.storage.entities.IPackage;
+import org.apache.aurora.scheduler.base.Numbers;
+import org.apache.aurora.scheduler.storage.entities.IPackage;
/**
* Utility class to hold common object to string transformation helper functions.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/http/Utilization.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/Utilization.java b/src/main/java/org/apache/aurora/scheduler/http/Utilization.java
index 60a7d95..b1acbe5 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/Utilization.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/Utilization.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.http;
+package org.apache.aurora.scheduler.http;
import java.io.StringWriter;
import java.util.Map;
@@ -35,19 +35,20 @@ import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
import com.google.common.collect.FluentIterable;
-import org.antlr.stringtemplate.StringTemplate;
-
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.stats.ResourceCounter;
-import com.twitter.aurora.scheduler.stats.ResourceCounter.GlobalMetric;
-import com.twitter.aurora.scheduler.stats.ResourceCounter.Metric;
-import com.twitter.aurora.scheduler.stats.ResourceCounter.MetricType;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
import com.twitter.common.base.Closure;
import com.twitter.common.base.MorePreconditions;
import com.twitter.common.util.templating.StringTemplateHelper;
import com.twitter.common.util.templating.StringTemplateHelper.TemplateException;
+import org.antlr.stringtemplate.StringTemplate;
+
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.stats.ResourceCounter;
+import org.apache.aurora.scheduler.stats.ResourceCounter.GlobalMetric;
+import org.apache.aurora.scheduler.stats.ResourceCounter.Metric;
+import org.apache.aurora.scheduler.stats.ResourceCounter.MetricType;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
+
/**
* A servlet to give an aggregate view of cluster resources consumed, grouped by category.
*/
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/local/FakeDriverFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/local/FakeDriverFactory.java b/src/main/java/org/apache/aurora/scheduler/local/FakeDriverFactory.java
index ae5062e..239f458 100644
--- a/src/main/java/org/apache/aurora/scheduler/local/FakeDriverFactory.java
+++ b/src/main/java/org/apache/aurora/scheduler/local/FakeDriverFactory.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.local;
+package org.apache.aurora.scheduler.local;
import java.util.Collection;
@@ -24,6 +24,10 @@ import javax.inject.Provider;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
+import com.twitter.common.application.Lifecycle;
+
+import org.apache.aurora.scheduler.DriverFactory;
+
import org.apache.mesos.Protos.ExecutorID;
import org.apache.mesos.Protos.Filters;
import org.apache.mesos.Protos.FrameworkID;
@@ -38,9 +42,6 @@ import org.apache.mesos.Protos.TaskStatus;
import org.apache.mesos.Scheduler;
import org.apache.mesos.SchedulerDriver;
-import com.twitter.aurora.scheduler.DriverFactory;
-import com.twitter.common.application.Lifecycle;
-
/**
* A factory for fake scheduler driver instances.
*/
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/local/IsolatedSchedulerModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/local/IsolatedSchedulerModule.java b/src/main/java/org/apache/aurora/scheduler/local/IsolatedSchedulerModule.java
index c07359e..100d807 100644
--- a/src/main/java/org/apache/aurora/scheduler/local/IsolatedSchedulerModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/local/IsolatedSchedulerModule.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.local;
+package org.apache.aurora.scheduler.local;
import java.util.List;
import java.util.concurrent.ExecutionException;
@@ -39,6 +39,33 @@ import com.google.common.eventbus.Subscribe;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.google.inject.AbstractModule;
+import com.twitter.common.application.ShutdownRegistry;
+import com.twitter.common.base.Command;
+import com.twitter.common.quantity.Amount;
+import com.twitter.common.quantity.Time;
+import com.twitter.common.stats.Stats;
+import com.twitter.common.util.concurrent.ExecutorServiceShutdown;
+
+import org.apache.aurora.gen.AuroraAdmin;
+import org.apache.aurora.gen.ExecutorConfig;
+import org.apache.aurora.gen.Identity;
+import org.apache.aurora.gen.JobConfiguration;
+import org.apache.aurora.gen.Package;
+import org.apache.aurora.gen.Quota;
+import org.apache.aurora.gen.Response;
+import org.apache.aurora.gen.SessionKey;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.scheduler.DriverFactory;
+import org.apache.aurora.scheduler.base.JobKeys;
+import org.apache.aurora.scheduler.configuration.ConfigurationManager;
+import org.apache.aurora.scheduler.configuration.Resources;
+import org.apache.aurora.scheduler.events.PubsubEvent.DriverRegistered;
+import org.apache.aurora.scheduler.events.PubsubEvent.EventSubscriber;
+import org.apache.aurora.scheduler.events.PubsubEvent.TaskStateChange;
+import org.apache.aurora.scheduler.events.PubsubEventModule;
+import org.apache.aurora.scheduler.local.FakeDriverFactory.FakeSchedulerDriver;
+import org.apache.aurora.scheduler.log.testing.FileLogStreamModule;
+
import org.apache.mesos.Protos.Attribute;
import org.apache.mesos.Protos.FrameworkID;
import org.apache.mesos.Protos.Offer;
@@ -53,33 +80,8 @@ import org.apache.mesos.Protos.Value.Text;
import org.apache.mesos.Protos.Value.Type;
import org.apache.mesos.Scheduler;
import org.apache.mesos.SchedulerDriver;
-import org.apache.thrift.TException;
-import com.twitter.aurora.gen.AuroraAdmin;
-import com.twitter.aurora.gen.ExecutorConfig;
-import com.twitter.aurora.gen.Identity;
-import com.twitter.aurora.gen.JobConfiguration;
-import com.twitter.aurora.gen.Package;
-import com.twitter.aurora.gen.Quota;
-import com.twitter.aurora.gen.Response;
-import com.twitter.aurora.gen.SessionKey;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.scheduler.DriverFactory;
-import com.twitter.aurora.scheduler.base.JobKeys;
-import com.twitter.aurora.scheduler.configuration.ConfigurationManager;
-import com.twitter.aurora.scheduler.configuration.Resources;
-import com.twitter.aurora.scheduler.events.PubsubEvent.DriverRegistered;
-import com.twitter.aurora.scheduler.events.PubsubEvent.EventSubscriber;
-import com.twitter.aurora.scheduler.events.PubsubEvent.TaskStateChange;
-import com.twitter.aurora.scheduler.events.PubsubEventModule;
-import com.twitter.aurora.scheduler.local.FakeDriverFactory.FakeSchedulerDriver;
-import com.twitter.aurora.scheduler.log.testing.FileLogStreamModule;
-import com.twitter.common.application.ShutdownRegistry;
-import com.twitter.common.base.Command;
-import com.twitter.common.quantity.Amount;
-import com.twitter.common.quantity.Time;
-import com.twitter.common.stats.Stats;
-import com.twitter.common.util.concurrent.ExecutorServiceShutdown;
+import org.apache.thrift.TException;
/**
* A module that binds a fake mesos driver factory and a local (non-replicated) storage system.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/log/Log.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/log/Log.java b/src/main/java/org/apache/aurora/scheduler/log/Log.java
index c1036e0..43f7e02 100644
--- a/src/main/java/org/apache/aurora/scheduler/log/Log.java
+++ b/src/main/java/org/apache/aurora/scheduler/log/Log.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.log;
+package org.apache.aurora.scheduler.log;
import java.io.Closeable;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/log/mesos/LogInterface.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/log/mesos/LogInterface.java b/src/main/java/org/apache/aurora/scheduler/log/mesos/LogInterface.java
index 9ae4685..3a50e73 100644
--- a/src/main/java/org/apache/aurora/scheduler/log/mesos/LogInterface.java
+++ b/src/main/java/org/apache/aurora/scheduler/log/mesos/LogInterface.java
@@ -1,4 +1,4 @@
-package com.twitter.aurora.scheduler.log.mesos;
+package org.apache.aurora.scheduler.log.mesos;
import java.util.List;
import java.util.concurrent.TimeUnit;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLog.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLog.java b/src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLog.java
index d625734..a622971 100644
--- a/src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLog.java
+++ b/src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLog.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.log.mesos;
+package org.apache.aurora.scheduler.log.mesos;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
@@ -36,10 +36,6 @@ import com.google.common.collect.UnmodifiableIterator;
import com.google.common.primitives.Longs;
import com.google.inject.BindingAnnotation;
-import org.apache.mesos.Log;
-
-import com.twitter.aurora.scheduler.log.mesos.LogInterface.ReaderInterface;
-import com.twitter.aurora.scheduler.log.mesos.LogInterface.WriterInterface;
import com.twitter.common.base.Function;
import com.twitter.common.base.MorePreconditions;
import com.twitter.common.inject.TimedInterceptor.Timed;
@@ -48,6 +44,11 @@ import com.twitter.common.quantity.Time;
import com.twitter.common.stats.SlidingStats;
import com.twitter.common.stats.Stats;
+import org.apache.aurora.scheduler.log.mesos.LogInterface.ReaderInterface;
+import org.apache.aurora.scheduler.log.mesos.LogInterface.WriterInterface;
+
+import org.apache.mesos.Log;
+
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
@@ -55,7 +56,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
/**
* A {@code Log} implementation backed by a true distributed log in mesos core.
*/
-public class MesosLog implements com.twitter.aurora.scheduler.log.Log {
+public class MesosLog implements org.apache.aurora.scheduler.log.Log {
private static final Logger LOG = Logger.getLogger(MesosLog.class.getName());
@@ -130,7 +131,7 @@ public class MesosLog implements com.twitter.aurora.scheduler.log.Log {
}
@VisibleForTesting
- static class LogStream implements com.twitter.aurora.scheduler.log.Log.Stream {
+ static class LogStream implements org.apache.aurora.scheduler.log.Log.Stream {
@VisibleForTesting
static final class OpStats {
private final String opName;
@@ -197,7 +198,7 @@ public class MesosLog implements com.twitter.aurora.scheduler.log.Log {
@Override
public Iterator<Entry> readAll() throws StreamAccessException {
// TODO(John Sirois): Currently we must be the coordinator to ensure we get the 'full read'
- // of log entries expected by the users of the com.twitter.aurora.scheduler.log.Log interface.
+ // of log entries expected by the users of the org.apache.aurora.scheduler.log.Log interface.
// Switch to another method of ensuring this when it becomes available in mesos' log
// interface.
try {
@@ -289,7 +290,7 @@ public class MesosLog implements com.twitter.aurora.scheduler.log.Log {
@Timed("scheduler_log_native_truncate_before")
@Override
- public void truncateBefore(com.twitter.aurora.scheduler.log.Log.Position position)
+ public void truncateBefore(org.apache.aurora.scheduler.log.Log.Position position)
throws StreamAccessException {
Preconditions.checkArgument(position instanceof LogPosition);
@@ -342,7 +343,7 @@ public class MesosLog implements com.twitter.aurora.scheduler.log.Log {
// noop
}
- private static class LogPosition implements com.twitter.aurora.scheduler.log.Log.Position {
+ private static class LogPosition implements org.apache.aurora.scheduler.log.Log.Position {
private final Log.Position underlying;
LogPosition(Log.Position underlying) {
@@ -363,7 +364,7 @@ public class MesosLog implements com.twitter.aurora.scheduler.log.Log {
}
}
- private static class LogEntry implements com.twitter.aurora.scheduler.log.Log.Entry {
+ private static class LogEntry implements org.apache.aurora.scheduler.log.Log.Entry {
private final Log.Entry underlying;
public LogEntry(Log.Entry entry) {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java b/src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java
index 7063cb7..8c03f7b 100644
--- a/src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.log.mesos;
+package org.apache.aurora.scheduler.log.mesos;
import java.io.File;
import java.util.List;
@@ -29,13 +29,6 @@ import com.google.inject.PrivateModule;
import com.google.inject.Provides;
import com.google.inject.TypeLiteral;
-import org.apache.mesos.Log;
-import org.apache.zookeeper.common.PathUtils;
-
-import com.twitter.aurora.codec.ThriftBinaryCodec;
-import com.twitter.aurora.gen.storage.LogEntry;
-import com.twitter.aurora.scheduler.log.mesos.LogInterface.ReaderInterface;
-import com.twitter.aurora.scheduler.log.mesos.LogInterface.WriterInterface;
import com.twitter.common.args.Arg;
import com.twitter.common.args.CmdLine;
import com.twitter.common.net.InetSocketAddressHelper;
@@ -43,6 +36,15 @@ import com.twitter.common.quantity.Amount;
import com.twitter.common.quantity.Time;
import com.twitter.common.zookeeper.guice.client.ZooKeeperClientModule.ClientConfig;
+import org.apache.aurora.codec.ThriftBinaryCodec;
+import org.apache.aurora.gen.storage.LogEntry;
+import org.apache.aurora.scheduler.log.mesos.LogInterface.ReaderInterface;
+import org.apache.aurora.scheduler.log.mesos.LogInterface.WriterInterface;
+
+import org.apache.mesos.Log;
+
+import org.apache.zookeeper.common.PathUtils;
+
/**
* Binds a native mesos Log implementation.
*
@@ -109,9 +111,9 @@ public class MesosLogStreamModule extends PrivateModule {
bind(new TypeLiteral<Amount<Long, Time>>() { }).annotatedWith(MesosLog.WriteTimeout.class)
.toInstance(WRITE_TIMEOUT.get());
- bind(com.twitter.aurora.scheduler.log.Log.class).to(MesosLog.class);
+ bind(org.apache.aurora.scheduler.log.Log.class).to(MesosLog.class);
bind(MesosLog.class).in(Singleton.class);
- expose(com.twitter.aurora.scheduler.log.Log.class);
+ expose(org.apache.aurora.scheduler.log.Log.class);
}
@Provides
[7/9] Refactors java and python code to the Apache namespace.
Posted by wf...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/log/testing/FileLog.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/log/testing/FileLog.java b/src/main/java/org/apache/aurora/scheduler/log/testing/FileLog.java
index 3dff4cf..d269554 100644
--- a/src/main/java/org/apache/aurora/scheduler/log/testing/FileLog.java
+++ b/src/main/java/org/apache/aurora/scheduler/log/testing/FileLog.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.log.testing;
+package org.apache.aurora.scheduler.log.testing;
import java.io.File;
import java.io.IOException;
@@ -35,13 +35,14 @@ import com.google.common.collect.Ordering;
import com.google.common.io.Files;
import com.google.common.primitives.Longs;
-import com.twitter.aurora.codec.ThriftBinaryCodec;
-import com.twitter.aurora.codec.ThriftBinaryCodec.CodingException;
-import com.twitter.aurora.gen.test.FileLogContents;
-import com.twitter.aurora.gen.test.LogRecord;
-import com.twitter.aurora.scheduler.log.Log;
import com.twitter.common.base.Closure;
+import org.apache.aurora.codec.ThriftBinaryCodec;
+import org.apache.aurora.codec.ThriftBinaryCodec.CodingException;
+import org.apache.aurora.gen.test.FileLogContents;
+import org.apache.aurora.gen.test.LogRecord;
+import org.apache.aurora.scheduler.log.Log;
+
/**
* A log implementation that reads from and writes to a local file.
* <p>
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/log/testing/FileLogStreamModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/log/testing/FileLogStreamModule.java b/src/main/java/org/apache/aurora/scheduler/log/testing/FileLogStreamModule.java
index 5ef3e8e..11c5aa9 100644
--- a/src/main/java/org/apache/aurora/scheduler/log/testing/FileLogStreamModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/log/testing/FileLogStreamModule.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.log.testing;
+package org.apache.aurora.scheduler.log.testing;
import java.io.File;
@@ -22,10 +22,11 @@ import javax.inject.Singleton;
import com.google.common.base.Preconditions;
import com.google.inject.PrivateModule;
-import com.twitter.aurora.scheduler.log.Log;
import com.twitter.common.args.Arg;
import com.twitter.common.args.CmdLine;
+import org.apache.aurora.scheduler.log.Log;
+
/**
* Binding module that uses a local log file, intended for testing.
*/
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/metadata/MetadataModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/metadata/MetadataModule.java b/src/main/java/org/apache/aurora/scheduler/metadata/MetadataModule.java
index 08377ae..4f1b921 100644
--- a/src/main/java/org/apache/aurora/scheduler/metadata/MetadataModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/metadata/MetadataModule.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.metadata;
+package org.apache.aurora.scheduler.metadata;
import javax.inject.Singleton;
import com.google.inject.AbstractModule;
-import com.twitter.aurora.scheduler.events.PubsubEventModule;
+import org.apache.aurora.scheduler.events.PubsubEventModule;
/**
* Binding module for scheduler metadata management.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/metadata/NearestFit.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/metadata/NearestFit.java b/src/main/java/org/apache/aurora/scheduler/metadata/NearestFit.java
index 47c1f5c..00a1e9e 100644
--- a/src/main/java/org/apache/aurora/scheduler/metadata/NearestFit.java
+++ b/src/main/java/org/apache/aurora/scheduler/metadata/NearestFit.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.metadata;
+package org.apache.aurora.scheduler.metadata;
import java.util.Set;
@@ -30,16 +30,17 @@ import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.eventbus.Subscribe;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.scheduler.base.Tasks;
-import com.twitter.aurora.scheduler.events.PubsubEvent.EventSubscriber;
-import com.twitter.aurora.scheduler.events.PubsubEvent.TaskStateChange;
-import com.twitter.aurora.scheduler.events.PubsubEvent.TasksDeleted;
-import com.twitter.aurora.scheduler.events.PubsubEvent.Vetoed;
-import com.twitter.aurora.scheduler.filter.SchedulingFilter.Veto;
import com.twitter.common.quantity.Amount;
import com.twitter.common.quantity.Time;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.scheduler.base.Tasks;
+import org.apache.aurora.scheduler.events.PubsubEvent.EventSubscriber;
+import org.apache.aurora.scheduler.events.PubsubEvent.TaskStateChange;
+import org.apache.aurora.scheduler.events.PubsubEvent.TasksDeleted;
+import org.apache.aurora.scheduler.events.PubsubEvent.Vetoed;
+import org.apache.aurora.scheduler.filter.SchedulingFilter.Veto;
+
/**
* Tracks vetoes against scheduling decisions and maintains the closest fit among all the vetoes
* for a task.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/periodic/GcExecutorLauncher.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/periodic/GcExecutorLauncher.java b/src/main/java/org/apache/aurora/scheduler/periodic/GcExecutorLauncher.java
index df15854..2c58349 100644
--- a/src/main/java/org/apache/aurora/scheduler/periodic/GcExecutorLauncher.java
+++ b/src/main/java/org/apache/aurora/scheduler/periodic/GcExecutorLauncher.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.periodic;
+package org.apache.aurora.scheduler.periodic;
import java.util.Set;
import java.util.UUID;
@@ -30,6 +30,25 @@ import com.google.common.cache.CacheBuilder;
import com.google.common.collect.Maps;
import com.google.protobuf.ByteString;
+import com.twitter.common.quantity.Amount;
+import com.twitter.common.quantity.Data;
+import com.twitter.common.quantity.Time;
+import com.twitter.common.stats.Stats;
+import com.twitter.common.util.Clock;
+import com.twitter.common.util.Random;
+
+import org.apache.aurora.Protobufs;
+import org.apache.aurora.codec.ThriftBinaryCodec;
+import org.apache.aurora.codec.ThriftBinaryCodec.CodingException;
+import org.apache.aurora.gen.comm.AdjustRetainedTasks;
+import org.apache.aurora.scheduler.TaskLauncher;
+import org.apache.aurora.scheduler.base.CommandUtil;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.base.Tasks;
+import org.apache.aurora.scheduler.configuration.Resources;
+import org.apache.aurora.scheduler.storage.Storage;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+
import org.apache.mesos.Protos.ExecutorID;
import org.apache.mesos.Protos.ExecutorInfo;
import org.apache.mesos.Protos.Offer;
@@ -38,24 +57,6 @@ import org.apache.mesos.Protos.TaskID;
import org.apache.mesos.Protos.TaskInfo;
import org.apache.mesos.Protos.TaskStatus;
-import com.twitter.aurora.Protobufs;
-import com.twitter.aurora.codec.ThriftBinaryCodec;
-import com.twitter.aurora.codec.ThriftBinaryCodec.CodingException;
-import com.twitter.aurora.gen.comm.AdjustRetainedTasks;
-import com.twitter.aurora.scheduler.TaskLauncher;
-import com.twitter.aurora.scheduler.base.CommandUtil;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.base.Tasks;
-import com.twitter.aurora.scheduler.configuration.Resources;
-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.Data;
-import com.twitter.common.quantity.Time;
-import com.twitter.common.stats.Stats;
-import com.twitter.common.util.Clock;
-import com.twitter.common.util.Random;
-
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/quota/QuotaComparisonResult.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/quota/QuotaComparisonResult.java b/src/main/java/org/apache/aurora/scheduler/quota/QuotaComparisonResult.java
index 2ba2db8..4f982c1 100644
--- a/src/main/java/org/apache/aurora/scheduler/quota/QuotaComparisonResult.java
+++ b/src/main/java/org/apache/aurora/scheduler/quota/QuotaComparisonResult.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.quota;
+package org.apache.aurora.scheduler.quota;
import com.google.common.annotations.VisibleForTesting;
-import com.twitter.aurora.scheduler.storage.entities.IQuota;
+import org.apache.aurora.scheduler.storage.entities.IQuota;
/**
* Calculates and formats detailed quota comparison result.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/quota/QuotaFilter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/quota/QuotaFilter.java b/src/main/java/org/apache/aurora/scheduler/quota/QuotaFilter.java
index cc67ba5..3bdd6c4 100644
--- a/src/main/java/org/apache/aurora/scheduler/quota/QuotaFilter.java
+++ b/src/main/java/org/apache/aurora/scheduler/quota/QuotaFilter.java
@@ -13,26 +13,26 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.quota;
+package org.apache.aurora.scheduler.quota;
import javax.inject.Inject;
import com.google.common.collect.Iterables;
-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.quota.QuotaManager.QuotaManagerImpl;
-import com.twitter.aurora.scheduler.state.JobFilter;
-import com.twitter.aurora.scheduler.storage.Storage;
-import com.twitter.aurora.scheduler.storage.entities.IJobConfiguration;
-import com.twitter.aurora.scheduler.storage.entities.IJobKey;
-import com.twitter.aurora.scheduler.storage.entities.IQuota;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
+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.quota.QuotaManager.QuotaManagerImpl;
+import org.apache.aurora.scheduler.state.JobFilter;
+import org.apache.aurora.scheduler.storage.Storage;
+import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
+import org.apache.aurora.scheduler.storage.entities.IQuota;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
import static com.google.common.base.Preconditions.checkNotNull;
-import static com.twitter.aurora.scheduler.quota.QuotaComparisonResult.Result.INSUFFICIENT_QUOTA;
+import static org.apache.aurora.scheduler.quota.QuotaComparisonResult.Result.INSUFFICIENT_QUOTA;
/**
* A filter that fails production jobs for roles that do not have sufficient quota to run them.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/quota/QuotaManager.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/quota/QuotaManager.java b/src/main/java/org/apache/aurora/scheduler/quota/QuotaManager.java
index a2abedb..0831146 100644
--- a/src/main/java/org/apache/aurora/scheduler/quota/QuotaManager.java
+++ b/src/main/java/org/apache/aurora/scheduler/quota/QuotaManager.java
@@ -13,18 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.quota;
+package org.apache.aurora.scheduler.quota;
import com.google.common.collect.Iterables;
import com.google.inject.Inject;
-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.Storage.StoreProvider;
-import com.twitter.aurora.scheduler.storage.Storage.Work;
-import com.twitter.aurora.scheduler.storage.Storage.Work.Quiet;
-import com.twitter.aurora.scheduler.storage.entities.IQuota;
+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.Storage.StoreProvider;
+import org.apache.aurora.scheduler.storage.Storage.Work;
+import org.apache.aurora.scheduler.storage.Storage.Work.Quiet;
+import org.apache.aurora.scheduler.storage.entities.IQuota;
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/quota/QuotaModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/quota/QuotaModule.java b/src/main/java/org/apache/aurora/scheduler/quota/QuotaModule.java
index 63e8888..57b9fd1 100644
--- a/src/main/java/org/apache/aurora/scheduler/quota/QuotaModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/quota/QuotaModule.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.quota;
+package org.apache.aurora.scheduler.quota;
import javax.inject.Singleton;
import com.google.inject.AbstractModule;
-import com.twitter.aurora.scheduler.quota.QuotaManager.QuotaManagerImpl;
-import com.twitter.aurora.scheduler.state.JobFilter;
-import com.twitter.aurora.scheduler.storage.Storage;
+import org.apache.aurora.scheduler.quota.QuotaManager.QuotaManagerImpl;
+import org.apache.aurora.scheduler.state.JobFilter;
+import org.apache.aurora.scheduler.storage.Storage;
/**
* Guice module for the quota package.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/quota/Quotas.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/quota/Quotas.java b/src/main/java/org/apache/aurora/scheduler/quota/Quotas.java
index f7b6591..1bb6ee8 100644
--- a/src/main/java/org/apache/aurora/scheduler/quota/Quotas.java
+++ b/src/main/java/org/apache/aurora/scheduler/quota/Quotas.java
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.quota;
+package org.apache.aurora.scheduler.quota;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.collect.Ordering;
-import com.twitter.aurora.gen.Quota;
-import com.twitter.aurora.scheduler.base.Tasks;
-import com.twitter.aurora.scheduler.storage.entities.IQuota;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
+import org.apache.aurora.gen.Quota;
+import org.apache.aurora.scheduler.base.Tasks;
+import org.apache.aurora.scheduler.storage.entities.IQuota;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
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/state/CronJobManager.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/state/CronJobManager.java b/src/main/java/org/apache/aurora/scheduler/state/CronJobManager.java
index d47c4af..c6c6fae 100644
--- a/src/main/java/org/apache/aurora/scheduler/state/CronJobManager.java
+++ b/src/main/java/org/apache/aurora/scheduler/state/CronJobManager.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.state;
+package org.apache.aurora.scheduler.state;
import java.util.Collections;
import java.util.Date;
@@ -41,27 +41,6 @@ import com.google.common.collect.Ordering;
import com.google.common.eventbus.Subscribe;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import org.apache.commons.lang.StringUtils;
-
-import com.twitter.aurora.gen.CronCollisionPolicy;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.scheduler.base.JobKeys;
-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.configuration.ConfigurationManager.TaskDescriptionException;
-import com.twitter.aurora.scheduler.configuration.SanitizedConfiguration;
-import com.twitter.aurora.scheduler.cron.CronException;
-import com.twitter.aurora.scheduler.cron.CronScheduler;
-import com.twitter.aurora.scheduler.events.PubsubEvent.EventSubscriber;
-import com.twitter.aurora.scheduler.events.PubsubEvent.StorageStarted;
-import com.twitter.aurora.scheduler.storage.Storage;
-import com.twitter.aurora.scheduler.storage.Storage.MutateWork;
-import com.twitter.aurora.scheduler.storage.Storage.Work;
-import com.twitter.aurora.scheduler.storage.entities.IJobConfiguration;
-import com.twitter.aurora.scheduler.storage.entities.IJobKey;
-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.args.Arg;
import com.twitter.common.args.CmdLine;
@@ -72,10 +51,32 @@ import com.twitter.common.quantity.Time;
import com.twitter.common.stats.Stats;
import com.twitter.common.util.BackoffHelper;
+import org.apache.aurora.gen.CronCollisionPolicy;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.scheduler.base.JobKeys;
+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.configuration.ConfigurationManager.TaskDescriptionException;
+import org.apache.aurora.scheduler.configuration.SanitizedConfiguration;
+import org.apache.aurora.scheduler.cron.CronException;
+import org.apache.aurora.scheduler.cron.CronScheduler;
+import org.apache.aurora.scheduler.events.PubsubEvent.EventSubscriber;
+import org.apache.aurora.scheduler.events.PubsubEvent.StorageStarted;
+import org.apache.aurora.scheduler.storage.Storage;
+import org.apache.aurora.scheduler.storage.Storage.MutateWork;
+import org.apache.aurora.scheduler.storage.Storage.Work;
+import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
+
+import org.apache.commons.lang.StringUtils;
+
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
-import static com.twitter.aurora.gen.ScheduleStatus.PENDING;
+import static org.apache.aurora.gen.ScheduleStatus.PENDING;
/**
* A job scheduler that receives jobs that should be run periodically on a cron schedule.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/state/ImmediateJobManager.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/state/ImmediateJobManager.java b/src/main/java/org/apache/aurora/scheduler/state/ImmediateJobManager.java
index a085d7d..0a46571 100644
--- a/src/main/java/org/apache/aurora/scheduler/state/ImmediateJobManager.java
+++ b/src/main/java/org/apache/aurora/scheduler/state/ImmediateJobManager.java
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.state;
+package org.apache.aurora.scheduler.state;
import java.util.logging.Logger;
import javax.inject.Inject;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.configuration.SanitizedConfiguration;
-import com.twitter.aurora.scheduler.storage.Storage;
-import com.twitter.aurora.scheduler.storage.entities.IJobKey;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.configuration.SanitizedConfiguration;
+import org.apache.aurora.scheduler.storage.Storage;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
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/state/JobFilter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/state/JobFilter.java b/src/main/java/org/apache/aurora/scheduler/state/JobFilter.java
index 3b8f5d8..a2c8a3e 100644
--- a/src/main/java/org/apache/aurora/scheduler/state/JobFilter.java
+++ b/src/main/java/org/apache/aurora/scheduler/state/JobFilter.java
@@ -1,10 +1,10 @@
-package com.twitter.aurora.scheduler.state;
+package org.apache.aurora.scheduler.state;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
-import com.twitter.aurora.scheduler.storage.entities.IJobConfiguration;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
+import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
/**
* An action that either accepts a configuration or rejects it with a reason.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/state/JobManager.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/state/JobManager.java b/src/main/java/org/apache/aurora/scheduler/state/JobManager.java
index 4cb4ff6..a9b4593 100644
--- a/src/main/java/org/apache/aurora/scheduler/state/JobManager.java
+++ b/src/main/java/org/apache/aurora/scheduler/state/JobManager.java
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.state;
+package org.apache.aurora.scheduler.state;
import java.util.Collections;
import javax.inject.Inject;
-import com.twitter.aurora.scheduler.base.ScheduleException;
-import com.twitter.aurora.scheduler.configuration.SanitizedConfiguration;
-import com.twitter.aurora.scheduler.storage.entities.IJobConfiguration;
-import com.twitter.aurora.scheduler.storage.entities.IJobKey;
+import org.apache.aurora.scheduler.base.ScheduleException;
+import org.apache.aurora.scheduler.configuration.SanitizedConfiguration;
+import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
/**
* Interface for a job manager. A job manager is responsible for deciding whether and when to
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/state/LockManager.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/state/LockManager.java b/src/main/java/org/apache/aurora/scheduler/state/LockManager.java
index 58d7b0e..0cf913a 100644
--- a/src/main/java/org/apache/aurora/scheduler/state/LockManager.java
+++ b/src/main/java/org/apache/aurora/scheduler/state/LockManager.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.state;
+package org.apache.aurora.scheduler.state;
import com.google.common.base.Optional;
-import com.twitter.aurora.scheduler.storage.entities.ILock;
-import com.twitter.aurora.scheduler.storage.entities.ILockKey;
+import org.apache.aurora.scheduler.storage.entities.ILock;
+import org.apache.aurora.scheduler.storage.entities.ILockKey;
/**
* Defines all {@link ILock} primitives like: acquire, release, validate.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/state/LockManagerImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/state/LockManagerImpl.java b/src/main/java/org/apache/aurora/scheduler/state/LockManagerImpl.java
index 4667f9f..0342783 100644
--- a/src/main/java/org/apache/aurora/scheduler/state/LockManagerImpl.java
+++ b/src/main/java/org/apache/aurora/scheduler/state/LockManagerImpl.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.state;
+package org.apache.aurora.scheduler.state;
import java.util.Date;
@@ -21,18 +21,19 @@ import javax.inject.Inject;
import com.google.common.base.Optional;
-import com.twitter.aurora.gen.Lock;
-import com.twitter.aurora.scheduler.base.JobKeys;
-import com.twitter.aurora.scheduler.storage.LockStore;
-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.Storage.StoreProvider;
-import com.twitter.aurora.scheduler.storage.Storage.Work;
-import com.twitter.aurora.scheduler.storage.entities.ILock;
-import com.twitter.aurora.scheduler.storage.entities.ILockKey;
import com.twitter.common.util.Clock;
+import org.apache.aurora.gen.Lock;
+import org.apache.aurora.scheduler.base.JobKeys;
+import org.apache.aurora.scheduler.storage.LockStore;
+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.Storage.StoreProvider;
+import org.apache.aurora.scheduler.storage.Storage.Work;
+import org.apache.aurora.scheduler.storage.entities.ILock;
+import org.apache.aurora.scheduler.storage.entities.ILockKey;
+
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/state/MaintenanceController.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/state/MaintenanceController.java b/src/main/java/org/apache/aurora/scheduler/state/MaintenanceController.java
index d447f52..d0addb5 100644
--- a/src/main/java/org/apache/aurora/scheduler/state/MaintenanceController.java
+++ b/src/main/java/org/apache/aurora/scheduler/state/MaintenanceController.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.state;
+package org.apache.aurora.scheduler.state;
import java.util.Set;
@@ -29,29 +29,30 @@ import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
import com.google.common.eventbus.Subscribe;
-import com.twitter.aurora.gen.HostAttributes;
-import com.twitter.aurora.gen.HostStatus;
-import com.twitter.aurora.gen.MaintenanceMode;
-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;
-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.storage.AttributeStore;
-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.Storage.StoreProvider;
-import com.twitter.aurora.scheduler.storage.Storage.Work;
import com.twitter.common.base.Closure;
import com.twitter.common.base.Closures;
+import org.apache.aurora.gen.HostAttributes;
+import org.apache.aurora.gen.HostStatus;
+import org.apache.aurora.gen.MaintenanceMode;
+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;
+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.storage.AttributeStore;
+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.Storage.StoreProvider;
+import org.apache.aurora.scheduler.storage.Storage.Work;
+
import static com.google.common.base.Preconditions.checkNotNull;
-import static com.twitter.aurora.gen.MaintenanceMode.DRAINED;
-import static com.twitter.aurora.gen.MaintenanceMode.DRAINING;
+import static org.apache.aurora.gen.MaintenanceMode.DRAINED;
+import static org.apache.aurora.gen.MaintenanceMode.DRAINING;
/**
* Logic that puts hosts into maintenance mode, and triggers draining of hosts upon request.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/state/SchedulerCore.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/state/SchedulerCore.java b/src/main/java/org/apache/aurora/scheduler/state/SchedulerCore.java
index 2db01c0..8ed257c 100644
--- a/src/main/java/org/apache/aurora/scheduler/state/SchedulerCore.java
+++ b/src/main/java/org/apache/aurora/scheduler/state/SchedulerCore.java
@@ -13,21 +13,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.state;
+package org.apache.aurora.scheduler.state;
import java.util.Set;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableSet;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.base.ScheduleException;
-import com.twitter.aurora.scheduler.configuration.ConfigurationManager.TaskDescriptionException;
-import com.twitter.aurora.scheduler.configuration.SanitizedConfiguration;
-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 org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.base.ScheduleException;
+import org.apache.aurora.scheduler.configuration.ConfigurationManager.TaskDescriptionException;
+import org.apache.aurora.scheduler.configuration.SanitizedConfiguration;
+import org.apache.aurora.scheduler.storage.entities.IAssignedTask;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
/**
* Scheduling core, stores scheduler state and makes decisions about which tasks to schedule when
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/state/SchedulerCoreImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/state/SchedulerCoreImpl.java b/src/main/java/org/apache/aurora/scheduler/state/SchedulerCoreImpl.java
index cf74e49..bf093a8 100644
--- a/src/main/java/org/apache/aurora/scheduler/state/SchedulerCoreImpl.java
+++ b/src/main/java/org/apache/aurora/scheduler/state/SchedulerCoreImpl.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.state;
+package org.apache.aurora.scheduler.state;
import java.util.Set;
@@ -32,31 +32,32 @@ import com.google.common.collect.Iterables;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.scheduler.TaskIdGenerator;
-import com.twitter.aurora.scheduler.base.JobKeys;
-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.configuration.ConfigurationManager.TaskDescriptionException;
-import com.twitter.aurora.scheduler.configuration.SanitizedConfiguration;
-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.IAssignedTask;
-import com.twitter.aurora.scheduler.storage.entities.IJobConfiguration;
-import com.twitter.aurora.scheduler.storage.entities.IJobKey;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
import com.twitter.common.args.Arg;
import com.twitter.common.args.CmdLine;
import com.twitter.common.args.constraints.Positive;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.scheduler.TaskIdGenerator;
+import org.apache.aurora.scheduler.base.JobKeys;
+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.configuration.ConfigurationManager.TaskDescriptionException;
+import org.apache.aurora.scheduler.configuration.SanitizedConfiguration;
+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.IAssignedTask;
+import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
+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.KILLING;
-import static com.twitter.aurora.gen.ScheduleStatus.RESTARTING;
-import static com.twitter.aurora.scheduler.base.Tasks.ACTIVE_STATES;
+import static org.apache.aurora.gen.ScheduleStatus.KILLING;
+import static org.apache.aurora.gen.ScheduleStatus.RESTARTING;
+import static org.apache.aurora.scheduler.base.Tasks.ACTIVE_STATES;
/**
* Implementation of the scheduler core.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/state/SideEffectStorage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/state/SideEffectStorage.java b/src/main/java/org/apache/aurora/scheduler/state/SideEffectStorage.java
index 23ffff9..c8ec631 100644
--- a/src/main/java/org/apache/aurora/scheduler/state/SideEffectStorage.java
+++ b/src/main/java/org/apache/aurora/scheduler/state/SideEffectStorage.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.state;
+package org.apache.aurora.scheduler.state;
import java.util.Queue;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -22,14 +22,15 @@ import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
-import com.twitter.aurora.scheduler.events.PubsubEvent;
-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.Storage.StorageException;
-import com.twitter.aurora.scheduler.storage.Storage.Work;
import com.twitter.common.base.Closure;
+import org.apache.aurora.scheduler.events.PubsubEvent;
+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.Storage.StorageException;
+import org.apache.aurora.scheduler.storage.Storage.Work;
+
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/state/StateManager.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/state/StateManager.java b/src/main/java/org/apache/aurora/scheduler/state/StateManager.java
index 099ec70..231787d 100644
--- a/src/main/java/org/apache/aurora/scheduler/state/StateManager.java
+++ b/src/main/java/org/apache/aurora/scheduler/state/StateManager.java
@@ -13,19 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.state;
+package org.apache.aurora.scheduler.state;
import java.util.Map;
import java.util.Set;
import com.google.common.base.Optional;
-import org.apache.mesos.Protos.SlaveID;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.storage.entities.IAssignedTask;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.storage.entities.IAssignedTask;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
+import org.apache.mesos.Protos.SlaveID;
/**
* Thin interface for the state manager.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/state/StateManagerImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/state/StateManagerImpl.java b/src/main/java/org/apache/aurora/scheduler/state/StateManagerImpl.java
index 37d13f4..d670601 100644
--- a/src/main/java/org/apache/aurora/scheduler/state/StateManagerImpl.java
+++ b/src/main/java/org/apache/aurora/scheduler/state/StateManagerImpl.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.state;
+package org.apache.aurora.scheduler.state;
import java.util.Comparator;
import java.util.Iterator;
@@ -39,39 +39,42 @@ import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.google.common.util.concurrent.Atomics;
-import org.apache.mesos.Protos.SlaveID;
-
-import com.twitter.aurora.gen.AssignedTask;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.scheduler.Driver;
-import com.twitter.aurora.scheduler.TaskIdGenerator;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.base.Tasks;
-import com.twitter.aurora.scheduler.events.PubsubEvent;
-import com.twitter.aurora.scheduler.state.SideEffectStorage.SideEffectWork;
-import com.twitter.aurora.scheduler.storage.Storage;
-import com.twitter.aurora.scheduler.storage.Storage.MutableStoreProvider;
-import com.twitter.aurora.scheduler.storage.Storage.StoreProvider;
-import com.twitter.aurora.scheduler.storage.Storage.Work;
-import com.twitter.aurora.scheduler.storage.TaskStore;
-import com.twitter.aurora.scheduler.storage.TaskStore.Mutable.TaskMutation;
-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.base.Closure;
import com.twitter.common.stats.Stats;
import com.twitter.common.util.Clock;
+import org.apache.aurora.gen.AssignedTask;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.scheduler.Driver;
+import org.apache.aurora.scheduler.TaskIdGenerator;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.base.Tasks;
+import org.apache.aurora.scheduler.events.PubsubEvent;
+import org.apache.aurora.scheduler.state.SideEffectStorage.SideEffectWork;
+import org.apache.aurora.scheduler.storage.Storage;
+import org.apache.aurora.scheduler.storage.Storage.MutableStoreProvider;
+import org.apache.aurora.scheduler.storage.Storage.StoreProvider;
+import org.apache.aurora.scheduler.storage.Storage.Work;
+import org.apache.aurora.scheduler.storage.TaskStore;
+import org.apache.aurora.scheduler.storage.TaskStore.Mutable.TaskMutation;
+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 org.apache.mesos.Protos.SlaveID;
+
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.Iterables.transform;
-import static com.twitter.aurora.gen.ScheduleStatus.INIT;
-import static com.twitter.aurora.gen.ScheduleStatus.PENDING;
-import static com.twitter.aurora.gen.ScheduleStatus.UNKNOWN;
-import static com.twitter.aurora.scheduler.state.SideEffectStorage.OperationFinalizer;
import static com.twitter.common.base.MorePreconditions.checkNotBlank;
+import static org.apache.aurora.gen.ScheduleStatus.INIT;
+import static org.apache.aurora.gen.ScheduleStatus.PENDING;
+import static org.apache.aurora.gen.ScheduleStatus.UNKNOWN;
+import static org.apache.aurora.scheduler.state.SideEffectStorage.OperationFinalizer;
+
+
/**
* Manager of all persistence-related operations for the scheduler. Acts as a controller for
* persisted state machine transitions, and their side-effects.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/state/StateModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/state/StateModule.java b/src/main/java/org/apache/aurora/scheduler/state/StateModule.java
index 870d085..85ce6bc 100644
--- a/src/main/java/org/apache/aurora/scheduler/state/StateModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/state/StateModule.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.state;
+package org.apache.aurora.scheduler.state;
import javax.inject.Singleton;
@@ -21,12 +21,12 @@ import com.google.common.annotations.VisibleForTesting;
import com.google.inject.AbstractModule;
import com.google.inject.Binder;
-import com.twitter.aurora.scheduler.MesosTaskFactory;
-import com.twitter.aurora.scheduler.MesosTaskFactory.MesosTaskFactoryImpl;
-import com.twitter.aurora.scheduler.events.PubsubEventModule;
-import com.twitter.aurora.scheduler.state.MaintenanceController.MaintenanceControllerImpl;
-import com.twitter.aurora.scheduler.state.TaskAssigner.TaskAssignerImpl;
-import com.twitter.aurora.scheduler.state.UUIDGenerator.UUIDGeneratorImpl;
+import org.apache.aurora.scheduler.MesosTaskFactory;
+import org.apache.aurora.scheduler.MesosTaskFactory.MesosTaskFactoryImpl;
+import org.apache.aurora.scheduler.events.PubsubEventModule;
+import org.apache.aurora.scheduler.state.MaintenanceController.MaintenanceControllerImpl;
+import org.apache.aurora.scheduler.state.TaskAssigner.TaskAssignerImpl;
+import org.apache.aurora.scheduler.state.UUIDGenerator.UUIDGeneratorImpl;
/**
* Binding module for scheduling logic and higher-level state management.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/state/TaskAssigner.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/state/TaskAssigner.java b/src/main/java/org/apache/aurora/scheduler/state/TaskAssigner.java
index c37feae..257273d 100644
--- a/src/main/java/org/apache/aurora/scheduler/state/TaskAssigner.java
+++ b/src/main/java/org/apache/aurora/scheduler/state/TaskAssigner.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.state;
+package org.apache.aurora.scheduler.state;
import java.util.Set;
import java.util.logging.Logger;
@@ -22,18 +22,18 @@ import javax.inject.Inject;
import com.google.common.base.Optional;
+import org.apache.aurora.scheduler.MesosTaskFactory;
+import org.apache.aurora.scheduler.ResourceSlot;
+import org.apache.aurora.scheduler.base.Tasks;
+import org.apache.aurora.scheduler.configuration.Resources;
+import org.apache.aurora.scheduler.filter.SchedulingFilter;
+import org.apache.aurora.scheduler.filter.SchedulingFilter.Veto;
+import org.apache.aurora.scheduler.storage.entities.IAssignedTask;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+
import org.apache.mesos.Protos.Offer;
import org.apache.mesos.Protos.TaskInfo;
-import com.twitter.aurora.scheduler.MesosTaskFactory;
-import com.twitter.aurora.scheduler.ResourceSlot;
-import com.twitter.aurora.scheduler.base.Tasks;
-import com.twitter.aurora.scheduler.configuration.Resources;
-import com.twitter.aurora.scheduler.filter.SchedulingFilter;
-import com.twitter.aurora.scheduler.filter.SchedulingFilter.Veto;
-import com.twitter.aurora.scheduler.storage.entities.IAssignedTask;
-import com.twitter.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/state/TaskStateMachine.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/state/TaskStateMachine.java b/src/main/java/org/apache/aurora/scheduler/state/TaskStateMachine.java
index f32fd14..9640532 100644
--- a/src/main/java/org/apache/aurora/scheduler/state/TaskStateMachine.java
+++ b/src/main/java/org/apache/aurora/scheduler/state/TaskStateMachine.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.state;
+package org.apache.aurora.scheduler.state;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -31,12 +31,6 @@ import com.google.common.base.Supplier;
import com.google.common.base.Suppliers;
import com.google.common.base.Throwables;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.TaskEvent;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
import com.twitter.common.base.Closure;
import com.twitter.common.base.Closures;
import com.twitter.common.base.Command;
@@ -47,6 +41,13 @@ import com.twitter.common.util.StateMachine;
import com.twitter.common.util.StateMachine.Rule;
import com.twitter.common.util.StateMachine.Transition;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.TaskEvent;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+
+import org.apache.commons.lang.builder.HashCodeBuilder;
+
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/state/UUIDGenerator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/state/UUIDGenerator.java b/src/main/java/org/apache/aurora/scheduler/state/UUIDGenerator.java
index d8de19c..61f981c 100644
--- a/src/main/java/org/apache/aurora/scheduler/state/UUIDGenerator.java
+++ b/src/main/java/org/apache/aurora/scheduler/state/UUIDGenerator.java
@@ -1,4 +1,4 @@
-package com.twitter.aurora.scheduler.state;
+package org.apache.aurora.scheduler.state;
import java.util.UUID;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/state/WorkCommand.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/state/WorkCommand.java b/src/main/java/org/apache/aurora/scheduler/state/WorkCommand.java
index 6c5637d..ba47dca 100644
--- a/src/main/java/org/apache/aurora/scheduler/state/WorkCommand.java
+++ b/src/main/java/org/apache/aurora/scheduler/state/WorkCommand.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.state;
+package org.apache.aurora.scheduler.state;
/**
* Descriptions of the different types of external work commands that task state machines may
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/stats/AsyncStatsModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/stats/AsyncStatsModule.java b/src/main/java/org/apache/aurora/scheduler/stats/AsyncStatsModule.java
index a52c5c5..6e383e5 100644
--- a/src/main/java/org/apache/aurora/scheduler/stats/AsyncStatsModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/stats/AsyncStatsModule.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.stats;
+package org.apache.aurora.scheduler.stats;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
@@ -30,13 +30,6 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.google.inject.AbstractModule;
import com.google.inject.BindingAnnotation;
-import org.apache.mesos.Protos.Offer;
-
-import com.twitter.aurora.gen.Quota;
-import com.twitter.aurora.scheduler.async.OfferQueue;
-import com.twitter.aurora.scheduler.configuration.Resources;
-import com.twitter.aurora.scheduler.stats.SlotSizeCounter.ResourceSlotProvider;
-import com.twitter.aurora.scheduler.storage.entities.IQuota;
import com.twitter.common.application.modules.LifecycleModule;
import com.twitter.common.args.Arg;
import com.twitter.common.args.CmdLine;
@@ -45,6 +38,14 @@ import com.twitter.common.quantity.Amount;
import com.twitter.common.quantity.Data;
import com.twitter.common.quantity.Time;
+import org.apache.aurora.gen.Quota;
+import org.apache.aurora.scheduler.async.OfferQueue;
+import org.apache.aurora.scheduler.configuration.Resources;
+import org.apache.aurora.scheduler.stats.SlotSizeCounter.ResourceSlotProvider;
+import org.apache.aurora.scheduler.storage.entities.IQuota;
+
+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;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/stats/CachedCounters.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/stats/CachedCounters.java b/src/main/java/org/apache/aurora/scheduler/stats/CachedCounters.java
index 81d6811..ef9e5dc 100644
--- a/src/main/java/org/apache/aurora/scheduler/stats/CachedCounters.java
+++ b/src/main/java/org/apache/aurora/scheduler/stats/CachedCounters.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.stats;
+package org.apache.aurora.scheduler.stats;
import java.util.concurrent.atomic.AtomicLong;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/stats/ResourceCounter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/stats/ResourceCounter.java b/src/main/java/org/apache/aurora/scheduler/stats/ResourceCounter.java
index 7b96e86..5962a56 100644
--- a/src/main/java/org/apache/aurora/scheduler/stats/ResourceCounter.java
+++ b/src/main/java/org/apache/aurora/scheduler/stats/ResourceCounter.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.stats;
+package org.apache.aurora.scheduler.stats;
import java.util.Arrays;
import java.util.List;
@@ -30,15 +30,15 @@ import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import com.google.common.collect.Iterables;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.base.Tasks;
-import com.twitter.aurora.scheduler.configuration.ConfigurationManager;
-import com.twitter.aurora.scheduler.storage.Storage;
-import com.twitter.aurora.scheduler.storage.Storage.StorageException;
-import com.twitter.aurora.scheduler.storage.Storage.StoreProvider;
-import com.twitter.aurora.scheduler.storage.Storage.Work;
-import com.twitter.aurora.scheduler.storage.entities.IQuota;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.base.Tasks;
+import org.apache.aurora.scheduler.configuration.ConfigurationManager;
+import org.apache.aurora.scheduler.storage.Storage;
+import org.apache.aurora.scheduler.storage.Storage.StorageException;
+import org.apache.aurora.scheduler.storage.Storage.StoreProvider;
+import org.apache.aurora.scheduler.storage.Storage.Work;
+import org.apache.aurora.scheduler.storage.entities.IQuota;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
/**
* Computes aggregate metrics about resource allocation and consumption in the scheduler.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/stats/SlotSizeCounter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/stats/SlotSizeCounter.java b/src/main/java/org/apache/aurora/scheduler/stats/SlotSizeCounter.java
index 6c0bf48..e44de7e 100644
--- a/src/main/java/org/apache/aurora/scheduler/stats/SlotSizeCounter.java
+++ b/src/main/java/org/apache/aurora/scheduler/stats/SlotSizeCounter.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.stats;
+package org.apache.aurora.scheduler.stats;
import java.util.Map;
@@ -24,9 +24,9 @@ import com.google.common.base.Function;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableMap;
-import com.twitter.aurora.gen.Quota;
-import com.twitter.aurora.scheduler.quota.Quotas;
-import com.twitter.aurora.scheduler.storage.entities.IQuota;
+import org.apache.aurora.gen.Quota;
+import org.apache.aurora.scheduler.quota.Quotas;
+import org.apache.aurora.scheduler.storage.entities.IQuota;
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/stats/TaskStatCalculator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/stats/TaskStatCalculator.java b/src/main/java/org/apache/aurora/scheduler/stats/TaskStatCalculator.java
index db34125..6bd89db 100644
--- a/src/main/java/org/apache/aurora/scheduler/stats/TaskStatCalculator.java
+++ b/src/main/java/org/apache/aurora/scheduler/stats/TaskStatCalculator.java
@@ -1,13 +1,13 @@
-package com.twitter.aurora.scheduler.stats;
+package org.apache.aurora.scheduler.stats;
import java.util.logging.Logger;
import javax.inject.Inject;
-import com.twitter.aurora.scheduler.stats.AsyncStatsModule.StatUpdater;
-import com.twitter.aurora.scheduler.stats.ResourceCounter.GlobalMetric;
-import com.twitter.aurora.scheduler.stats.ResourceCounter.Metric;
-import com.twitter.aurora.scheduler.storage.Storage.StorageException;
+import org.apache.aurora.scheduler.stats.AsyncStatsModule.StatUpdater;
+import org.apache.aurora.scheduler.stats.ResourceCounter.GlobalMetric;
+import org.apache.aurora.scheduler.stats.ResourceCounter.Metric;
+import org.apache.aurora.scheduler.storage.Storage.StorageException;
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/storage/AttributeStore.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/AttributeStore.java b/src/main/java/org/apache/aurora/scheduler/storage/AttributeStore.java
index 35c666c..1bc9289 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/AttributeStore.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/AttributeStore.java
@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage;
+package org.apache.aurora.scheduler.storage;
import java.util.Set;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList;
-import com.twitter.aurora.gen.Attribute;
-import com.twitter.aurora.gen.HostAttributes;
-import com.twitter.aurora.gen.MaintenanceMode;
-import com.twitter.aurora.scheduler.storage.Storage.StoreProvider;
+import org.apache.aurora.gen.Attribute;
+import org.apache.aurora.gen.HostAttributes;
+import org.apache.aurora.gen.MaintenanceMode;
+import org.apache.aurora.scheduler.storage.Storage.StoreProvider;
/**
* Storage interface for host attributes.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/storage/CallOrderEnforcingStorage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/CallOrderEnforcingStorage.java b/src/main/java/org/apache/aurora/scheduler/storage/CallOrderEnforcingStorage.java
index c71a114..7d10a6a 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/CallOrderEnforcingStorage.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/CallOrderEnforcingStorage.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage;
+package org.apache.aurora.scheduler.storage;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -27,12 +27,13 @@ import com.google.inject.BindingAnnotation;
import com.google.inject.Module;
import com.google.inject.PrivateModule;
-import com.twitter.aurora.scheduler.events.PubsubEvent.Interceptors.Event;
-import com.twitter.aurora.scheduler.events.PubsubEvent.Interceptors.SendNotification;
-import com.twitter.aurora.scheduler.storage.Storage.MutateWork.NoResult.Quiet;
-import com.twitter.aurora.scheduler.storage.Storage.NonVolatileStorage;
import com.twitter.common.util.StateMachine;
+import org.apache.aurora.scheduler.events.PubsubEvent.Interceptors.Event;
+import org.apache.aurora.scheduler.events.PubsubEvent.Interceptors.SendNotification;
+import org.apache.aurora.scheduler.storage.Storage.MutateWork.NoResult.Quiet;
+import org.apache.aurora.scheduler.storage.Storage.NonVolatileStorage;
+
/**
* A non-volatile storage wrapper that enforces method call ordering.
*/
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/storage/DistributedSnapshotStore.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/DistributedSnapshotStore.java b/src/main/java/org/apache/aurora/scheduler/storage/DistributedSnapshotStore.java
index cba6303..3f2bdcf 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/DistributedSnapshotStore.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/DistributedSnapshotStore.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage;
+package org.apache.aurora.scheduler.storage;
-import com.twitter.aurora.codec.ThriftBinaryCodec.CodingException;
-import com.twitter.aurora.gen.storage.Snapshot;
+import org.apache.aurora.codec.ThriftBinaryCodec.CodingException;
+import org.apache.aurora.gen.storage.Snapshot;
/**
* A distributed snapshot store that supports persisting globally-visible snapshots.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/storage/ForwardingStore.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/ForwardingStore.java b/src/main/java/org/apache/aurora/scheduler/storage/ForwardingStore.java
index 1a6a849..4154f08 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/ForwardingStore.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/ForwardingStore.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage;
+package org.apache.aurora.scheduler.storage;
import java.util.Map;
import java.util.Set;
@@ -24,16 +24,16 @@ import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableSet;
-import com.twitter.aurora.gen.HostAttributes;
-import com.twitter.aurora.gen.MaintenanceMode;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.storage.entities.IJobConfiguration;
-import com.twitter.aurora.scheduler.storage.entities.IJobKey;
-import com.twitter.aurora.scheduler.storage.entities.ILock;
-import com.twitter.aurora.scheduler.storage.entities.ILockKey;
-import com.twitter.aurora.scheduler.storage.entities.IQuota;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
+import org.apache.aurora.gen.HostAttributes;
+import org.apache.aurora.gen.MaintenanceMode;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
+import org.apache.aurora.scheduler.storage.entities.ILock;
+import org.apache.aurora.scheduler.storage.entities.ILockKey;
+import org.apache.aurora.scheduler.storage.entities.IQuota;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
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/storage/JobStore.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/JobStore.java b/src/main/java/org/apache/aurora/scheduler/storage/JobStore.java
index 7092e91..1bd3961 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/JobStore.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/JobStore.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage;
+package org.apache.aurora.scheduler.storage;
import java.util.Set;
import com.google.common.base.Optional;
-import com.twitter.aurora.scheduler.storage.entities.IJobConfiguration;
-import com.twitter.aurora.scheduler.storage.entities.IJobKey;
+import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
/**
* Stores job configuration data.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/storage/LockStore.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/LockStore.java b/src/main/java/org/apache/aurora/scheduler/storage/LockStore.java
index 13d7317..c30815a 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/LockStore.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/LockStore.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage;
+package org.apache.aurora.scheduler.storage;
import java.util.Set;
import com.google.common.base.Optional;
-import com.twitter.aurora.scheduler.storage.entities.ILock;
-import com.twitter.aurora.scheduler.storage.entities.ILockKey;
+import org.apache.aurora.scheduler.storage.entities.ILock;
+import org.apache.aurora.scheduler.storage.entities.ILockKey;
/**
* Stores all lock-related data and defines methods for saving, deleting and fetching locks.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/storage/QuotaStore.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/QuotaStore.java b/src/main/java/org/apache/aurora/scheduler/storage/QuotaStore.java
index ba8116b..87b362d 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/QuotaStore.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/QuotaStore.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage;
+package org.apache.aurora.scheduler.storage;
import java.util.Map;
import com.google.common.base.Optional;
-import com.twitter.aurora.scheduler.storage.entities.IQuota;
+import org.apache.aurora.scheduler.storage.entities.IQuota;
/**
* Point of storage for quota records.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/storage/ReadWriteLockManager.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/ReadWriteLockManager.java b/src/main/java/org/apache/aurora/scheduler/storage/ReadWriteLockManager.java
index 58d7a68..2caa947 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/ReadWriteLockManager.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/ReadWriteLockManager.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage;
+package org.apache.aurora.scheduler.storage;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/storage/SchedulerStore.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/SchedulerStore.java b/src/main/java/org/apache/aurora/scheduler/storage/SchedulerStore.java
index 504b90b..85bcd4d 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/SchedulerStore.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/SchedulerStore.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage;
+package org.apache.aurora.scheduler.storage;
import javax.annotation.Nullable;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/storage/SnapshotStore.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/SnapshotStore.java b/src/main/java/org/apache/aurora/scheduler/storage/SnapshotStore.java
index c775207..e3f5f46 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/SnapshotStore.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/SnapshotStore.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage;
+package org.apache.aurora.scheduler.storage;
/**
* Storage mechanism that is able to create complete snapshots of the local storage system state
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/storage/Storage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/Storage.java b/src/main/java/org/apache/aurora/scheduler/storage/Storage.java
index fdc9ae7..d6ea27f 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/Storage.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/Storage.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage;
+package org.apache.aurora.scheduler.storage;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -24,10 +24,10 @@ import com.google.common.base.Optional;
import com.google.common.collect.ImmutableSet;
import com.google.inject.BindingAnnotation;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.base.SchedulerException;
-import com.twitter.aurora.scheduler.storage.entities.IQuota;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.base.SchedulerException;
+import org.apache.aurora.scheduler.storage.entities.IQuota;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
/**
* Manages scheduler storage operations providing an interface to perform atomic changes.
@@ -52,7 +52,7 @@ public interface Storage {
* <p>
* This is labeled as unsafe, since it's rare that a caller should be using this. In most
* cases, mutations to the task store should be done through
- * {@link com.twitter.aurora.scheduler.state.StateManager}.
+ * {@link org.apache.aurora.scheduler.state.StateManager}.
* <p>
* TODO(William Farner): Come up with a way to restrict access to this interface. As it stands,
* it's trivial for an unsuspecting caller to modify the task store directly and subvert the
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/storage/StorageBackfill.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/StorageBackfill.java b/src/main/java/org/apache/aurora/scheduler/storage/StorageBackfill.java
index df5b603..405d543 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/StorageBackfill.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/StorageBackfill.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage;
+package org.apache.aurora.scheduler.storage;
import java.util.Set;
import java.util.concurrent.atomic.AtomicLong;
@@ -23,22 +23,23 @@ import com.google.common.collect.FluentIterable;
import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
-import com.twitter.aurora.gen.JobConfiguration;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.gen.TaskEvent;
-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.configuration.ConfigurationManager;
-import com.twitter.aurora.scheduler.storage.Storage.MutableStoreProvider;
-import com.twitter.aurora.scheduler.storage.TaskStore.Mutable.TaskMutation;
-import com.twitter.aurora.scheduler.storage.entities.IJobConfiguration;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
import com.twitter.common.stats.Stats;
import com.twitter.common.util.Clock;
+import org.apache.aurora.gen.JobConfiguration;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.gen.TaskEvent;
+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.configuration.ConfigurationManager;
+import org.apache.aurora.scheduler.storage.Storage.MutableStoreProvider;
+import org.apache.aurora.scheduler.storage.TaskStore.Mutable.TaskMutation;
+import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+
/**
* Utility class to contain and perform storage backfill operations.
*/
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/storage/TaskStore.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/TaskStore.java b/src/main/java/org/apache/aurora/scheduler/storage/TaskStore.java
index 02e5096..8af2cf8 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/TaskStore.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/TaskStore.java
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage;
+package org.apache.aurora.scheduler.storage;
import java.util.Set;
import com.google.common.base.Function;
import com.google.common.collect.ImmutableSet;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
/**
* Stores all tasks configured with the scheduler.
@@ -31,7 +31,7 @@ public interface TaskStore {
/**
* Fetches a read-only view of tasks matching a query and filters. Intended for use with a
- * {@link com.twitter.aurora.scheduler.base.Query.Builder}.
+ * {@link org.apache.aurora.scheduler.base.Query.Builder}.
*
* @param query Builder of the query to identify tasks with.
* @return A read-only view of matching tasks.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/storage/backup/BackupModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/backup/BackupModule.java b/src/main/java/org/apache/aurora/scheduler/storage/backup/BackupModule.java
index b6beba3..709af9d 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/backup/BackupModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/backup/BackupModule.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage.backup;
+package org.apache.aurora.scheduler.storage.backup;
import java.io.File;
import java.util.logging.Logger;
@@ -27,12 +27,6 @@ import com.google.inject.PrivateModule;
import com.google.inject.Provides;
import com.google.inject.TypeLiteral;
-import com.twitter.aurora.gen.storage.Snapshot;
-import com.twitter.aurora.scheduler.storage.SnapshotStore;
-import com.twitter.aurora.scheduler.storage.backup.Recovery.RecoveryImpl;
-import com.twitter.aurora.scheduler.storage.backup.StorageBackup.StorageBackupImpl;
-import com.twitter.aurora.scheduler.storage.backup.StorageBackup.StorageBackupImpl.BackupConfig;
-import com.twitter.aurora.scheduler.storage.backup.TemporaryStorage.TemporaryStorageFactory;
import com.twitter.common.application.Lifecycle;
import com.twitter.common.args.Arg;
import com.twitter.common.args.CmdLine;
@@ -41,6 +35,13 @@ import com.twitter.common.base.Command;
import com.twitter.common.quantity.Amount;
import com.twitter.common.quantity.Time;
+import org.apache.aurora.gen.storage.Snapshot;
+import org.apache.aurora.scheduler.storage.SnapshotStore;
+import org.apache.aurora.scheduler.storage.backup.Recovery.RecoveryImpl;
+import org.apache.aurora.scheduler.storage.backup.StorageBackup.StorageBackupImpl;
+import org.apache.aurora.scheduler.storage.backup.StorageBackup.StorageBackupImpl.BackupConfig;
+import org.apache.aurora.scheduler.storage.backup.TemporaryStorage.TemporaryStorageFactory;
+
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/storage/backup/Recovery.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/backup/Recovery.java b/src/main/java/org/apache/aurora/scheduler/storage/backup/Recovery.java
index 4e91342..c2c5913 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/backup/Recovery.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/backup/Recovery.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage.backup;
+package org.apache.aurora.scheduler.storage.backup;
import java.io.File;
import java.io.IOException;
@@ -28,17 +28,18 @@ import com.google.common.collect.ImmutableSet;
import com.google.common.io.Files;
import com.google.common.util.concurrent.Atomics;
-import com.twitter.aurora.codec.ThriftBinaryCodec;
-import com.twitter.aurora.codec.ThriftBinaryCodec.CodingException;
-import com.twitter.aurora.gen.storage.Snapshot;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.storage.DistributedSnapshotStore;
-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.base.Command;
+import org.apache.aurora.codec.ThriftBinaryCodec;
+import org.apache.aurora.codec.ThriftBinaryCodec.CodingException;
+import org.apache.aurora.gen.storage.Snapshot;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.storage.DistributedSnapshotStore;
+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 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/storage/backup/StorageBackup.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/backup/StorageBackup.java b/src/main/java/org/apache/aurora/scheduler/storage/backup/StorageBackup.java
index 3faeb1f..807d64f 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/backup/StorageBackup.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/backup/StorageBackup.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage.backup;
+package org.apache.aurora.scheduler.storage.backup;
import java.io.File;
import java.io.FilenameFilter;
@@ -37,15 +37,16 @@ import com.google.common.collect.Ordering;
import com.google.common.io.Files;
import com.google.inject.BindingAnnotation;
-import com.twitter.aurora.codec.ThriftBinaryCodec;
-import com.twitter.aurora.codec.ThriftBinaryCodec.CodingException;
-import com.twitter.aurora.gen.storage.Snapshot;
-import com.twitter.aurora.scheduler.storage.SnapshotStore;
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.codec.ThriftBinaryCodec;
+import org.apache.aurora.codec.ThriftBinaryCodec.CodingException;
+import org.apache.aurora.gen.storage.Snapshot;
+import org.apache.aurora.scheduler.storage.SnapshotStore;
+
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.PARAMETER;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/storage/backup/TemporaryStorage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/backup/TemporaryStorage.java b/src/main/java/org/apache/aurora/scheduler/storage/backup/TemporaryStorage.java
index e0906fe..0e1a75b 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/backup/TemporaryStorage.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/backup/TemporaryStorage.java
@@ -13,27 +13,28 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage.backup;
+package org.apache.aurora.scheduler.storage.backup;
import java.util.Set;
import com.google.common.base.Function;
import com.google.common.collect.FluentIterable;
-import com.twitter.aurora.gen.storage.Snapshot;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.base.Tasks;
-import com.twitter.aurora.scheduler.storage.SnapshotStore;
-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.Storage.StoreProvider;
-import com.twitter.aurora.scheduler.storage.Storage.Work;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.log.SnapshotStoreImpl;
-import com.twitter.aurora.scheduler.storage.mem.MemStorage;
import com.twitter.common.util.testing.FakeClock;
+import org.apache.aurora.gen.storage.Snapshot;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.base.Tasks;
+import org.apache.aurora.scheduler.storage.SnapshotStore;
+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.Storage.StoreProvider;
+import org.apache.aurora.scheduler.storage.Storage.Work;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+import org.apache.aurora.scheduler.storage.log.SnapshotStoreImpl;
+import org.apache.aurora.scheduler.storage.mem.MemStorage;
+
/**
* A short-lived in-memory storage system that can be converted to a {@link Snapshot}.
*/
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/storage/log/Entries.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/log/Entries.java b/src/main/java/org/apache/aurora/scheduler/storage/log/Entries.java
index 74e8c07..667e7f2 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/log/Entries.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/log/Entries.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage.log;
+package org.apache.aurora.scheduler.storage.log;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -27,12 +27,13 @@ import java.util.zip.InflaterInputStream;
import com.google.common.base.Preconditions;
import com.google.common.io.ByteStreams;
-import com.twitter.aurora.codec.ThriftBinaryCodec;
-import com.twitter.aurora.codec.ThriftBinaryCodec.CodingException;
-import com.twitter.aurora.gen.storage.LogEntry;
-import com.twitter.aurora.gen.storage.LogEntry._Fields;
import com.twitter.common.stats.Stats;
+import org.apache.aurora.codec.ThriftBinaryCodec;
+import org.apache.aurora.codec.ThriftBinaryCodec.CodingException;
+import org.apache.aurora.gen.storage.LogEntry;
+import org.apache.aurora.gen.storage.LogEntry._Fields;
+
/**
* Utility class for working with log entries.
*/
[9/9] git commit: Refactors java and python code to the Apache
namespace.
Posted by wf...@apache.org.
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 <jf...@apache.org>
Authored: Tue Dec 31 13:20:57 2013 -0800
Committer: Bill Farner <wf...@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;
/**
[4/9] Refactors java and python code to the Apache namespace.
Posted by wf...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/thermos/monitoring/garbage.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/monitoring/garbage.py b/src/main/python/apache/thermos/monitoring/garbage.py
index 4ac0d3a..30364bb 100644
--- a/src/main/python/apache/thermos/monitoring/garbage.py
+++ b/src/main/python/apache/thermos/monitoring/garbage.py
@@ -7,8 +7,8 @@ import time
from twitter.common.dirutil import safe_delete, safe_rmtree, safe_bsize
from twitter.common.lang import Interface
from twitter.common.quantity import Amount, Data, Time
-from twitter.thermos.common.ckpt import CheckpointDispatcher
-from twitter.thermos.common.path import TaskPath
+from apache.thermos.common.ckpt import CheckpointDispatcher
+from apache.thermos.common.path import TaskPath
from .detector import TaskDetector
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/thermos/monitoring/monitor.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/monitoring/monitor.py b/src/main/python/apache/thermos/monitoring/monitor.py
index 5af67fe..60c4e0d 100644
--- a/src/main/python/apache/thermos/monitoring/monitor.py
+++ b/src/main/python/apache/thermos/monitoring/monitor.py
@@ -15,9 +15,9 @@ import threading
from twitter.common import log
from twitter.common.recordio import ThriftRecordReader
-from twitter.thermos.common.ckpt import CheckpointDispatcher
+from apache.thermos.common.ckpt import CheckpointDispatcher
-from gen.twitter.thermos.ttypes import (
+from gen.apache.thermos.ttypes import (
ProcessState,
RunnerCkpt,
RunnerState,
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/thermos/observer/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/observer/BUILD b/src/main/python/apache/thermos/observer/BUILD
index 00ea9cb..8a27396 100644
--- a/src/main/python/apache/thermos/observer/BUILD
+++ b/src/main/python/apache/thermos/observer/BUILD
@@ -6,9 +6,9 @@ python_library(
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/lang'),
pants('aurora/twitterdeps/src/python/twitter/common/log'),
- pants('src/main/python/twitter/thermos:pystachio'),
- pants('src/main/python/twitter/thermos/common:ckpt'),
- pants('src/main/python/twitter/thermos/config'),
+ pants('src/main/python/apache/thermos:pystachio'),
+ pants('src/main/python/apache/thermos/common:ckpt'),
+ pants('src/main/python/apache/thermos/config'),
]
)
@@ -21,12 +21,12 @@ python_library(
pants('aurora/twitterdeps/src/python/twitter/common/lang'),
pants('aurora/twitterdeps/src/python/twitter/common/log'),
pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
- pants('src/main/python/twitter/thermos/common:path'),
- pants('src/main/python/twitter/thermos/monitoring:detector'),
- pants('src/main/python/twitter/thermos/monitoring:monitor'),
- pants('src/main/python/twitter/thermos/monitoring:process'),
- pants('src/main/python/twitter/thermos/monitoring:resource'),
- pants('src/main/thrift/com/twitter/thermos:py-thrift'),
+ pants('src/main/python/apache/thermos/common:path'),
+ pants('src/main/python/apache/thermos/monitoring:detector'),
+ pants('src/main/python/apache/thermos/monitoring:monitor'),
+ pants('src/main/python/apache/thermos/monitoring:process'),
+ pants('src/main/python/apache/thermos/monitoring:resource'),
+ pants('src/main/thrift/org/apache/thermos:py-thrift'),
]
)
@@ -34,18 +34,18 @@ python_library(
name = 'observer',
dependencies = [
pants(':task_observer'),
- pants('src/main/python/twitter/thermos/observer/http:http_observer'),
+ pants('src/main/python/apache/thermos/observer/http:http_observer'),
# covering libraries
- pants('src/main/python/twitter/thermos/common'),
- pants('src/main/python/twitter/thermos/config'),
- pants('src/main/python/twitter/thermos/monitoring'),
+ pants('src/main/python/apache/thermos/common'),
+ pants('src/main/python/apache/thermos/config'),
+ pants('src/main/python/apache/thermos/monitoring'),
],
provides = setup_py(
- name = 'twitter.thermos.observer',
+ name = 'apache.thermos.observer',
version = open(os.path.join(get_buildroot(), '.auroraversion')).read().strip().lower(),
description = 'The Thermos observer web interface.',
).with_binaries(
- thermos_observer = pants('src/main/python/twitter/thermos/observer/bin:thermos_observer'),
+ thermos_observer = pants('src/main/python/apache/thermos/observer/bin:thermos_observer'),
)
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/thermos/observer/bin/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/observer/bin/BUILD b/src/main/python/apache/thermos/observer/bin/BUILD
index 26eb148..9770501 100644
--- a/src/main/python/apache/thermos/observer/bin/BUILD
+++ b/src/main/python/apache/thermos/observer/bin/BUILD
@@ -1,14 +1,14 @@
python_binary(
name = 'thermos_observer',
source = 'thermos_observer.py',
- entry_point = 'twitter.thermos.observer.bin.thermos_observer:proxy_main',
+ entry_point = 'apache.thermos.observer.bin.thermos_observer:proxy_main',
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/app'),
pants('aurora/twitterdeps/src/python/twitter/common/exceptions'),
pants('aurora/twitterdeps/src/python/twitter/common/http'),
- pants('src/main/python/twitter/thermos:cherrypy'),
- pants('src/main/python/twitter/thermos/common:path'),
- pants('src/main/python/twitter/thermos/observer/http:http_observer'),
- pants('src/main/python/twitter/thermos/observer:task_observer'),
+ pants('src/main/python/apache/thermos:cherrypy'),
+ pants('src/main/python/apache/thermos/common:path'),
+ pants('src/main/python/apache/thermos/observer/http:http_observer'),
+ pants('src/main/python/apache/thermos/observer:task_observer'),
],
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/thermos/observer/bin/thermos_observer.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/observer/bin/thermos_observer.py b/src/main/python/apache/thermos/observer/bin/thermos_observer.py
index 9e7f7a0..f74e42c 100644
--- a/src/main/python/apache/thermos/observer/bin/thermos_observer.py
+++ b/src/main/python/apache/thermos/observer/bin/thermos_observer.py
@@ -8,9 +8,9 @@ from twitter.common import app
from twitter.common.exceptions import ExceptionalThread
from twitter.common.http import HttpServer
from twitter.common.http.diagnostics import DiagnosticsEndpoints
-from twitter.thermos.common.path import TaskPath
-from twitter.thermos.observer.task_observer import TaskObserver
-from twitter.thermos.observer.http.http_observer import BottleObserver
+from apache.thermos.common.path import TaskPath
+from apache.thermos.observer.task_observer import TaskObserver
+from apache.thermos.observer.http.http_observer import BottleObserver
app.add_option("--root",
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/thermos/observer/http/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/observer/http/BUILD b/src/main/python/apache/thermos/observer/http/BUILD
index 9f3d587..7284d6f 100644
--- a/src/main/python/apache/thermos/observer/http/BUILD
+++ b/src/main/python/apache/thermos/observer/http/BUILD
@@ -11,7 +11,7 @@ python_library(
sources = ['static_assets.py'],
resources = rglobs('assets/*'),
dependencies = [
- pants('src/main/python/twitter/thermos:bottle'),
+ pants('src/main/python/apache/thermos:bottle'),
]
)
@@ -28,8 +28,8 @@ python_library(
pants(':templating'),
pants('aurora/twitterdeps/src/python/twitter/common/log'),
pants('aurora/twitterdeps/src/python/twitter/common/http'),
- pants('src/main/python/twitter/thermos:bottle'),
- pants('src/main/python/twitter/thermos:mako'),
+ pants('src/main/python/apache/thermos:bottle'),
+ pants('src/main/python/apache/thermos:mako'),
]
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/thermos/observer/observed_task.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/observer/observed_task.py b/src/main/python/apache/thermos/observer/observed_task.py
index f995998..535915d 100644
--- a/src/main/python/apache/thermos/observer/observed_task.py
+++ b/src/main/python/apache/thermos/observer/observed_task.py
@@ -3,9 +3,9 @@ import os
from twitter.common import log
from twitter.common.lang import AbstractClass
-from twitter.thermos.config.loader import ThermosTaskWrapper
-from twitter.thermos.config.schema import ThermosContext
-from twitter.thermos.common.ckpt import CheckpointDispatcher
+from apache.thermos.config.loader import ThermosTaskWrapper
+from apache.thermos.config.schema import ThermosContext
+from apache.thermos.common.ckpt import CheckpointDispatcher
from pystachio import Environment
@@ -85,7 +85,7 @@ class ObservedTask(AbstractClass):
@abstractproperty
def state(self):
- """Return state of task (gen.twitter.thermos.ttypes.RunnerState)"""
+ """Return state of task (gen.apache.thermos.ttypes.RunnerState)"""
class ActiveObservedTask(ObservedTask):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/thermos/observer/task_observer.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/observer/task_observer.py b/src/main/python/apache/thermos/observer/task_observer.py
index b6ebcf7..f8aff18 100644
--- a/src/main/python/apache/thermos/observer/task_observer.py
+++ b/src/main/python/apache/thermos/observer/task_observer.py
@@ -15,13 +15,13 @@ from twitter.common.exceptions import ExceptionalThread
from twitter.common.lang import Lockable
from twitter.common.quantity import Amount, Time
-from twitter.thermos.common.path import TaskPath
-from twitter.thermos.monitoring.detector import TaskDetector
-from twitter.thermos.monitoring.monitor import TaskMonitor
-from twitter.thermos.monitoring.process import ProcessSample
-from twitter.thermos.monitoring.resource import ResourceMonitorBase, TaskResourceMonitor
+from apache.thermos.common.path import TaskPath
+from apache.thermos.monitoring.detector import TaskDetector
+from apache.thermos.monitoring.monitor import TaskMonitor
+from apache.thermos.monitoring.process import ProcessSample
+from apache.thermos.monitoring.resource import ResourceMonitorBase, TaskResourceMonitor
-from gen.twitter.thermos.ttypes import ProcessState, TaskState
+from gen.apache.thermos.ttypes import ProcessState, TaskState
from .observed_task import ActiveObservedTask, FinishedObservedTask
@@ -208,7 +208,7 @@ class TaskObserver(ExceptionalThread, Lockable):
@Lockable.sync
def raw_state(self, task_id):
"""
- Return the current runner state (thrift blob: gen.twitter.thermos.ttypes.RunnerState)
+ Return the current runner state (thrift blob: gen.apache.thermos.ttypes.RunnerState)
of a given task id
"""
if task_id not in self.all_tasks:
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/thermos/testing/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/testing/BUILD b/src/main/python/apache/thermos/testing/BUILD
index b5485d0..167abca 100644
--- a/src/main/python/apache/thermos/testing/BUILD
+++ b/src/main/python/apache/thermos/testing/BUILD
@@ -4,11 +4,11 @@ python_library(
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
pants('aurora/twitterdeps/src/python/twitter/common/log'),
- pants('src/main/python/twitter/thermos/common:ckpt'),
- pants('src/main/python/twitter/thermos/common:path'),
- pants('src/main/python/twitter/thermos/config'),
- pants('src/main/python/twitter/thermos/core'),
- pants('src/main/python/twitter/thermos:thrift'),
- pants('src/main/thrift/com/twitter/thermos:py-thrift'),
+ pants('src/main/python/apache/thermos/common:ckpt'),
+ pants('src/main/python/apache/thermos/common:path'),
+ pants('src/main/python/apache/thermos/config'),
+ pants('src/main/python/apache/thermos/core'),
+ pants('src/main/python/apache/thermos:thrift'),
+ pants('src/main/thrift/org/apache/thermos:py-thrift'),
]
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/thermos/testing/runner.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/testing/runner.py b/src/main/python/apache/thermos/testing/runner.py
index 930f41b..8f5a9f9 100644
--- a/src/main/python/apache/thermos/testing/runner.py
+++ b/src/main/python/apache/thermos/testing/runner.py
@@ -11,12 +11,12 @@ import time
from twitter.common import log
from twitter.common.contextutil import temporary_file, environment_as
-from twitter.thermos.common.path import TaskPath
-from twitter.thermos.common.ckpt import CheckpointDispatcher
-from twitter.thermos.config.loader import ThermosTaskWrapper
+from apache.thermos.common.path import TaskPath
+from apache.thermos.common.ckpt import CheckpointDispatcher
+from apache.thermos.config.loader import ThermosTaskWrapper
from thrift.TSerialization import deserialize as thrift_deserialize
-from gen.twitter.thermos.ttypes import (
+from gen.apache.thermos.ttypes import (
TaskState,
RunnerCkpt,
RunnerState,
@@ -30,9 +30,9 @@ import random
import sys
from twitter.common import log
from twitter.common.log.options import LogOptions
-from twitter.thermos.config.loader import ThermosConfigLoader
-from twitter.thermos.core.helper import TaskRunnerHelper
-from twitter.thermos.core.runner import TaskRunner, TaskRunnerUniversalHandler
+from apache.thermos.config.loader import ThermosConfigLoader
+from apache.thermos.core.helper import TaskRunnerHelper
+from apache.thermos.core.runner import TaskRunner, TaskRunnerUniversalHandler
from thrift.TSerialization import serialize as thrift_serialize
random.seed(%(random_seed)d)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/thrift/org/apache/aurora/gen/BUILD
----------------------------------------------------------------------
diff --git a/src/main/thrift/org/apache/aurora/gen/BUILD b/src/main/thrift/org/apache/aurora/gen/BUILD
index 33e94ab..c09a518 100644
--- a/src/main/thrift/org/apache/aurora/gen/BUILD
+++ b/src/main/thrift/org/apache/aurora/gen/BUILD
@@ -43,7 +43,7 @@ python_library(
pants(':py-thrift-storage'),
],
provides = setup_py(
- name = 'twitter.gen.aurora',
+ name = 'apache.gen.aurora',
version = open(os.path.join(get_buildroot(), '.auroraversion')).read().strip().lower(),
description = 'Autogenerated Aurora thrift schemas.',
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/thrift/org/apache/aurora/gen/api.thrift
----------------------------------------------------------------------
diff --git a/src/main/thrift/org/apache/aurora/gen/api.thrift b/src/main/thrift/org/apache/aurora/gen/api.thrift
index ef96f36..74cdf1b 100644
--- a/src/main/thrift/org/apache/aurora/gen/api.thrift
+++ b/src/main/thrift/org/apache/aurora/gen/api.thrift
@@ -11,8 +11,8 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
-namespace java com.twitter.aurora.gen
-namespace py gen.twitter.aurora
+namespace java org.apache.aurora.gen
+namespace py gen.apache.aurora
// Thrift interface definition for the aurora scheduler.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/thrift/org/apache/aurora/gen/internal_rpc.thrift
----------------------------------------------------------------------
diff --git a/src/main/thrift/org/apache/aurora/gen/internal_rpc.thrift b/src/main/thrift/org/apache/aurora/gen/internal_rpc.thrift
index ab900d9..6a242d1 100644
--- a/src/main/thrift/org/apache/aurora/gen/internal_rpc.thrift
+++ b/src/main/thrift/org/apache/aurora/gen/internal_rpc.thrift
@@ -11,8 +11,8 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
-namespace java com.twitter.aurora.gen.comm
-namespace py gen.twitter.aurora.comm
+namespace java org.apache.aurora.gen.comm
+namespace py gen.apache.aurora.comm
include "api.thrift"
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/thrift/org/apache/aurora/gen/storage.thrift
----------------------------------------------------------------------
diff --git a/src/main/thrift/org/apache/aurora/gen/storage.thrift b/src/main/thrift/org/apache/aurora/gen/storage.thrift
index ab1e104..a66c3de 100644
--- a/src/main/thrift/org/apache/aurora/gen/storage.thrift
+++ b/src/main/thrift/org/apache/aurora/gen/storage.thrift
@@ -11,8 +11,8 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
-namespace java com.twitter.aurora.gen.storage
-namespace py gen.twitter.aurora.storage
+namespace java org.apache.aurora.gen.storage
+namespace py gen.apache.aurora.storage
include "api.thrift"
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/thrift/org/apache/aurora/gen/storage_local.thrift
----------------------------------------------------------------------
diff --git a/src/main/thrift/org/apache/aurora/gen/storage_local.thrift b/src/main/thrift/org/apache/aurora/gen/storage_local.thrift
index 9f8d3c1..5eb705c 100644
--- a/src/main/thrift/org/apache/aurora/gen/storage_local.thrift
+++ b/src/main/thrift/org/apache/aurora/gen/storage_local.thrift
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
// Thrift structures for a local log storage system, for use in simulated environments.
-namespace java com.twitter.aurora.gen.test
+namespace java org.apache.aurora.gen.test
struct LogRecord {
1: binary contents
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/thrift/org/apache/aurora/gen/test.thrift
----------------------------------------------------------------------
diff --git a/src/main/thrift/org/apache/aurora/gen/test.thrift b/src/main/thrift/org/apache/aurora/gen/test.thrift
index 3494019..66ee015 100644
--- a/src/main/thrift/org/apache/aurora/gen/test.thrift
+++ b/src/main/thrift/org/apache/aurora/gen/test.thrift
@@ -11,8 +11,8 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
-namespace java com.twitter.aurora.gen.test
-namespace py gen.twitter.aurora.test
+namespace java org.apache.aurora.gen.test
+namespace py gen.apache.aurora.test
// Test data for Thrift interface definition for the Twitter Mesos Scheduler.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/thrift/org/apache/thermos/BUILD
----------------------------------------------------------------------
diff --git a/src/main/thrift/org/apache/thermos/BUILD b/src/main/thrift/org/apache/thermos/BUILD
index 2c9a216..2441154 100644
--- a/src/main/thrift/org/apache/thermos/BUILD
+++ b/src/main/thrift/org/apache/thermos/BUILD
@@ -4,7 +4,7 @@ python_thrift_library(
name = 'py-thrift',
sources = ['thermos_internal.thrift'],
provides = setup_py(
- name = 'twitter.gen.thermos',
+ name = 'apache.gen.thermos',
version = open(os.path.join(get_buildroot(), '.auroraversion')).read().strip().lower(),
description = 'Autogenerated Thermos thrift schemas.',
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/thrift/org/apache/thermos/thermos_internal.thrift
----------------------------------------------------------------------
diff --git a/src/main/thrift/org/apache/thermos/thermos_internal.thrift b/src/main/thrift/org/apache/thermos/thermos_internal.thrift
index dc238f9..5fc8b26 100644
--- a/src/main/thrift/org/apache/thermos/thermos_internal.thrift
+++ b/src/main/thrift/org/apache/thermos/thermos_internal.thrift
@@ -1,4 +1,4 @@
-namespace py gen.twitter.thermos
+namespace py gen.apache.thermos
enum ProcessState {
// normal state
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/GuiceUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/GuiceUtilsTest.java b/src/test/java/org/apache/aurora/GuiceUtilsTest.java
index 80472fe..46e0a33 100644
--- a/src/test/java/org/apache/aurora/GuiceUtilsTest.java
+++ b/src/test/java/org/apache/aurora/GuiceUtilsTest.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.util.List;
@@ -25,9 +25,9 @@ import com.google.inject.CreationException;
import com.google.inject.Guice;
import com.google.inject.Injector;
-import org.junit.Test;
+import org.apache.aurora.GuiceUtils.AllowUnchecked;
-import com.twitter.aurora.GuiceUtils.AllowUnchecked;
+import org.junit.Test;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/codec/ThriftBinaryCodecTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/codec/ThriftBinaryCodecTest.java b/src/test/java/org/apache/aurora/codec/ThriftBinaryCodecTest.java
index 02db510..441694d 100644
--- a/src/test/java/org/apache/aurora/codec/ThriftBinaryCodecTest.java
+++ b/src/test/java/org/apache/aurora/codec/ThriftBinaryCodecTest.java
@@ -13,12 +13,12 @@
* 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 org.junit.Test;
+import org.apache.aurora.codec.ThriftBinaryCodec.CodingException;
+import org.apache.aurora.gen.Identity;
-import com.twitter.aurora.codec.ThriftBinaryCodec.CodingException;
-import com.twitter.aurora.gen.Identity;
+import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/DriverFactoryImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/DriverFactoryImplTest.java b/src/test/java/org/apache/aurora/scheduler/DriverFactoryImplTest.java
index e8d9998..a68499c 100644
--- a/src/test/java/org/apache/aurora/scheduler/DriverFactoryImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/DriverFactoryImplTest.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.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -22,11 +22,12 @@ import java.util.Properties;
import com.google.common.base.Throwables;
-import org.junit.Test;
-
-import com.twitter.aurora.scheduler.DriverFactory.DriverFactoryImpl;
import com.twitter.common.testing.easymock.EasyMockTest;
+import org.apache.aurora.scheduler.DriverFactory.DriverFactoryImpl;
+
+import org.junit.Test;
+
import static org.junit.Assert.assertEquals;
public class DriverFactoryImplTest extends EasyMockTest {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/DriverTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/DriverTest.java b/src/test/java/org/apache/aurora/scheduler/DriverTest.java
index f6f7c23..d9c85d3 100644
--- a/src/test/java/org/apache/aurora/scheduler/DriverTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/DriverTest.java
@@ -13,22 +13,26 @@
* 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;
import com.google.common.base.Supplier;
+import com.twitter.common.testing.easymock.EasyMockTest;
+
+import org.apache.aurora.scheduler.Driver.DriverImpl;
+
import org.apache.mesos.Protos;
import org.apache.mesos.SchedulerDriver;
+
import org.junit.Before;
import org.junit.Test;
-import com.twitter.aurora.scheduler.Driver.DriverImpl;
-import com.twitter.common.testing.easymock.EasyMockTest;
-
import static org.apache.mesos.Protos.Status.DRIVER_ABORTED;
import static org.apache.mesos.Protos.Status.DRIVER_RUNNING;
+
import static org.easymock.EasyMock.expect;
+
import static org.junit.Assert.assertEquals;
public class DriverTest extends EasyMockTest {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/MesosSchedulerImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/MesosSchedulerImplTest.java b/src/test/java/org/apache/aurora/scheduler/MesosSchedulerImplTest.java
index 286182a..95c9928 100644
--- a/src/test/java/org/apache/aurora/scheduler/MesosSchedulerImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/MesosSchedulerImplTest.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.lang.Thread.UncaughtExceptionHandler;
import java.util.Arrays;
@@ -28,6 +28,23 @@ import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.TypeLiteral;
+import com.twitter.common.application.Lifecycle;
+import com.twitter.common.base.Closure;
+import com.twitter.common.base.Command;
+import com.twitter.common.testing.easymock.EasyMockTest;
+
+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;
+import org.apache.aurora.scheduler.events.PubsubEvent.DriverDisconnected;
+import org.apache.aurora.scheduler.events.PubsubEvent.DriverRegistered;
+import org.apache.aurora.scheduler.events.PubsubEventModule;
+import org.apache.aurora.scheduler.state.SchedulerCore;
+import org.apache.aurora.scheduler.storage.Storage;
+import org.apache.aurora.scheduler.storage.Storage.StorageException;
+import org.apache.aurora.scheduler.storage.testing.StorageTestUtil;
+
import org.apache.mesos.Protos.FrameworkID;
import org.apache.mesos.Protos.MasterInfo;
import org.apache.mesos.Protos.Offer;
@@ -38,27 +55,14 @@ import org.apache.mesos.Protos.TaskInfo;
import org.apache.mesos.Protos.TaskState;
import org.apache.mesos.Protos.TaskStatus;
import org.apache.mesos.SchedulerDriver;
+
import org.junit.Before;
import org.junit.Test;
-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;
-import com.twitter.aurora.scheduler.events.PubsubEvent.DriverDisconnected;
-import com.twitter.aurora.scheduler.events.PubsubEvent.DriverRegistered;
-import com.twitter.aurora.scheduler.events.PubsubEventModule;
-import com.twitter.aurora.scheduler.state.SchedulerCore;
-import com.twitter.aurora.scheduler.storage.Storage;
-import com.twitter.aurora.scheduler.storage.Storage.StorageException;
-import com.twitter.aurora.scheduler.storage.testing.StorageTestUtil;
-import com.twitter.common.application.Lifecycle;
-import com.twitter.common.base.Closure;
-import com.twitter.common.base.Command;
-import com.twitter.common.testing.easymock.EasyMockTest;
-
import static org.apache.mesos.Protos.Status.DRIVER_RUNNING;
+
import static org.easymock.EasyMock.expect;
+
import static org.junit.Assert.assertTrue;
public class MesosSchedulerImplTest extends EasyMockTest {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/MesosTaskFactoryImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/MesosTaskFactoryImplTest.java b/src/test/java/org/apache/aurora/scheduler/MesosTaskFactoryImplTest.java
index a1742e0..b5dcc0d 100644
--- a/src/test/java/org/apache/aurora/scheduler/MesosTaskFactoryImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/MesosTaskFactoryImplTest.java
@@ -13,7 +13,16 @@
* 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.twitter.common.quantity.Data;
+
+import org.apache.aurora.gen.AssignedTask;
+import org.apache.aurora.gen.Identity;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.scheduler.MesosTaskFactory.ExecutorConfig;
+import org.apache.aurora.scheduler.MesosTaskFactory.MesosTaskFactoryImpl;
+import org.apache.aurora.scheduler.storage.entities.IAssignedTask;
import org.apache.mesos.Protos.CommandInfo;
import org.apache.mesos.Protos.CommandInfo.URI;
@@ -23,17 +32,10 @@ import org.apache.mesos.Protos.SlaveID;
import org.apache.mesos.Protos.TaskInfo;
import org.apache.mesos.Protos.Value.Scalar;
import org.apache.mesos.Protos.Value.Type;
+
import org.junit.Before;
import org.junit.Test;
-import com.twitter.aurora.gen.AssignedTask;
-import com.twitter.aurora.gen.Identity;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.scheduler.MesosTaskFactory.ExecutorConfig;
-import com.twitter.aurora.scheduler.MesosTaskFactory.MesosTaskFactoryImpl;
-import com.twitter.aurora.scheduler.storage.entities.IAssignedTask;
-import com.twitter.common.quantity.Data;
-
import static org.junit.Assert.assertEquals;
public class MesosTaskFactoryImplTest {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/SchedulerLifecycleTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/SchedulerLifecycleTest.java b/src/test/java/org/apache/aurora/scheduler/SchedulerLifecycleTest.java
index a748e6c..f0bbc99 100644
--- a/src/test/java/org/apache/aurora/scheduler/SchedulerLifecycleTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/SchedulerLifecycleTest.java
@@ -13,22 +13,10 @@
* 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.lang.Thread.UncaughtExceptionHandler;
-import org.apache.mesos.Protos.Status;
-import org.apache.mesos.SchedulerDriver;
-import org.easymock.Capture;
-import org.easymock.EasyMock;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.twitter.aurora.scheduler.SchedulerLifecycle.DelayedActions;
-import com.twitter.aurora.scheduler.SchedulerLifecycle.DriverReference;
-import com.twitter.aurora.scheduler.events.PubsubEvent.DriverRegistered;
-import com.twitter.aurora.scheduler.storage.Storage.MutateWork.NoResult.Quiet;
-import com.twitter.aurora.scheduler.storage.testing.StorageTestUtil;
import com.twitter.common.application.Lifecycle;
import com.twitter.common.base.Command;
import com.twitter.common.testing.easymock.EasyMockTest;
@@ -36,8 +24,24 @@ import com.twitter.common.util.Clock;
import com.twitter.common.zookeeper.SingletonService.LeaderControl;
import com.twitter.common.zookeeper.SingletonService.LeadershipListener;
+import org.apache.aurora.scheduler.SchedulerLifecycle.DelayedActions;
+import org.apache.aurora.scheduler.SchedulerLifecycle.DriverReference;
+import org.apache.aurora.scheduler.events.PubsubEvent.DriverRegistered;
+import org.apache.aurora.scheduler.storage.Storage.MutateWork.NoResult.Quiet;
+import org.apache.aurora.scheduler.storage.testing.StorageTestUtil;
+
+import org.apache.mesos.Protos.Status;
+import org.apache.mesos.SchedulerDriver;
+
+import org.easymock.Capture;
+import org.easymock.EasyMock;
+
+import org.junit.Before;
+import org.junit.Test;
+
import static org.easymock.EasyMock.capture;
import static org.easymock.EasyMock.expect;
+
import static org.junit.Assert.fail;
public class SchedulerLifecycleTest extends EasyMockTest {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/TaskVarsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/TaskVarsTest.java b/src/test/java/org/apache/aurora/scheduler/TaskVarsTest.java
index 1d93e6b..9e53c30 100644
--- a/src/test/java/org/apache/aurora/scheduler/TaskVarsTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/TaskVarsTest.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.Map;
import java.util.concurrent.atomic.AtomicLong;
@@ -22,36 +22,39 @@ import com.google.common.base.Optional;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
+import com.twitter.common.stats.StatsProvider;
+import com.twitter.common.testing.easymock.EasyMockTest;
+
+import org.apache.aurora.gen.AssignedTask;
+import org.apache.aurora.gen.Attribute;
+import org.apache.aurora.gen.HostAttributes;
+import org.apache.aurora.gen.Identity;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.scheduler.base.Query;
+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.entities.IScheduledTask;
+import org.apache.aurora.scheduler.storage.testing.StorageTestUtil;
+
import org.easymock.IExpectationSetters;
+
import org.junit.Before;
import org.junit.Test;
-import com.twitter.aurora.gen.AssignedTask;
-import com.twitter.aurora.gen.Attribute;
-import com.twitter.aurora.gen.HostAttributes;
-import com.twitter.aurora.gen.Identity;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.scheduler.base.Query;
-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.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.testing.StorageTestUtil;
-import com.twitter.common.stats.StatsProvider;
-import com.twitter.common.testing.easymock.EasyMockTest;
+import static org.apache.aurora.gen.ScheduleStatus.ASSIGNED;
+import static org.apache.aurora.gen.ScheduleStatus.FAILED;
+import static org.apache.aurora.gen.ScheduleStatus.FINISHED;
+import static org.apache.aurora.gen.ScheduleStatus.INIT;
+import static org.apache.aurora.gen.ScheduleStatus.LOST;
+import static org.apache.aurora.gen.ScheduleStatus.PENDING;
+import static org.apache.aurora.gen.ScheduleStatus.RUNNING;
import static org.easymock.EasyMock.expect;
-import static org.junit.Assert.assertEquals;
-import static com.twitter.aurora.gen.ScheduleStatus.ASSIGNED;
-import static com.twitter.aurora.gen.ScheduleStatus.FAILED;
-import static com.twitter.aurora.gen.ScheduleStatus.FINISHED;
-import static com.twitter.aurora.gen.ScheduleStatus.INIT;
-import static com.twitter.aurora.gen.ScheduleStatus.LOST;
-import static com.twitter.aurora.gen.ScheduleStatus.PENDING;
-import static com.twitter.aurora.gen.ScheduleStatus.RUNNING;
+import static org.junit.Assert.assertEquals;
public class TaskVarsTest extends EasyMockTest {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/UserTaskLauncherTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/UserTaskLauncherTest.java b/src/test/java/org/apache/aurora/scheduler/UserTaskLauncherTest.java
index 5d7366b..68be681 100644
--- a/src/test/java/org/apache/aurora/scheduler/UserTaskLauncherTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/UserTaskLauncherTest.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.Set;
@@ -22,6 +22,15 @@ import com.google.common.base.Optional;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
+import com.twitter.common.collections.Pair;
+import com.twitter.common.testing.easymock.EasyMockTest;
+
+import org.apache.aurora.scheduler.async.OfferQueue;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.configuration.Resources;
+import org.apache.aurora.scheduler.state.StateManager;
+import org.apache.aurora.scheduler.storage.Storage.StorageException;
+
import org.apache.mesos.Protos.Attribute;
import org.apache.mesos.Protos.FrameworkID;
import org.apache.mesos.Protos.Offer;
@@ -36,25 +45,19 @@ import org.apache.mesos.Protos.Value.Ranges;
import org.apache.mesos.Protos.Value.Scalar;
import org.apache.mesos.Protos.Value.Text;
import org.apache.mesos.Protos.Value.Type;
+
import org.junit.Before;
import org.junit.Test;
-import com.twitter.aurora.scheduler.async.OfferQueue;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.configuration.Resources;
-import com.twitter.aurora.scheduler.state.StateManager;
-import com.twitter.aurora.scheduler.storage.Storage.StorageException;
-import com.twitter.common.collections.Pair;
-import com.twitter.common.testing.easymock.EasyMockTest;
+import static org.apache.aurora.gen.ScheduleStatus.FAILED;
+import static org.apache.aurora.gen.ScheduleStatus.RUNNING;
+import static org.apache.aurora.scheduler.configuration.ConfigurationManager.HOST_CONSTRAINT;
import static org.easymock.EasyMock.expect;
+
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import static com.twitter.aurora.gen.ScheduleStatus.FAILED;
-import static com.twitter.aurora.gen.ScheduleStatus.RUNNING;
-import static com.twitter.aurora.scheduler.configuration.ConfigurationManager.HOST_CONSTRAINT;
-
public class UserTaskLauncherTest extends EasyMockTest {
private static final String FRAMEWORK_ID = "FrameworkId";
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java b/src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java
index 1242d46..fc536d2 100644
--- a/src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java
+++ b/src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.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.IOException;
@@ -46,44 +46,6 @@ import com.google.inject.Injector;
import com.google.inject.Key;
import com.google.inject.Module;
-import org.apache.mesos.Protos.FrameworkID;
-import org.apache.mesos.Protos.MasterInfo;
-import org.apache.mesos.Protos.Status;
-import org.apache.mesos.Scheduler;
-import org.apache.mesos.SchedulerDriver;
-import org.easymock.IAnswer;
-import org.easymock.IMocksControl;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.twitter.aurora.codec.ThriftBinaryCodec.CodingException;
-import com.twitter.aurora.gen.AssignedTask;
-import com.twitter.aurora.gen.Identity;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.gen.TaskEvent;
-import com.twitter.aurora.gen.storage.LogEntry;
-import com.twitter.aurora.gen.storage.Op;
-import com.twitter.aurora.gen.storage.SaveFrameworkId;
-import com.twitter.aurora.gen.storage.SaveTasks;
-import com.twitter.aurora.gen.storage.Snapshot;
-import com.twitter.aurora.gen.storage.Transaction;
-import com.twitter.aurora.gen.storage.storageConstants;
-import com.twitter.aurora.scheduler.DriverFactory;
-import com.twitter.aurora.scheduler.MesosTaskFactory.ExecutorConfig;
-import com.twitter.aurora.scheduler.configuration.ConfigurationManager;
-import com.twitter.aurora.scheduler.log.Log;
-import com.twitter.aurora.scheduler.log.Log.Entry;
-import com.twitter.aurora.scheduler.log.Log.Position;
-import com.twitter.aurora.scheduler.log.Log.Stream;
-import com.twitter.aurora.scheduler.storage.backup.BackupModule;
-import com.twitter.aurora.scheduler.storage.log.LogManager.StreamManager.EntrySerializer;
-import com.twitter.aurora.scheduler.storage.log.LogStorageModule;
-import com.twitter.aurora.scheduler.storage.log.SnapshotStoreImpl;
-import com.twitter.aurora.scheduler.storage.log.testing.LogOpMatcher;
-import com.twitter.aurora.scheduler.storage.log.testing.LogOpMatcher.StreamMatcher;
-import com.twitter.aurora.scheduler.thrift.ThriftConfiguration;
import com.twitter.common.application.Lifecycle;
import com.twitter.common.application.StartupStage;
import com.twitter.common.application.modules.AppLauncherModule;
@@ -104,9 +66,51 @@ import com.twitter.common.zookeeper.testing.BaseZooKeeperTest;
import com.twitter.thrift.Endpoint;
import com.twitter.thrift.ServiceInstance;
+import org.apache.aurora.codec.ThriftBinaryCodec.CodingException;
+import org.apache.aurora.gen.AssignedTask;
+import org.apache.aurora.gen.Identity;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.gen.TaskEvent;
+import org.apache.aurora.gen.storage.LogEntry;
+import org.apache.aurora.gen.storage.Op;
+import org.apache.aurora.gen.storage.SaveFrameworkId;
+import org.apache.aurora.gen.storage.SaveTasks;
+import org.apache.aurora.gen.storage.Snapshot;
+import org.apache.aurora.gen.storage.Transaction;
+import org.apache.aurora.gen.storage.storageConstants;
+import org.apache.aurora.scheduler.DriverFactory;
+import org.apache.aurora.scheduler.MesosTaskFactory.ExecutorConfig;
+import org.apache.aurora.scheduler.configuration.ConfigurationManager;
+import org.apache.aurora.scheduler.log.Log;
+import org.apache.aurora.scheduler.log.Log.Entry;
+import org.apache.aurora.scheduler.log.Log.Position;
+import org.apache.aurora.scheduler.log.Log.Stream;
+import org.apache.aurora.scheduler.storage.backup.BackupModule;
+import org.apache.aurora.scheduler.storage.log.LogManager.StreamManager.EntrySerializer;
+import org.apache.aurora.scheduler.storage.log.LogStorageModule;
+import org.apache.aurora.scheduler.storage.log.SnapshotStoreImpl;
+import org.apache.aurora.scheduler.storage.log.testing.LogOpMatcher;
+import org.apache.aurora.scheduler.storage.log.testing.LogOpMatcher.StreamMatcher;
+import org.apache.aurora.scheduler.thrift.ThriftConfiguration;
+
+import org.apache.mesos.Protos.FrameworkID;
+import org.apache.mesos.Protos.MasterInfo;
+import org.apache.mesos.Protos.Status;
+import org.apache.mesos.Scheduler;
+import org.apache.mesos.SchedulerDriver;
+
+import org.easymock.IAnswer;
+import org.easymock.IMocksControl;
+
+import org.junit.Before;
+import org.junit.Test;
+
import static org.easymock.EasyMock.createControl;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.expectLastCall;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -297,7 +301,7 @@ public class SchedulerIT extends BaseZooKeeperTest {
.setTask(new TaskConfig()
.setJobName("job-" + id)
.setEnvironment("test")
- .setExecutorConfig(new com.twitter.aurora.gen.ExecutorConfig("AuroraExecutor", ""))
+ .setExecutorConfig(new org.apache.aurora.gen.ExecutorConfig("AuroraExecutor", ""))
.setOwner(new Identity("role-" + id, "user-" + id))));
// Apply defaults here so that we can expect the same task that will be written to the stream.
ConfigurationManager.applyDefaultsIfUnset(scheduledTask.getAssignedTask().getTask());
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/async/HistoryPrunerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/async/HistoryPrunerTest.java b/src/test/java/org/apache/aurora/scheduler/async/HistoryPrunerTest.java
index 254c334..9de2244 100644
--- a/src/test/java/org/apache/aurora/scheduler/async/HistoryPrunerTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/async/HistoryPrunerTest.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.CountDownLatch;
import java.util.concurrent.Executors;
@@ -26,48 +26,51 @@ import com.google.common.collect.ImmutableMultimap;
import com.google.common.collect.ImmutableSet;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.twitter.common.base.Command;
+import com.twitter.common.quantity.Amount;
+import com.twitter.common.quantity.Time;
+import com.twitter.common.testing.easymock.EasyMockTest;
+import com.twitter.common.util.testing.FakeClock;
+
+import org.apache.aurora.gen.AssignedTask;
+import org.apache.aurora.gen.ExecutorConfig;
+import org.apache.aurora.gen.Identity;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.gen.TaskEvent;
+import org.apache.aurora.scheduler.base.Tasks;
+import org.apache.aurora.scheduler.events.PubsubEvent;
+import org.apache.aurora.scheduler.events.PubsubEvent.StorageStarted;
+import org.apache.aurora.scheduler.state.StateManager;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+import org.apache.aurora.scheduler.storage.testing.StorageTestUtil;
+
import org.easymock.Capture;
import org.easymock.EasyMock;
import org.easymock.IAnswer;
import org.easymock.IExpectationSetters;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.twitter.aurora.gen.AssignedTask;
-import com.twitter.aurora.gen.ExecutorConfig;
-import com.twitter.aurora.gen.Identity;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.gen.TaskEvent;
-import com.twitter.aurora.scheduler.base.Tasks;
-import com.twitter.aurora.scheduler.events.PubsubEvent;
-import com.twitter.aurora.scheduler.events.PubsubEvent.StorageStarted;
-import com.twitter.aurora.scheduler.state.StateManager;
-import com.twitter.aurora.scheduler.storage.entities.IJobKey;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.testing.StorageTestUtil;
-import com.twitter.common.base.Command;
-import com.twitter.common.quantity.Amount;
-import com.twitter.common.quantity.Time;
-import com.twitter.common.testing.easymock.EasyMockTest;
-import com.twitter.common.util.testing.FakeClock;
+import static org.apache.aurora.gen.ScheduleStatus.ASSIGNED;
+import static org.apache.aurora.gen.ScheduleStatus.FINISHED;
+import static org.apache.aurora.gen.ScheduleStatus.KILLED;
+import static org.apache.aurora.gen.ScheduleStatus.LOST;
+import static org.apache.aurora.gen.ScheduleStatus.RUNNING;
+import static org.apache.aurora.gen.ScheduleStatus.STARTING;
+import static org.apache.aurora.scheduler.events.PubsubEvent.TasksDeleted;
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.expectLastCall;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-import static com.twitter.aurora.gen.ScheduleStatus.ASSIGNED;
-import static com.twitter.aurora.gen.ScheduleStatus.FINISHED;
-import static com.twitter.aurora.gen.ScheduleStatus.KILLED;
-import static com.twitter.aurora.gen.ScheduleStatus.LOST;
-import static com.twitter.aurora.gen.ScheduleStatus.RUNNING;
-import static com.twitter.aurora.gen.ScheduleStatus.STARTING;
-import static com.twitter.aurora.scheduler.events.PubsubEvent.TasksDeleted;
-
public class HistoryPrunerTest extends EasyMockTest {
private static final String JOB_A = "job-a";
private static final String TASK_ID = "task_id";
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/async/OfferQueueImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/async/OfferQueueImplTest.java b/src/test/java/org/apache/aurora/scheduler/async/OfferQueueImplTest.java
index ba2a8c5..dddc241 100644
--- a/src/test/java/org/apache/aurora/scheduler/async/OfferQueueImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/async/OfferQueueImplTest.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.CountDownLatch;
import java.util.concurrent.ExecutorService;
@@ -27,25 +27,29 @@ import com.google.common.base.Throwables;
import com.google.common.testing.TearDown;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.twitter.common.quantity.Amount;
+import com.twitter.common.quantity.Time;
+import com.twitter.common.testing.easymock.EasyMockTest;
+import com.twitter.common.util.concurrent.ExecutorServiceShutdown;
+
+import org.apache.aurora.gen.MaintenanceMode;
+import org.apache.aurora.scheduler.Driver;
+import org.apache.aurora.scheduler.async.OfferQueue.LaunchException;
+import org.apache.aurora.scheduler.async.OfferQueue.OfferQueueImpl;
+import org.apache.aurora.scheduler.async.OfferQueue.OfferReturnDelay;
+import org.apache.aurora.scheduler.events.PubsubEvent.DriverDisconnected;
+import org.apache.aurora.scheduler.state.MaintenanceController;
+
import org.apache.mesos.Protos.Offer;
import org.apache.mesos.Protos.TaskInfo;
+
import org.easymock.IAnswer;
+
import org.junit.Before;
import org.junit.Test;
-import com.twitter.aurora.gen.MaintenanceMode;
-import com.twitter.aurora.scheduler.Driver;
-import com.twitter.aurora.scheduler.async.OfferQueue.LaunchException;
-import com.twitter.aurora.scheduler.async.OfferQueue.OfferQueueImpl;
-import com.twitter.aurora.scheduler.async.OfferQueue.OfferReturnDelay;
-import com.twitter.aurora.scheduler.events.PubsubEvent.DriverDisconnected;
-import com.twitter.aurora.scheduler.state.MaintenanceController;
-import com.twitter.common.quantity.Amount;
-import com.twitter.common.quantity.Time;
-import com.twitter.common.testing.easymock.EasyMockTest;
-import com.twitter.common.util.concurrent.ExecutorServiceShutdown;
-
import static org.easymock.EasyMock.expect;
+
import static org.junit.Assert.assertFalse;
public class OfferQueueImplTest extends EasyMockTest {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/async/Offers.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/async/Offers.java b/src/test/java/org/apache/aurora/scheduler/async/Offers.java
index c727b3d..ca41637 100644
--- a/src/test/java/org/apache/aurora/scheduler/async/Offers.java
+++ b/src/test/java/org/apache/aurora/scheduler/async/Offers.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 org.apache.mesos.Protos.FrameworkID;
import org.apache.mesos.Protos.Offer;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/async/PreemptorImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/async/PreemptorImplTest.java b/src/test/java/org/apache/aurora/scheduler/async/PreemptorImplTest.java
index 1e8eee2..a7b2986 100644
--- a/src/test/java/org/apache/aurora/scheduler/async/PreemptorImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/async/PreemptorImplTest.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.Arrays;
import java.util.HashSet;
@@ -26,48 +26,51 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
+import com.twitter.common.quantity.Amount;
+import com.twitter.common.quantity.Data;
+import com.twitter.common.quantity.Time;
+import com.twitter.common.testing.easymock.EasyMockTest;
+import com.twitter.common.util.testing.FakeClock;
+
+import org.apache.aurora.gen.AssignedTask;
+import org.apache.aurora.gen.Attribute;
+import org.apache.aurora.gen.Constraint;
+import org.apache.aurora.gen.HostAttributes;
+import org.apache.aurora.gen.Identity;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.gen.TaskEvent;
+import org.apache.aurora.scheduler.ResourceSlot;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.base.Tasks;
+import org.apache.aurora.scheduler.configuration.Resources;
+import org.apache.aurora.scheduler.filter.SchedulingFilter;
+import org.apache.aurora.scheduler.filter.SchedulingFilterImpl;
+import org.apache.aurora.scheduler.state.MaintenanceController;
+import org.apache.aurora.scheduler.state.SchedulerCore;
+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 org.apache.aurora.scheduler.storage.testing.StorageTestUtil;
+
import org.easymock.EasyMock;
import org.easymock.IAnswer;
import org.easymock.IExpectationSetters;
+
import org.junit.Before;
import org.junit.Test;
-import com.twitter.aurora.gen.AssignedTask;
-import com.twitter.aurora.gen.Attribute;
-import com.twitter.aurora.gen.Constraint;
-import com.twitter.aurora.gen.HostAttributes;
-import com.twitter.aurora.gen.Identity;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.gen.TaskEvent;
-import com.twitter.aurora.scheduler.ResourceSlot;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.base.Tasks;
-import com.twitter.aurora.scheduler.configuration.Resources;
-import com.twitter.aurora.scheduler.filter.SchedulingFilter;
-import com.twitter.aurora.scheduler.filter.SchedulingFilterImpl;
-import com.twitter.aurora.scheduler.state.MaintenanceController;
-import com.twitter.aurora.scheduler.state.SchedulerCore;
-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.aurora.scheduler.storage.testing.StorageTestUtil;
-import com.twitter.common.quantity.Amount;
-import com.twitter.common.quantity.Data;
-import com.twitter.common.quantity.Time;
-import com.twitter.common.testing.easymock.EasyMockTest;
-import com.twitter.common.util.testing.FakeClock;
+import static org.apache.aurora.gen.MaintenanceMode.NONE;
+import static org.apache.aurora.gen.ScheduleStatus.PENDING;
+import static org.apache.aurora.gen.ScheduleStatus.RUNNING;
+import static org.apache.aurora.scheduler.async.Preemptor.PreemptorImpl;
+import static org.apache.aurora.scheduler.filter.SchedulingFilter.Veto;
import static org.apache.mesos.Protos.Offer;
import static org.apache.mesos.Protos.Resource;
-import static org.easymock.EasyMock.expect;
-import static com.twitter.aurora.gen.MaintenanceMode.NONE;
-import static com.twitter.aurora.gen.ScheduleStatus.PENDING;
-import static com.twitter.aurora.gen.ScheduleStatus.RUNNING;
-import static com.twitter.aurora.scheduler.async.Preemptor.PreemptorImpl;
-import static com.twitter.aurora.scheduler.filter.SchedulingFilter.Veto;
+import static org.easymock.EasyMock.expect;
public class PreemptorImplTest extends EasyMockTest {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/async/TaskSchedulerImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/async/TaskSchedulerImplTest.java b/src/test/java/org/apache/aurora/scheduler/async/TaskSchedulerImplTest.java
index 5933f27..1004d0f 100644
--- a/src/test/java/org/apache/aurora/scheduler/async/TaskSchedulerImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/async/TaskSchedulerImplTest.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 com.google.common.base.Function;
import com.google.common.base.Optional;
@@ -22,24 +22,6 @@ import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.Injector;
-import org.apache.mesos.Protos.Offer;
-import org.apache.mesos.Protos.TaskInfo;
-import org.easymock.Capture;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.twitter.aurora.gen.AssignedTask;
-import com.twitter.aurora.gen.Identity;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.events.PubsubEvent;
-import com.twitter.aurora.scheduler.state.PubsubTestUtil;
-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.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.testing.StorageTestUtil;
import com.twitter.common.base.Closure;
import com.twitter.common.quantity.Amount;
import com.twitter.common.quantity.Time;
@@ -47,11 +29,32 @@ import com.twitter.common.testing.easymock.EasyMockTest;
import com.twitter.common.util.Clock;
import com.twitter.common.util.testing.FakeClock;
+import org.apache.aurora.gen.AssignedTask;
+import org.apache.aurora.gen.Identity;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.events.PubsubEvent;
+import org.apache.aurora.scheduler.state.PubsubTestUtil;
+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.entities.IScheduledTask;
+import org.apache.aurora.scheduler.storage.testing.StorageTestUtil;
+
+import org.apache.mesos.Protos.Offer;
+import org.apache.mesos.Protos.TaskInfo;
+import org.easymock.Capture;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.apache.aurora.gen.ScheduleStatus.PENDING;
+
import static org.easymock.EasyMock.capture;
import static org.easymock.EasyMock.expect;
-import static org.junit.Assert.assertEquals;
-import static com.twitter.aurora.gen.ScheduleStatus.PENDING;
+import static org.junit.Assert.assertEquals;
public class TaskSchedulerImplTest extends EasyMockTest {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/async/TaskSchedulerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/async/TaskSchedulerTest.java b/src/test/java/org/apache/aurora/scheduler/async/TaskSchedulerTest.java
index c3fe726..5a3efe8 100644
--- a/src/test/java/org/apache/aurora/scheduler/async/TaskSchedulerTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/async/TaskSchedulerTest.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.concurrent.ScheduledExecutorService;
@@ -27,67 +27,71 @@ import com.google.common.base.Optional;
import com.google.common.collect.ImmutableSet;
import com.google.common.util.concurrent.RateLimiter;
+import com.twitter.common.quantity.Amount;
+import com.twitter.common.quantity.Time;
+import com.twitter.common.testing.easymock.EasyMockTest;
+import com.twitter.common.util.BackoffStrategy;
+import com.twitter.common.util.testing.FakeClock;
+
+import org.apache.aurora.gen.AssignedTask;
+import org.apache.aurora.gen.HostStatus;
+import org.apache.aurora.gen.Identity;
+import org.apache.aurora.gen.MaintenanceMode;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.gen.TaskEvent;
+import org.apache.aurora.scheduler.Driver;
+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.TaskScheduler.TaskSchedulerImpl;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.base.Tasks;
+import org.apache.aurora.scheduler.events.PubsubEvent.HostMaintenanceStateChange;
+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.state.MaintenanceController;
+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.Storage.StorageException;
+import org.apache.aurora.scheduler.storage.TaskStore;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+import org.apache.aurora.scheduler.storage.mem.MemStorage;
+
import org.apache.mesos.Protos.Offer;
import org.apache.mesos.Protos.OfferID;
import org.apache.mesos.Protos.SlaveID;
import org.apache.mesos.Protos.TaskID;
import org.apache.mesos.Protos.TaskInfo;
+
import org.easymock.Capture;
import org.easymock.EasyMock;
+
import org.junit.Before;
import org.junit.Test;
-import com.twitter.aurora.gen.AssignedTask;
-import com.twitter.aurora.gen.HostStatus;
-import com.twitter.aurora.gen.Identity;
-import com.twitter.aurora.gen.MaintenanceMode;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.gen.TaskEvent;
-import com.twitter.aurora.scheduler.Driver;
-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.TaskScheduler.TaskSchedulerImpl;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.base.Tasks;
-import com.twitter.aurora.scheduler.events.PubsubEvent.HostMaintenanceStateChange;
-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.state.MaintenanceController;
-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.Storage.StorageException;
-import com.twitter.aurora.scheduler.storage.TaskStore;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.mem.MemStorage;
-import com.twitter.common.quantity.Amount;
-import com.twitter.common.quantity.Time;
-import com.twitter.common.testing.easymock.EasyMockTest;
-import com.twitter.common.util.BackoffStrategy;
-import com.twitter.common.util.testing.FakeClock;
+import static org.apache.aurora.gen.ScheduleStatus.ASSIGNED;
+import static org.apache.aurora.gen.ScheduleStatus.FAILED;
+import static org.apache.aurora.gen.ScheduleStatus.FINISHED;
+import static org.apache.aurora.gen.ScheduleStatus.INIT;
+import static org.apache.aurora.gen.ScheduleStatus.KILLED;
+import static org.apache.aurora.gen.ScheduleStatus.LOST;
+import static org.apache.aurora.gen.ScheduleStatus.PENDING;
+import static org.apache.aurora.gen.ScheduleStatus.RESTARTING;
+import static org.apache.aurora.gen.ScheduleStatus.RUNNING;
import static org.easymock.EasyMock.capture;
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.expectLastCall;
import static org.easymock.EasyMock.isA;
-import static org.junit.Assert.assertEquals;
-import static com.twitter.aurora.gen.ScheduleStatus.ASSIGNED;
-import static com.twitter.aurora.gen.ScheduleStatus.FAILED;
-import static com.twitter.aurora.gen.ScheduleStatus.FINISHED;
-import static com.twitter.aurora.gen.ScheduleStatus.INIT;
-import static com.twitter.aurora.gen.ScheduleStatus.KILLED;
-import static com.twitter.aurora.gen.ScheduleStatus.LOST;
-import static com.twitter.aurora.gen.ScheduleStatus.PENDING;
-import static com.twitter.aurora.gen.ScheduleStatus.RESTARTING;
-import static com.twitter.aurora.gen.ScheduleStatus.RUNNING;
+import static org.junit.Assert.assertEquals;
/**
* TODO(wfarner): Break this test up to independently test TaskSchedulerImpl and OfferQueueImpl.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/async/TaskTimeoutTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/async/TaskTimeoutTest.java b/src/test/java/org/apache/aurora/scheduler/async/TaskTimeoutTest.java
index a06a1cf..9ad5f3b 100644
--- a/src/test/java/org/apache/aurora/scheduler/async/TaskTimeoutTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/async/TaskTimeoutTest.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.Map;
import java.util.concurrent.ScheduledExecutorService;
@@ -25,46 +25,49 @@ import com.google.common.base.Supplier;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Maps;
+import com.twitter.common.quantity.Amount;
+import com.twitter.common.quantity.Time;
+import com.twitter.common.stats.StatsProvider;
+import com.twitter.common.testing.easymock.EasyMockTest;
+import com.twitter.common.util.testing.FakeClock;
+
+import org.apache.aurora.gen.AssignedTask;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.gen.TaskEvent;
+import org.apache.aurora.scheduler.base.Query;
+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.entities.IScheduledTask;
+import org.apache.aurora.scheduler.storage.testing.StorageTestUtil;
+
import org.easymock.Capture;
import org.easymock.EasyMock;
import org.easymock.IExpectationSetters;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.twitter.aurora.gen.AssignedTask;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.gen.TaskEvent;
-import com.twitter.aurora.scheduler.base.Query;
-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.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.testing.StorageTestUtil;
-import com.twitter.common.quantity.Amount;
-import com.twitter.common.quantity.Time;
-import com.twitter.common.stats.StatsProvider;
-import com.twitter.common.testing.easymock.EasyMockTest;
-import com.twitter.common.util.testing.FakeClock;
+import static org.apache.aurora.gen.ScheduleStatus.ASSIGNED;
+import static org.apache.aurora.gen.ScheduleStatus.FINISHED;
+import static org.apache.aurora.gen.ScheduleStatus.INIT;
+import static org.apache.aurora.gen.ScheduleStatus.KILLED;
+import static org.apache.aurora.gen.ScheduleStatus.KILLING;
+import static org.apache.aurora.gen.ScheduleStatus.LOST;
+import static org.apache.aurora.gen.ScheduleStatus.PENDING;
+import static org.apache.aurora.gen.ScheduleStatus.PREEMPTING;
+import static org.apache.aurora.gen.ScheduleStatus.RESTARTING;
+import static org.apache.aurora.gen.ScheduleStatus.RUNNING;
+import static org.apache.aurora.gen.ScheduleStatus.STARTING;
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.expectLastCall;
-import static org.junit.Assert.assertEquals;
-import static com.twitter.aurora.gen.ScheduleStatus.ASSIGNED;
-import static com.twitter.aurora.gen.ScheduleStatus.FINISHED;
-import static com.twitter.aurora.gen.ScheduleStatus.INIT;
-import static com.twitter.aurora.gen.ScheduleStatus.KILLED;
-import static com.twitter.aurora.gen.ScheduleStatus.KILLING;
-import static com.twitter.aurora.gen.ScheduleStatus.LOST;
-import static com.twitter.aurora.gen.ScheduleStatus.PENDING;
-import static com.twitter.aurora.gen.ScheduleStatus.PREEMPTING;
-import static com.twitter.aurora.gen.ScheduleStatus.RESTARTING;
-import static com.twitter.aurora.gen.ScheduleStatus.RUNNING;
-import static com.twitter.aurora.gen.ScheduleStatus.STARTING;
+import static org.junit.Assert.assertEquals;
public class TaskTimeoutTest extends EasyMockTest {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/base/CommandUtilTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/base/CommandUtilTest.java b/src/test/java/org/apache/aurora/scheduler/base/CommandUtilTest.java
index 4e45c50..ff60353 100644
--- a/src/test/java/org/apache/aurora/scheduler/base/CommandUtilTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/base/CommandUtilTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.base;
+package org.apache.aurora.scheduler.base;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/base/NumbersTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/base/NumbersTest.java b/src/test/java/org/apache/aurora/scheduler/base/NumbersTest.java
index 07b2740..a6eb74b 100644
--- a/src/test/java/org/apache/aurora/scheduler/base/NumbersTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/base/NumbersTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.base;
+package org.apache.aurora.scheduler.base;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/configuration/ConfigurationManagerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/configuration/ConfigurationManagerTest.java b/src/test/java/org/apache/aurora/scheduler/configuration/ConfigurationManagerTest.java
index 309c144..039ed86 100644
--- a/src/test/java/org/apache/aurora/scheduler/configuration/ConfigurationManagerTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/configuration/ConfigurationManagerTest.java
@@ -13,33 +13,33 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.configuration;
+package org.apache.aurora.scheduler.configuration;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
+import org.apache.aurora.gen.Constraint;
+import org.apache.aurora.gen.CronCollisionPolicy;
+import org.apache.aurora.gen.ExecutorConfig;
+import org.apache.aurora.gen.Identity;
+import org.apache.aurora.gen.JobConfiguration;
+import org.apache.aurora.gen.JobKey;
+import org.apache.aurora.gen.LimitConstraint;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.gen.TaskConstraint;
+import org.apache.aurora.gen.ValueConstraint;
+
import org.junit.Test;
-import com.twitter.aurora.gen.Constraint;
-import com.twitter.aurora.gen.CronCollisionPolicy;
-import com.twitter.aurora.gen.ExecutorConfig;
-import com.twitter.aurora.gen.Identity;
-import com.twitter.aurora.gen.JobConfiguration;
-import com.twitter.aurora.gen.JobKey;
-import com.twitter.aurora.gen.LimitConstraint;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.gen.TaskConstraint;
-import com.twitter.aurora.gen.ValueConstraint;
+import static org.apache.aurora.gen.apiConstants.DEFAULT_ENVIRONMENT;
+import static org.apache.aurora.gen.test.testConstants.INVALID_IDENTIFIERS;
+import static org.apache.aurora.gen.test.testConstants.VALID_IDENTIFIERS;
+import static org.apache.aurora.scheduler.configuration.ConfigurationManager.isGoodIdentifier;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import static com.twitter.aurora.gen.apiConstants.DEFAULT_ENVIRONMENT;
-import static com.twitter.aurora.gen.test.testConstants.INVALID_IDENTIFIERS;
-import static com.twitter.aurora.gen.test.testConstants.VALID_IDENTIFIERS;
-import static com.twitter.aurora.scheduler.configuration.ConfigurationManager.isGoodIdentifier;
-
// TODO(Sathya): Improve test coverage for this class.
public class ConfigurationManagerTest {
// This job caused a crash when loaded in MESOS-3062
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/configuration/ResourcesTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/configuration/ResourcesTest.java b/src/test/java/org/apache/aurora/scheduler/configuration/ResourcesTest.java
index 963106d..b16e4bb 100644
--- a/src/test/java/org/apache/aurora/scheduler/configuration/ResourcesTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/configuration/ResourcesTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.configuration;
+package org.apache.aurora.scheduler.configuration;
import java.util.Set;
@@ -21,17 +21,19 @@ import com.google.common.base.Function;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
+import com.twitter.common.collections.Pair;
+import com.twitter.common.quantity.Amount;
+import com.twitter.common.quantity.Data;
+
+import org.apache.aurora.scheduler.configuration.Resources.InsufficientResourcesException;
+
import org.apache.mesos.Protos;
import org.apache.mesos.Protos.Resource;
import org.apache.mesos.Protos.Value.Range;
import org.apache.mesos.Protos.Value.Ranges;
import org.apache.mesos.Protos.Value.Type;
-import org.junit.Test;
-import com.twitter.aurora.scheduler.configuration.Resources.InsufficientResourcesException;
-import com.twitter.common.collections.Pair;
-import com.twitter.common.quantity.Amount;
-import com.twitter.common.quantity.Data;
+import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/cron/noop/NoopCronIT.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/cron/noop/NoopCronIT.java b/src/test/java/org/apache/aurora/scheduler/cron/noop/NoopCronIT.java
index b55c421..7991cb0 100644
--- a/src/test/java/org/apache/aurora/scheduler/cron/noop/NoopCronIT.java
+++ b/src/test/java/org/apache/aurora/scheduler/cron/noop/NoopCronIT.java
@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.cron.noop;
+package org.apache.aurora.scheduler.cron.noop;
import com.google.inject.Guice;
import com.google.inject.Injector;
+import org.apache.aurora.scheduler.cron.CronPredictor;
+import org.apache.aurora.scheduler.cron.CronScheduler;
+
import org.junit.Before;
import org.junit.Test;
-import com.twitter.aurora.scheduler.cron.CronPredictor;
-import com.twitter.aurora.scheduler.cron.CronScheduler;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/events/NotifyingMethodInterceptorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/events/NotifyingMethodInterceptorTest.java b/src/test/java/org/apache/aurora/scheduler/events/NotifyingMethodInterceptorTest.java
index ceee118..93e9cc3 100644
--- a/src/test/java/org/apache/aurora/scheduler/events/NotifyingMethodInterceptorTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/events/NotifyingMethodInterceptorTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.events;
+package org.apache.aurora.scheduler.events;
import javax.inject.Singleton;
@@ -23,16 +23,17 @@ import com.google.inject.Injector;
import com.google.inject.TypeLiteral;
import com.google.inject.matcher.Matchers;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.twitter.aurora.scheduler.events.PubsubEvent.DriverRegistered;
-import com.twitter.aurora.scheduler.events.PubsubEvent.Interceptors.Event;
-import com.twitter.aurora.scheduler.events.PubsubEvent.Interceptors.SendNotification;
-import com.twitter.aurora.scheduler.events.PubsubEvent.StorageStarted;
import com.twitter.common.base.Closure;
import com.twitter.common.testing.easymock.EasyMockTest;
+import org.apache.aurora.scheduler.events.PubsubEvent.DriverRegistered;
+import org.apache.aurora.scheduler.events.PubsubEvent.Interceptors.Event;
+import org.apache.aurora.scheduler.events.PubsubEvent.Interceptors.SendNotification;
+import org.apache.aurora.scheduler.events.PubsubEvent.StorageStarted;
+
+import org.junit.Before;
+import org.junit.Test;
+
import static org.junit.Assert.assertEquals;
public class NotifyingMethodInterceptorTest extends EasyMockTest {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/events/NotifyingSchedulingFilterTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/events/NotifyingSchedulingFilterTest.java b/src/test/java/org/apache/aurora/scheduler/events/NotifyingSchedulingFilterTest.java
index 94498ef..21a5491 100644
--- a/src/test/java/org/apache/aurora/scheduler/events/NotifyingSchedulingFilterTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/events/NotifyingSchedulingFilterTest.java
@@ -13,25 +13,27 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.events;
+package org.apache.aurora.scheduler.events;
import java.util.Set;
import com.google.common.collect.ImmutableSet;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.scheduler.ResourceSlot;
-import com.twitter.aurora.scheduler.events.PubsubEvent.Vetoed;
-import com.twitter.aurora.scheduler.filter.SchedulingFilter;
-import com.twitter.aurora.scheduler.filter.SchedulingFilter.Veto;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
import com.twitter.common.base.Closure;
import com.twitter.common.testing.easymock.EasyMockTest;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.scheduler.ResourceSlot;
+import org.apache.aurora.scheduler.events.PubsubEvent.Vetoed;
+import org.apache.aurora.scheduler.filter.SchedulingFilter;
+import org.apache.aurora.scheduler.filter.SchedulingFilter.Veto;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+
import static org.easymock.EasyMock.expect;
+
import static org.junit.Assert.assertEquals;
public class NotifyingSchedulingFilterTest extends EasyMockTest {
[6/9] Refactors java and python code to the Apache namespace.
Posted by wf...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/storage/log/LogManager.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/log/LogManager.java b/src/main/java/org/apache/aurora/scheduler/storage/log/LogManager.java
index da29401..9710e28 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/log/LogManager.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/log/LogManager.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage.log;
+package org.apache.aurora.scheduler.storage.log;
import java.io.IOException;
import java.lang.annotation.ElementType;
@@ -42,26 +42,6 @@ import com.google.common.collect.Maps;
import com.google.common.primitives.Bytes;
import com.google.inject.BindingAnnotation;
-import com.twitter.aurora.codec.ThriftBinaryCodec.CodingException;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.storage.Frame;
-import com.twitter.aurora.gen.storage.FrameChunk;
-import com.twitter.aurora.gen.storage.FrameHeader;
-import com.twitter.aurora.gen.storage.LogEntry;
-import com.twitter.aurora.gen.storage.LogEntry._Fields;
-import com.twitter.aurora.gen.storage.Op;
-import com.twitter.aurora.gen.storage.RemoveTasks;
-import com.twitter.aurora.gen.storage.SaveHostAttributes;
-import com.twitter.aurora.gen.storage.SaveTasks;
-import com.twitter.aurora.gen.storage.Snapshot;
-import com.twitter.aurora.gen.storage.Transaction;
-import com.twitter.aurora.gen.storage.storageConstants;
-import com.twitter.aurora.scheduler.log.Log;
-import com.twitter.aurora.scheduler.log.Log.Entry;
-import com.twitter.aurora.scheduler.log.Log.Position;
-import com.twitter.aurora.scheduler.log.Log.Stream;
-import com.twitter.aurora.scheduler.log.Log.Stream.InvalidPositionException;
-import com.twitter.aurora.scheduler.log.Log.Stream.StreamAccessException;
import com.twitter.common.application.ShutdownRegistry;
import com.twitter.common.base.Closure;
import com.twitter.common.base.ExceptionalCommand;
@@ -70,6 +50,27 @@ import com.twitter.common.quantity.Amount;
import com.twitter.common.quantity.Data;
import com.twitter.common.stats.Stats;
+import org.apache.aurora.codec.ThriftBinaryCodec.CodingException;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.storage.Frame;
+import org.apache.aurora.gen.storage.FrameChunk;
+import org.apache.aurora.gen.storage.FrameHeader;
+import org.apache.aurora.gen.storage.LogEntry;
+import org.apache.aurora.gen.storage.LogEntry._Fields;
+import org.apache.aurora.gen.storage.Op;
+import org.apache.aurora.gen.storage.RemoveTasks;
+import org.apache.aurora.gen.storage.SaveHostAttributes;
+import org.apache.aurora.gen.storage.SaveTasks;
+import org.apache.aurora.gen.storage.Snapshot;
+import org.apache.aurora.gen.storage.Transaction;
+import org.apache.aurora.gen.storage.storageConstants;
+import org.apache.aurora.scheduler.log.Log;
+import org.apache.aurora.scheduler.log.Log.Entry;
+import org.apache.aurora.scheduler.log.Log.Position;
+import org.apache.aurora.scheduler.log.Log.Stream;
+import org.apache.aurora.scheduler.log.Log.Stream.InvalidPositionException;
+import org.apache.aurora.scheduler.log.Log.Stream.StreamAccessException;
+
import static com.google.common.base.Preconditions.checkNotNull;
/**
@@ -134,7 +135,7 @@ public final class LogManager {
* {@link #readFromBeginning(com.twitter.common.base.Closure) read from} the beginning,
* a {@link #startTransaction() transaction} consisting of one or more local storage
* operations can be committed atomically, or the log can be compacted by
- * {@link #snapshot(com.twitter.aurora.gen.storage.Snapshot) snapshotting}.
+ * {@link #snapshot(org.apache.aurora.gen.storage.Snapshot) snapshotting}.
*/
public static class StreamManager {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/storage/log/LogStorage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/log/LogStorage.java b/src/main/java/org/apache/aurora/scheduler/storage/log/LogStorage.java
index 74f06aa..82846c2 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/log/LogStorage.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/log/LogStorage.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage.log;
+package org.apache.aurora.scheduler.storage.log;
import java.io.IOException;
import java.lang.annotation.ElementType;
@@ -39,48 +39,6 @@ import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
import com.google.inject.BindingAnnotation;
-import com.twitter.aurora.codec.ThriftBinaryCodec.CodingException;
-import com.twitter.aurora.gen.HostAttributes;
-import com.twitter.aurora.gen.MaintenanceMode;
-import com.twitter.aurora.gen.storage.LogEntry;
-import com.twitter.aurora.gen.storage.Op;
-import com.twitter.aurora.gen.storage.RemoveJob;
-import com.twitter.aurora.gen.storage.RemoveLock;
-import com.twitter.aurora.gen.storage.RemoveQuota;
-import com.twitter.aurora.gen.storage.RemoveTasks;
-import com.twitter.aurora.gen.storage.RewriteTask;
-import com.twitter.aurora.gen.storage.SaveAcceptedJob;
-import com.twitter.aurora.gen.storage.SaveFrameworkId;
-import com.twitter.aurora.gen.storage.SaveHostAttributes;
-import com.twitter.aurora.gen.storage.SaveLock;
-import com.twitter.aurora.gen.storage.SaveQuota;
-import com.twitter.aurora.gen.storage.SaveTasks;
-import com.twitter.aurora.gen.storage.Snapshot;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.base.SchedulerException;
-import com.twitter.aurora.scheduler.base.Tasks;
-import com.twitter.aurora.scheduler.log.Log.Stream.InvalidPositionException;
-import com.twitter.aurora.scheduler.log.Log.Stream.StreamAccessException;
-import com.twitter.aurora.scheduler.storage.AttributeStore;
-import com.twitter.aurora.scheduler.storage.DistributedSnapshotStore;
-import com.twitter.aurora.scheduler.storage.ForwardingStore;
-import com.twitter.aurora.scheduler.storage.JobStore;
-import com.twitter.aurora.scheduler.storage.LockStore;
-import com.twitter.aurora.scheduler.storage.QuotaStore;
-import com.twitter.aurora.scheduler.storage.SchedulerStore;
-import com.twitter.aurora.scheduler.storage.SnapshotStore;
-import com.twitter.aurora.scheduler.storage.Storage;
-import com.twitter.aurora.scheduler.storage.Storage.NonVolatileStorage;
-import com.twitter.aurora.scheduler.storage.TaskStore;
-import com.twitter.aurora.scheduler.storage.entities.IJobConfiguration;
-import com.twitter.aurora.scheduler.storage.entities.IJobKey;
-import com.twitter.aurora.scheduler.storage.entities.ILock;
-import com.twitter.aurora.scheduler.storage.entities.ILockKey;
-import com.twitter.aurora.scheduler.storage.entities.IQuota;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
-import com.twitter.aurora.scheduler.storage.log.LogManager.StreamManager;
-import com.twitter.aurora.scheduler.storage.log.LogManager.StreamManager.StreamTransaction;
import com.twitter.common.application.ShutdownRegistry;
import com.twitter.common.base.Closure;
import com.twitter.common.inject.TimedInterceptor.Timed;
@@ -88,6 +46,49 @@ import com.twitter.common.quantity.Amount;
import com.twitter.common.quantity.Time;
import com.twitter.common.util.concurrent.ExecutorServiceShutdown;
+import org.apache.aurora.codec.ThriftBinaryCodec.CodingException;
+import org.apache.aurora.gen.HostAttributes;
+import org.apache.aurora.gen.MaintenanceMode;
+import org.apache.aurora.gen.storage.LogEntry;
+import org.apache.aurora.gen.storage.Op;
+import org.apache.aurora.gen.storage.RemoveJob;
+import org.apache.aurora.gen.storage.RemoveLock;
+import org.apache.aurora.gen.storage.RemoveQuota;
+import org.apache.aurora.gen.storage.RemoveTasks;
+import org.apache.aurora.gen.storage.RewriteTask;
+import org.apache.aurora.gen.storage.SaveAcceptedJob;
+import org.apache.aurora.gen.storage.SaveFrameworkId;
+import org.apache.aurora.gen.storage.SaveHostAttributes;
+import org.apache.aurora.gen.storage.SaveLock;
+import org.apache.aurora.gen.storage.SaveQuota;
+import org.apache.aurora.gen.storage.SaveTasks;
+import org.apache.aurora.gen.storage.Snapshot;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.base.SchedulerException;
+import org.apache.aurora.scheduler.base.Tasks;
+import org.apache.aurora.scheduler.log.Log.Stream.InvalidPositionException;
+import org.apache.aurora.scheduler.log.Log.Stream.StreamAccessException;
+import org.apache.aurora.scheduler.storage.AttributeStore;
+import org.apache.aurora.scheduler.storage.DistributedSnapshotStore;
+import org.apache.aurora.scheduler.storage.ForwardingStore;
+import org.apache.aurora.scheduler.storage.JobStore;
+import org.apache.aurora.scheduler.storage.LockStore;
+import org.apache.aurora.scheduler.storage.QuotaStore;
+import org.apache.aurora.scheduler.storage.SchedulerStore;
+import org.apache.aurora.scheduler.storage.SnapshotStore;
+import org.apache.aurora.scheduler.storage.Storage;
+import org.apache.aurora.scheduler.storage.Storage.NonVolatileStorage;
+import org.apache.aurora.scheduler.storage.TaskStore;
+import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
+import org.apache.aurora.scheduler.storage.entities.ILock;
+import org.apache.aurora.scheduler.storage.entities.ILockKey;
+import org.apache.aurora.scheduler.storage.entities.IQuota;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
+import org.apache.aurora.scheduler.storage.log.LogManager.StreamManager;
+import org.apache.aurora.scheduler.storage.log.LogManager.StreamManager.StreamTransaction;
+
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/storage/log/LogStorageModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/log/LogStorageModule.java b/src/main/java/org/apache/aurora/scheduler/storage/log/LogStorageModule.java
index 92568c8..7a0f25a 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/log/LogStorageModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/log/LogStorageModule.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage.log;
+package org.apache.aurora.scheduler.storage.log;
import java.lang.annotation.Annotation;
@@ -24,13 +24,6 @@ import com.google.inject.AbstractModule;
import com.google.inject.Key;
import com.google.inject.TypeLiteral;
-import com.twitter.aurora.scheduler.log.Log;
-import com.twitter.aurora.scheduler.storage.CallOrderEnforcingStorage;
-import com.twitter.aurora.scheduler.storage.DistributedSnapshotStore;
-import com.twitter.aurora.scheduler.storage.log.LogManager.MaxEntrySize;
-import com.twitter.aurora.scheduler.storage.log.LogManager.SnapshotSetting;
-import com.twitter.aurora.scheduler.storage.log.LogStorage.ShutdownGracePeriod;
-import com.twitter.aurora.scheduler.storage.log.LogStorage.SnapshotInterval;
import com.twitter.common.application.ShutdownRegistry;
import com.twitter.common.args.Arg;
import com.twitter.common.args.CmdLine;
@@ -39,6 +32,14 @@ import com.twitter.common.quantity.Data;
import com.twitter.common.quantity.Time;
import com.twitter.common.util.Clock;
+import org.apache.aurora.scheduler.log.Log;
+import org.apache.aurora.scheduler.storage.CallOrderEnforcingStorage;
+import org.apache.aurora.scheduler.storage.DistributedSnapshotStore;
+import org.apache.aurora.scheduler.storage.log.LogManager.MaxEntrySize;
+import org.apache.aurora.scheduler.storage.log.LogManager.SnapshotSetting;
+import org.apache.aurora.scheduler.storage.log.LogStorage.ShutdownGracePeriod;
+import org.apache.aurora.scheduler.storage.log.LogStorage.SnapshotInterval;
+
/**
* Bindings for scheduler distributed log based storage.
* <p/>
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImpl.java b/src/main/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImpl.java
index df6b899..5571fd2 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImpl.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImpl.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage.log;
+package org.apache.aurora.scheduler.storage.log;
import java.util.Arrays;
import java.util.Map;
@@ -24,31 +24,32 @@ import javax.inject.Inject;
import com.google.common.collect.ImmutableSet;
-import com.twitter.aurora.gen.HostAttributes;
-import com.twitter.aurora.gen.Lock;
-import com.twitter.aurora.gen.storage.QuotaConfiguration;
-import com.twitter.aurora.gen.storage.SchedulerMetadata;
-import com.twitter.aurora.gen.storage.Snapshot;
-import com.twitter.aurora.gen.storage.StoredJob;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.storage.SnapshotStore;
-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.Storage.StoreProvider;
-import com.twitter.aurora.scheduler.storage.Storage.Volatile;
-import com.twitter.aurora.scheduler.storage.Storage.Work;
-import com.twitter.aurora.scheduler.storage.entities.IJobConfiguration;
-import com.twitter.aurora.scheduler.storage.entities.ILock;
-import com.twitter.aurora.scheduler.storage.entities.IQuota;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
import com.twitter.common.inject.TimedInterceptor.Timed;
import com.twitter.common.util.BuildInfo;
import com.twitter.common.util.Clock;
+import org.apache.aurora.gen.HostAttributes;
+import org.apache.aurora.gen.Lock;
+import org.apache.aurora.gen.storage.QuotaConfiguration;
+import org.apache.aurora.gen.storage.SchedulerMetadata;
+import org.apache.aurora.gen.storage.Snapshot;
+import org.apache.aurora.gen.storage.StoredJob;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.storage.SnapshotStore;
+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.Storage.StoreProvider;
+import org.apache.aurora.scheduler.storage.Storage.Volatile;
+import org.apache.aurora.scheduler.storage.Storage.Work;
+import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
+import org.apache.aurora.scheduler.storage.entities.ILock;
+import org.apache.aurora.scheduler.storage.entities.IQuota;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+
import static com.google.common.base.Preconditions.checkNotNull;
-import static com.twitter.aurora.gen.apiConstants.CURRENT_API_VERSION;
+import static org.apache.aurora.gen.apiConstants.CURRENT_API_VERSION;
/**
* Snapshot store implementation that delegates to underlying snapshot stores by
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/storage/log/testing/LogOpMatcher.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/log/testing/LogOpMatcher.java b/src/main/java/org/apache/aurora/scheduler/storage/log/testing/LogOpMatcher.java
index a4c0126..ae1f72f 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/log/testing/LogOpMatcher.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/log/testing/LogOpMatcher.java
@@ -13,25 +13,25 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage.log.testing;
+package org.apache.aurora.scheduler.storage.log.testing;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
+import org.apache.aurora.codec.ThriftBinaryCodec;
+import org.apache.aurora.codec.ThriftBinaryCodec.CodingException;
+import org.apache.aurora.gen.storage.LogEntry;
+import org.apache.aurora.gen.storage.Op;
+import org.apache.aurora.gen.storage.Snapshot;
+import org.apache.aurora.gen.storage.Transaction;
+import org.apache.aurora.gen.storage.storageConstants;
+import org.apache.aurora.scheduler.log.Log.Position;
+import org.apache.aurora.scheduler.log.Log.Stream;
+
import org.easymock.EasyMock;
import org.easymock.IArgumentMatcher;
import org.easymock.IExpectationSetters;
-import com.twitter.aurora.codec.ThriftBinaryCodec;
-import com.twitter.aurora.codec.ThriftBinaryCodec.CodingException;
-import com.twitter.aurora.gen.storage.LogEntry;
-import com.twitter.aurora.gen.storage.Op;
-import com.twitter.aurora.gen.storage.Snapshot;
-import com.twitter.aurora.gen.storage.Transaction;
-import com.twitter.aurora.gen.storage.storageConstants;
-import com.twitter.aurora.scheduler.log.Log.Position;
-import com.twitter.aurora.scheduler.log.Log.Stream;
-
import static org.easymock.EasyMock.expect;
/**
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/storage/mem/Interner.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/mem/Interner.java b/src/main/java/org/apache/aurora/scheduler/storage/mem/Interner.java
index bf05caa..f157d81 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/mem/Interner.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/mem/Interner.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage.mem;
+package org.apache.aurora.scheduler.storage.mem;
import java.util.Map;
import java.util.Set;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/storage/mem/MemAttributeStore.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemAttributeStore.java b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemAttributeStore.java
index 6c383c7..c7ff5d9 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemAttributeStore.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemAttributeStore.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage.mem;
+package org.apache.aurora.scheduler.storage.mem;
import java.util.Set;
import java.util.concurrent.ConcurrentMap;
@@ -22,10 +22,10 @@ import com.google.common.base.Optional;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
-import com.twitter.aurora.gen.Attribute;
-import com.twitter.aurora.gen.HostAttributes;
-import com.twitter.aurora.gen.MaintenanceMode;
-import com.twitter.aurora.scheduler.storage.AttributeStore.Mutable;
+import org.apache.aurora.gen.Attribute;
+import org.apache.aurora.gen.HostAttributes;
+import org.apache.aurora.gen.MaintenanceMode;
+import org.apache.aurora.scheduler.storage.AttributeStore.Mutable;
/**
* An in-memory attribute store.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/storage/mem/MemJobStore.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemJobStore.java b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemJobStore.java
index 8268e8d..471b7a5 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemJobStore.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemJobStore.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage.mem;
+package org.apache.aurora.scheduler.storage.mem;
import java.util.Map;
import java.util.Set;
@@ -27,10 +27,10 @@ import com.google.common.cache.LoadingCache;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
-import com.twitter.aurora.scheduler.base.JobKeys;
-import com.twitter.aurora.scheduler.storage.JobStore;
-import com.twitter.aurora.scheduler.storage.entities.IJobConfiguration;
-import com.twitter.aurora.scheduler.storage.entities.IJobKey;
+import org.apache.aurora.scheduler.base.JobKeys;
+import org.apache.aurora.scheduler.storage.JobStore;
+import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
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/storage/mem/MemLockStore.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemLockStore.java b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemLockStore.java
index 1ced973..df04d6d 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemLockStore.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemLockStore.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage.mem;
+package org.apache.aurora.scheduler.storage.mem;
import java.util.Map;
import java.util.Set;
@@ -22,9 +22,9 @@ import com.google.common.base.Optional;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
-import com.twitter.aurora.scheduler.storage.LockStore;
-import com.twitter.aurora.scheduler.storage.entities.ILock;
-import com.twitter.aurora.scheduler.storage.entities.ILockKey;
+import org.apache.aurora.scheduler.storage.LockStore;
+import org.apache.aurora.scheduler.storage.entities.ILock;
+import org.apache.aurora.scheduler.storage.entities.ILockKey;
/**
* An in-memory lock store.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/storage/mem/MemQuotaStore.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemQuotaStore.java b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemQuotaStore.java
index 855b39c..54ed29d 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemQuotaStore.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemQuotaStore.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage.mem;
+package org.apache.aurora.scheduler.storage.mem;
import java.util.Map;
@@ -21,8 +21,8 @@ import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
-import com.twitter.aurora.scheduler.storage.QuotaStore;
-import com.twitter.aurora.scheduler.storage.entities.IQuota;
+import org.apache.aurora.scheduler.storage.QuotaStore;
+import org.apache.aurora.scheduler.storage.entities.IQuota;
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/storage/mem/MemSchedulerStore.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemSchedulerStore.java b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemSchedulerStore.java
index 19bf4ec..b4dd5aa 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemSchedulerStore.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemSchedulerStore.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage.mem;
+package org.apache.aurora.scheduler.storage.mem;
import java.util.concurrent.atomic.AtomicReference;
@@ -21,7 +21,7 @@ import javax.annotation.Nullable;
import com.google.common.util.concurrent.Atomics;
-import com.twitter.aurora.scheduler.storage.SchedulerStore;
+import org.apache.aurora.scheduler.storage.SchedulerStore;
/**
* An in-memory scheduler store.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorage.java b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorage.java
index 438c023..1cdf15e 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorage.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorage.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage.mem;
+package org.apache.aurora.scheduler.storage.mem;
import java.util.concurrent.atomic.AtomicLong;
@@ -21,17 +21,18 @@ import javax.inject.Inject;
import com.google.common.annotations.VisibleForTesting;
-import com.twitter.aurora.scheduler.storage.AttributeStore;
-import com.twitter.aurora.scheduler.storage.JobStore;
-import com.twitter.aurora.scheduler.storage.LockStore;
-import com.twitter.aurora.scheduler.storage.QuotaStore;
-import com.twitter.aurora.scheduler.storage.ReadWriteLockManager;
-import com.twitter.aurora.scheduler.storage.SchedulerStore;
-import com.twitter.aurora.scheduler.storage.Storage;
-import com.twitter.aurora.scheduler.storage.TaskStore;
import com.twitter.common.inject.TimedInterceptor.Timed;
import com.twitter.common.stats.Stats;
+import org.apache.aurora.scheduler.storage.AttributeStore;
+import org.apache.aurora.scheduler.storage.JobStore;
+import org.apache.aurora.scheduler.storage.LockStore;
+import org.apache.aurora.scheduler.storage.QuotaStore;
+import org.apache.aurora.scheduler.storage.ReadWriteLockManager;
+import org.apache.aurora.scheduler.storage.SchedulerStore;
+import org.apache.aurora.scheduler.storage.Storage;
+import org.apache.aurora.scheduler.storage.TaskStore;
+
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/storage/mem/MemStorageModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorageModule.java b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorageModule.java
index a99aa12..1e36a86 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorageModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorageModule.java
@@ -13,23 +13,24 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage.mem;
+package org.apache.aurora.scheduler.storage.mem;
import javax.inject.Singleton;
import com.google.inject.Key;
import com.google.inject.PrivateModule;
-import com.twitter.aurora.scheduler.storage.AttributeStore;
-import com.twitter.aurora.scheduler.storage.JobStore;
-import com.twitter.aurora.scheduler.storage.LockStore;
-import com.twitter.aurora.scheduler.storage.QuotaStore;
-import com.twitter.aurora.scheduler.storage.SchedulerStore;
-import com.twitter.aurora.scheduler.storage.Storage;
-import com.twitter.aurora.scheduler.storage.Storage.Volatile;
-import com.twitter.aurora.scheduler.storage.TaskStore;
import com.twitter.common.inject.Bindings.KeyFactory;
+import org.apache.aurora.scheduler.storage.AttributeStore;
+import org.apache.aurora.scheduler.storage.JobStore;
+import org.apache.aurora.scheduler.storage.LockStore;
+import org.apache.aurora.scheduler.storage.QuotaStore;
+import org.apache.aurora.scheduler.storage.SchedulerStore;
+import org.apache.aurora.scheduler.storage.Storage;
+import org.apache.aurora.scheduler.storage.Storage.Volatile;
+import org.apache.aurora.scheduler.storage.TaskStore;
+
import static com.google.common.base.Preconditions.checkNotNull;
/**
@@ -37,15 +38,15 @@ import static com.google.common.base.Preconditions.checkNotNull;
* <p>
* Exposes bindings for storage components:
* <ul>
- * <li>{@link com.twitter.aurora.scheduler.storage.Storage}</li>
+ * <li>{@link org.apache.aurora.scheduler.storage.Storage}</li>
* <li>Keyed with keys provided by the provided{@code keyFactory}:</li>
* <ul>
- * <li>{@link com.twitter.aurora.scheduler.storage.SchedulerStore}</li>
- * <li>{@link com.twitter.aurora.scheduler.storage.JobStore}</li>
- * <li>{@link com.twitter.aurora.scheduler.storage.TaskStore}</li>
- * <li>{@link com.twitter.aurora.scheduler.storage.LockStore}</li>
- * <li>{@link com.twitter.aurora.scheduler.storage.QuotaStore}</li>
- * <li>{@link com.twitter.aurora.scheduler.storage.AttributeStore}</li>
+ * <li>{@link org.apache.aurora.scheduler.storage.SchedulerStore}</li>
+ * <li>{@link org.apache.aurora.scheduler.storage.JobStore}</li>
+ * <li>{@link org.apache.aurora.scheduler.storage.TaskStore}</li>
+ * <li>{@link org.apache.aurora.scheduler.storage.LockStore}</li>
+ * <li>{@link org.apache.aurora.scheduler.storage.QuotaStore}</li>
+ * <li>{@link org.apache.aurora.scheduler.storage.AttributeStore}</li>
* </ul>
* </ul>
*/
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/storage/mem/MemTaskStore.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemTaskStore.java b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemTaskStore.java
index d02511f..7abd7e1 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemTaskStore.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemTaskStore.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage.mem;
+package org.apache.aurora.scheduler.storage.mem;
import java.util.Collection;
import java.util.Map;
@@ -36,18 +36,6 @@ import com.google.common.collect.Maps;
import com.google.common.collect.Multimap;
import com.google.common.collect.Multimaps;
-import org.apache.commons.lang.StringUtils;
-
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.gen.TaskQuery;
-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.storage.TaskStore;
-import com.twitter.aurora.scheduler.storage.entities.IJobKey;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
import com.twitter.common.args.Arg;
import com.twitter.common.args.CmdLine;
import com.twitter.common.base.MorePreconditions;
@@ -56,6 +44,19 @@ import com.twitter.common.quantity.Amount;
import com.twitter.common.quantity.Time;
import com.twitter.common.stats.Stats;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.gen.TaskQuery;
+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.storage.TaskStore;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
+
+import org.apache.commons.lang.StringUtils;
+
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/storage/mem/Util.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/mem/Util.java b/src/main/java/org/apache/aurora/scheduler/storage/mem/Util.java
index cf1b057..0368d46 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/mem/Util.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/mem/Util.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage.mem;
+package org.apache.aurora.scheduler.storage.mem;
import javax.annotation.Nullable;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/storage/testing/StorageTestUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/testing/StorageTestUtil.java b/src/main/java/org/apache/aurora/scheduler/storage/testing/StorageTestUtil.java
index d735828..5832b3f 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/testing/StorageTestUtil.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/testing/StorageTestUtil.java
@@ -13,29 +13,30 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage.testing;
+package org.apache.aurora.scheduler.storage.testing;
import com.google.common.collect.ImmutableSet;
+import com.twitter.common.testing.easymock.EasyMockTest;
+
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.storage.AttributeStore;
+import org.apache.aurora.scheduler.storage.JobStore;
+import org.apache.aurora.scheduler.storage.LockStore;
+import org.apache.aurora.scheduler.storage.QuotaStore;
+import org.apache.aurora.scheduler.storage.SchedulerStore;
+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.TaskStore;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+
import org.easymock.Capture;
import org.easymock.IAnswer;
import org.easymock.IExpectationSetters;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.storage.AttributeStore;
-import com.twitter.aurora.scheduler.storage.JobStore;
-import com.twitter.aurora.scheduler.storage.LockStore;
-import com.twitter.aurora.scheduler.storage.QuotaStore;
-import com.twitter.aurora.scheduler.storage.SchedulerStore;
-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.TaskStore;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.common.testing.easymock.EasyMockTest;
-
import static org.easymock.EasyMock.capture;
import static org.easymock.EasyMock.expect;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/thrift/SchedulerAPIServlet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/thrift/SchedulerAPIServlet.java b/src/main/java/org/apache/aurora/scheduler/thrift/SchedulerAPIServlet.java
index 2acf5c8..689b479 100644
--- a/src/main/java/org/apache/aurora/scheduler/thrift/SchedulerAPIServlet.java
+++ b/src/main/java/org/apache/aurora/scheduler/thrift/SchedulerAPIServlet.java
@@ -1,12 +1,12 @@
-package com.twitter.aurora.scheduler.thrift;
+package org.apache.aurora.scheduler.thrift;
import javax.inject.Inject;
+import org.apache.aurora.gen.AuroraAdmin;
+
import org.apache.thrift.protocol.TJSONProtocol;
import org.apache.thrift.server.TServlet;
-import com.twitter.aurora.gen.AuroraAdmin;
-
/**
* A servlet that exposes the scheduler Thrift API over HTTP/JSON.
*/
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterface.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterface.java b/src/main/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterface.java
index 3ff0f1c..177cb84 100644
--- a/src/main/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterface.java
+++ b/src/main/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterface.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.thrift;
+package org.apache.aurora.scheduler.thrift;
import java.util.Collection;
import java.util.List;
@@ -43,79 +43,6 @@ import com.google.common.collect.Multimap;
import com.google.common.collect.Multimaps;
import com.google.common.collect.Sets;
-import org.apache.commons.lang.StringUtils;
-
-import com.twitter.aurora.auth.CapabilityValidator;
-import com.twitter.aurora.auth.CapabilityValidator.AuditCheck;
-import com.twitter.aurora.auth.CapabilityValidator.Capability;
-import com.twitter.aurora.auth.SessionValidator.AuthFailedException;
-import com.twitter.aurora.gen.AcquireLockResult;
-import com.twitter.aurora.gen.AddInstancesConfig;
-import com.twitter.aurora.gen.AuroraAdmin;
-import com.twitter.aurora.gen.ConfigRewrite;
-import com.twitter.aurora.gen.DrainHostsResult;
-import com.twitter.aurora.gen.EndMaintenanceResult;
-import com.twitter.aurora.gen.GetJobsResult;
-import com.twitter.aurora.gen.GetQuotaResult;
-import com.twitter.aurora.gen.Hosts;
-import com.twitter.aurora.gen.InstanceConfigRewrite;
-import com.twitter.aurora.gen.InstanceKey;
-import com.twitter.aurora.gen.JobConfigRewrite;
-import com.twitter.aurora.gen.JobConfigValidation;
-import com.twitter.aurora.gen.JobConfiguration;
-import com.twitter.aurora.gen.JobKey;
-import com.twitter.aurora.gen.JobSummary;
-import com.twitter.aurora.gen.JobSummaryResult;
-import com.twitter.aurora.gen.ListBackupsResult;
-import com.twitter.aurora.gen.Lock;
-import com.twitter.aurora.gen.LockKey;
-import com.twitter.aurora.gen.LockValidation;
-import com.twitter.aurora.gen.MaintenanceStatusResult;
-import com.twitter.aurora.gen.PopulateJobResult;
-import com.twitter.aurora.gen.QueryRecoveryResult;
-import com.twitter.aurora.gen.Quota;
-import com.twitter.aurora.gen.Response;
-import com.twitter.aurora.gen.ResponseCode;
-import com.twitter.aurora.gen.Result;
-import com.twitter.aurora.gen.RewriteConfigsRequest;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.ScheduleStatusResult;
-import com.twitter.aurora.gen.SessionKey;
-import com.twitter.aurora.gen.StartMaintenanceResult;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.gen.TaskQuery;
-import com.twitter.aurora.scheduler.base.JobKeys;
-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.configuration.ConfigurationManager;
-import com.twitter.aurora.scheduler.configuration.ConfigurationManager.TaskDescriptionException;
-import com.twitter.aurora.scheduler.configuration.SanitizedConfiguration;
-import com.twitter.aurora.scheduler.quota.Quotas;
-import com.twitter.aurora.scheduler.state.CronJobManager;
-import com.twitter.aurora.scheduler.state.LockManager;
-import com.twitter.aurora.scheduler.state.LockManager.LockException;
-import com.twitter.aurora.scheduler.state.MaintenanceController;
-import com.twitter.aurora.scheduler.state.SchedulerCore;
-import com.twitter.aurora.scheduler.storage.JobStore;
-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.Storage.StoreProvider;
-import com.twitter.aurora.scheduler.storage.Storage.Work;
-import com.twitter.aurora.scheduler.storage.backup.Recovery;
-import com.twitter.aurora.scheduler.storage.backup.Recovery.RecoveryException;
-import com.twitter.aurora.scheduler.storage.backup.StorageBackup;
-import com.twitter.aurora.scheduler.storage.entities.IAssignedTask;
-import com.twitter.aurora.scheduler.storage.entities.IJobConfiguration;
-import com.twitter.aurora.scheduler.storage.entities.IJobKey;
-import com.twitter.aurora.scheduler.storage.entities.ILock;
-import com.twitter.aurora.scheduler.storage.entities.ILockKey;
-import com.twitter.aurora.scheduler.storage.entities.IQuota;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
-import com.twitter.aurora.scheduler.thrift.auth.DecoratedThrift;
-import com.twitter.aurora.scheduler.thrift.auth.Requires;
import com.twitter.common.args.Arg;
import com.twitter.common.args.CmdLine;
import com.twitter.common.base.MorePreconditions;
@@ -124,17 +51,92 @@ import com.twitter.common.quantity.Amount;
import com.twitter.common.quantity.Time;
import com.twitter.common.util.BackoffHelper;
+import org.apache.aurora.auth.CapabilityValidator;
+import org.apache.aurora.auth.CapabilityValidator.AuditCheck;
+import org.apache.aurora.auth.CapabilityValidator.Capability;
+import org.apache.aurora.auth.SessionValidator.AuthFailedException;
+import org.apache.aurora.gen.AcquireLockResult;
+import org.apache.aurora.gen.AddInstancesConfig;
+import org.apache.aurora.gen.AuroraAdmin;
+import org.apache.aurora.gen.ConfigRewrite;
+import org.apache.aurora.gen.DrainHostsResult;
+import org.apache.aurora.gen.EndMaintenanceResult;
+import org.apache.aurora.gen.GetJobsResult;
+import org.apache.aurora.gen.GetQuotaResult;
+import org.apache.aurora.gen.Hosts;
+import org.apache.aurora.gen.InstanceConfigRewrite;
+import org.apache.aurora.gen.InstanceKey;
+import org.apache.aurora.gen.JobConfigRewrite;
+import org.apache.aurora.gen.JobConfigValidation;
+import org.apache.aurora.gen.JobConfiguration;
+import org.apache.aurora.gen.JobKey;
+import org.apache.aurora.gen.JobSummary;
+import org.apache.aurora.gen.JobSummaryResult;
+import org.apache.aurora.gen.ListBackupsResult;
+import org.apache.aurora.gen.Lock;
+import org.apache.aurora.gen.LockKey;
+import org.apache.aurora.gen.LockValidation;
+import org.apache.aurora.gen.MaintenanceStatusResult;
+import org.apache.aurora.gen.PopulateJobResult;
+import org.apache.aurora.gen.QueryRecoveryResult;
+import org.apache.aurora.gen.Quota;
+import org.apache.aurora.gen.Response;
+import org.apache.aurora.gen.ResponseCode;
+import org.apache.aurora.gen.Result;
+import org.apache.aurora.gen.RewriteConfigsRequest;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.ScheduleStatusResult;
+import org.apache.aurora.gen.SessionKey;
+import org.apache.aurora.gen.StartMaintenanceResult;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.gen.TaskQuery;
+import org.apache.aurora.scheduler.base.JobKeys;
+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.configuration.ConfigurationManager;
+import org.apache.aurora.scheduler.configuration.ConfigurationManager.TaskDescriptionException;
+import org.apache.aurora.scheduler.configuration.SanitizedConfiguration;
+import org.apache.aurora.scheduler.quota.Quotas;
+import org.apache.aurora.scheduler.state.CronJobManager;
+import org.apache.aurora.scheduler.state.LockManager;
+import org.apache.aurora.scheduler.state.LockManager.LockException;
+import org.apache.aurora.scheduler.state.MaintenanceController;
+import org.apache.aurora.scheduler.state.SchedulerCore;
+import org.apache.aurora.scheduler.storage.JobStore;
+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.Storage.StoreProvider;
+import org.apache.aurora.scheduler.storage.Storage.Work;
+import org.apache.aurora.scheduler.storage.backup.Recovery;
+import org.apache.aurora.scheduler.storage.backup.Recovery.RecoveryException;
+import org.apache.aurora.scheduler.storage.backup.StorageBackup;
+import org.apache.aurora.scheduler.storage.entities.IAssignedTask;
+import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
+import org.apache.aurora.scheduler.storage.entities.ILock;
+import org.apache.aurora.scheduler.storage.entities.ILockKey;
+import org.apache.aurora.scheduler.storage.entities.IQuota;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
+import org.apache.aurora.scheduler.thrift.auth.DecoratedThrift;
+import org.apache.aurora.scheduler.thrift.auth.Requires;
+
+import org.apache.commons.lang.StringUtils;
+
import static com.google.common.base.Preconditions.checkNotNull;
-import static com.twitter.aurora.auth.SessionValidator.SessionContext;
-import static com.twitter.aurora.gen.ResponseCode.AUTH_FAILED;
-import static com.twitter.aurora.gen.ResponseCode.ERROR;
-import static com.twitter.aurora.gen.ResponseCode.INVALID_REQUEST;
-import static com.twitter.aurora.gen.ResponseCode.LOCK_ERROR;
-import static com.twitter.aurora.gen.ResponseCode.OK;
-import static com.twitter.aurora.gen.apiConstants.CURRENT_API_VERSION;
import static com.twitter.common.base.MorePreconditions.checkNotBlank;
+import static org.apache.aurora.auth.SessionValidator.SessionContext;
+import static org.apache.aurora.gen.ResponseCode.AUTH_FAILED;
+import static org.apache.aurora.gen.ResponseCode.ERROR;
+import static org.apache.aurora.gen.ResponseCode.INVALID_REQUEST;
+import static org.apache.aurora.gen.ResponseCode.LOCK_ERROR;
+import static org.apache.aurora.gen.ResponseCode.OK;
+import static org.apache.aurora.gen.apiConstants.CURRENT_API_VERSION;
+
/**
* Aurora scheduler thrift server implementation.
* <p>
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/thrift/ThriftConfiguration.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/thrift/ThriftConfiguration.java b/src/main/java/org/apache/aurora/scheduler/thrift/ThriftConfiguration.java
index c6e9b18..4659a0d 100644
--- a/src/main/java/org/apache/aurora/scheduler/thrift/ThriftConfiguration.java
+++ b/src/main/java/org/apache/aurora/scheduler/thrift/ThriftConfiguration.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.thrift;
+package org.apache.aurora.scheduler.thrift;
import java.io.IOException;
import java.io.InputStream;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/thrift/ThriftModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/thrift/ThriftModule.java b/src/main/java/org/apache/aurora/scheduler/thrift/ThriftModule.java
index cca9053..2514cfe 100644
--- a/src/main/java/org/apache/aurora/scheduler/thrift/ThriftModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/thrift/ThriftModule.java
@@ -13,17 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.thrift;
+package org.apache.aurora.scheduler.thrift;
import javax.inject.Singleton;
import com.google.inject.AbstractModule;
-import com.twitter.aurora.gen.AuroraAdmin;
-import com.twitter.aurora.scheduler.thrift.aop.AopModule;
import com.twitter.common.application.http.Registration;
import com.twitter.common.application.modules.LifecycleModule;
+import org.apache.aurora.gen.AuroraAdmin;
+import org.apache.aurora.scheduler.thrift.aop.AopModule;
+
/**
* Binding module to configure a thrift server.
*/
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/thrift/ThriftServer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/thrift/ThriftServer.java b/src/main/java/org/apache/aurora/scheduler/thrift/ThriftServer.java
index 7b9abd1..3581412 100644
--- a/src/main/java/org/apache/aurora/scheduler/thrift/ThriftServer.java
+++ b/src/main/java/org/apache/aurora/scheduler/thrift/ThriftServer.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.thrift;
+package org.apache.aurora.scheduler.thrift;
import java.net.ServerSocket;
import java.util.logging.Level;
@@ -22,14 +22,14 @@ import java.util.logging.Logger;
import com.google.common.base.Preconditions;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.twitter.thrift.Status;
+
import org.apache.thrift.TProcessor;
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.server.TServer;
import org.apache.thrift.server.TThreadPoolServer;
import org.apache.thrift.transport.TServerSocket;
-import com.twitter.thrift.Status;
-
class ThriftServer {
private static final Logger LOG = Logger.getLogger(ThriftServer.class.getName());
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/thrift/ThriftServerLauncher.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/thrift/ThriftServerLauncher.java b/src/main/java/org/apache/aurora/scheduler/thrift/ThriftServerLauncher.java
index 6743060..13b4dd1 100644
--- a/src/main/java/org/apache/aurora/scheduler/thrift/ThriftServerLauncher.java
+++ b/src/main/java/org/apache/aurora/scheduler/thrift/ThriftServerLauncher.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.thrift;
+package org.apache.aurora.scheduler.thrift;
import java.io.IOException;
import java.io.InputStream;
@@ -30,12 +30,13 @@ import javax.net.ssl.SSLServerSocketFactory;
import com.google.common.base.Optional;
-import com.twitter.aurora.gen.AuroraAdmin;
-import com.twitter.aurora.gen.AuroraAdmin.Iface;
import com.twitter.common.application.modules.LifecycleModule.ServiceRunner;
import com.twitter.common.application.modules.LocalServiceRegistry.LocalService;
import com.twitter.common.base.Command;
+import org.apache.aurora.gen.AuroraAdmin;
+import org.apache.aurora.gen.AuroraAdmin.Iface;
+
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/thrift/aop/APIVersionInterceptor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/thrift/aop/APIVersionInterceptor.java b/src/main/java/org/apache/aurora/scheduler/thrift/aop/APIVersionInterceptor.java
index d66a2b2..a19d805 100644
--- a/src/main/java/org/apache/aurora/scheduler/thrift/aop/APIVersionInterceptor.java
+++ b/src/main/java/org/apache/aurora/scheduler/thrift/aop/APIVersionInterceptor.java
@@ -1,11 +1,11 @@
-package com.twitter.aurora.scheduler.thrift.aop;
+package org.apache.aurora.scheduler.thrift.aop;
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
-import com.twitter.aurora.gen.Response;
+import org.apache.aurora.gen.Response;
-import static com.twitter.aurora.gen.apiConstants.CURRENT_API_VERSION;
+import static org.apache.aurora.gen.apiConstants.CURRENT_API_VERSION;
class APIVersionInterceptor implements MethodInterceptor {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/thrift/aop/AopModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/thrift/aop/AopModule.java b/src/main/java/org/apache/aurora/scheduler/thrift/aop/AopModule.java
index 4afc263..a953b40 100644
--- a/src/main/java/org/apache/aurora/scheduler/thrift/aop/AopModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/thrift/aop/AopModule.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.thrift.aop;
+package org.apache.aurora.scheduler.thrift.aop;
import java.lang.reflect.Method;
import java.util.List;
@@ -38,16 +38,17 @@ import com.google.inject.TypeLiteral;
import com.google.inject.matcher.Matcher;
import com.google.inject.matcher.Matchers;
-import org.aopalliance.intercept.MethodInterceptor;
-
-import com.twitter.aurora.GuiceUtils;
-import com.twitter.aurora.auth.CapabilityValidator;
-import com.twitter.aurora.gen.AuroraAdmin;
-import com.twitter.aurora.gen.AuroraSchedulerManager;
-import com.twitter.aurora.scheduler.thrift.auth.DecoratedThrift;
import com.twitter.common.args.Arg;
import com.twitter.common.args.CmdLine;
+import org.aopalliance.intercept.MethodInterceptor;
+
+import org.apache.aurora.GuiceUtils;
+import org.apache.aurora.auth.CapabilityValidator;
+import org.apache.aurora.gen.AuroraAdmin;
+import org.apache.aurora.gen.AuroraSchedulerManager;
+import org.apache.aurora.scheduler.thrift.auth.DecoratedThrift;
+
/**
* Binding module for AOP-style decorations of the thrift API.
*/
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/thrift/aop/FeatureToggleInterceptor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/thrift/aop/FeatureToggleInterceptor.java b/src/main/java/org/apache/aurora/scheduler/thrift/aop/FeatureToggleInterceptor.java
index 03c3d99..68e9642 100644
--- a/src/main/java/org/apache/aurora/scheduler/thrift/aop/FeatureToggleInterceptor.java
+++ b/src/main/java/org/apache/aurora/scheduler/thrift/aop/FeatureToggleInterceptor.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.thrift.aop;
+package org.apache.aurora.scheduler.thrift.aop;
import java.lang.reflect.Method;
@@ -24,7 +24,7 @@ import com.google.common.base.Predicate;
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
-import com.twitter.aurora.gen.ResponseCode;
+import org.apache.aurora.gen.ResponseCode;
/**
* A method interceptor that blocks access to features based on a supplied predicate.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/thrift/aop/Interceptors.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/thrift/aop/Interceptors.java b/src/main/java/org/apache/aurora/scheduler/thrift/aop/Interceptors.java
index d0cb9c1..4f3b705 100644
--- a/src/main/java/org/apache/aurora/scheduler/thrift/aop/Interceptors.java
+++ b/src/main/java/org/apache/aurora/scheduler/thrift/aop/Interceptors.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.thrift.aop;
+package org.apache.aurora.scheduler.thrift.aop;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -21,7 +21,7 @@ import java.util.logging.Logger;
import com.google.common.base.Throwables;
-import com.twitter.aurora.gen.ResponseCode;
+import org.apache.aurora.gen.ResponseCode;
/**
* Utility class for functions useful when implementing an interceptor on the thrift interface.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/thrift/aop/LoggingInterceptor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/thrift/aop/LoggingInterceptor.java b/src/main/java/org/apache/aurora/scheduler/thrift/aop/LoggingInterceptor.java
index 5f773cc..93486aa 100644
--- a/src/main/java/org/apache/aurora/scheduler/thrift/aop/LoggingInterceptor.java
+++ b/src/main/java/org/apache/aurora/scheduler/thrift/aop/LoggingInterceptor.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.thrift.aop;
+package org.apache.aurora.scheduler.thrift.aop;
import java.util.List;
import java.util.Map;
@@ -30,13 +30,13 @@ import com.google.common.collect.Lists;
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
-import com.twitter.aurora.auth.CapabilityValidator;
-import com.twitter.aurora.gen.ExecutorConfig;
-import com.twitter.aurora.gen.JobConfiguration;
-import com.twitter.aurora.gen.ResponseCode;
-import com.twitter.aurora.gen.SessionKey;
+import org.apache.aurora.auth.CapabilityValidator;
+import org.apache.aurora.gen.ExecutorConfig;
+import org.apache.aurora.gen.JobConfiguration;
+import org.apache.aurora.gen.ResponseCode;
+import org.apache.aurora.gen.SessionKey;
-import static com.twitter.aurora.scheduler.thrift.aop.Interceptors.properlyTypedResponse;
+import static org.apache.aurora.scheduler.thrift.aop.Interceptors.properlyTypedResponse;
/**
* A method interceptor that logs all invocations as well as any unchecked exceptions thrown from
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/thrift/aop/ThriftStatsExporterInterceptor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/thrift/aop/ThriftStatsExporterInterceptor.java b/src/main/java/org/apache/aurora/scheduler/thrift/aop/ThriftStatsExporterInterceptor.java
index d700ab5..c86cd08 100644
--- a/src/main/java/org/apache/aurora/scheduler/thrift/aop/ThriftStatsExporterInterceptor.java
+++ b/src/main/java/org/apache/aurora/scheduler/thrift/aop/ThriftStatsExporterInterceptor.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.thrift.aop;
+package org.apache.aurora.scheduler.thrift.aop;
import java.lang.reflect.Method;
@@ -21,12 +21,12 @@ import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-
import com.twitter.common.stats.SlidingStats;
import com.twitter.common.stats.Stats;
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
+
/**
* A method interceptor that exports counterStats about thrift calls.
*/
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/thrift/aop/UserCapabilityInterceptor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/thrift/aop/UserCapabilityInterceptor.java b/src/main/java/org/apache/aurora/scheduler/thrift/aop/UserCapabilityInterceptor.java
index d9240bc..9090e00 100644
--- a/src/main/java/org/apache/aurora/scheduler/thrift/aop/UserCapabilityInterceptor.java
+++ b/src/main/java/org/apache/aurora/scheduler/thrift/aop/UserCapabilityInterceptor.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.thrift.aop;
+package org.apache.aurora.scheduler.thrift.aop;
import java.lang.reflect.Method;
import java.util.Arrays;
@@ -32,13 +32,13 @@ import com.google.common.collect.ImmutableList;
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
-import com.twitter.aurora.auth.CapabilityValidator;
-import com.twitter.aurora.auth.CapabilityValidator.AuditCheck;
-import com.twitter.aurora.auth.CapabilityValidator.Capability;
-import com.twitter.aurora.auth.SessionValidator.AuthFailedException;
-import com.twitter.aurora.gen.ResponseCode;
-import com.twitter.aurora.gen.SessionKey;
-import com.twitter.aurora.scheduler.thrift.auth.Requires;
+import org.apache.aurora.auth.CapabilityValidator;
+import org.apache.aurora.auth.CapabilityValidator.AuditCheck;
+import org.apache.aurora.auth.CapabilityValidator.Capability;
+import org.apache.aurora.auth.SessionValidator.AuthFailedException;
+import org.apache.aurora.gen.ResponseCode;
+import org.apache.aurora.gen.SessionKey;
+import org.apache.aurora.scheduler.thrift.auth.Requires;
/**
* A method interceptor that will authenticate users identified by a {@link SessionKey} argument
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/thrift/auth/DecoratedThrift.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/thrift/auth/DecoratedThrift.java b/src/main/java/org/apache/aurora/scheduler/thrift/auth/DecoratedThrift.java
index 4a667c5..a17127b 100644
--- a/src/main/java/org/apache/aurora/scheduler/thrift/auth/DecoratedThrift.java
+++ b/src/main/java/org/apache/aurora/scheduler/thrift/auth/DecoratedThrift.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.thrift.auth;
+package org.apache.aurora.scheduler.thrift.auth;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/java/org/apache/aurora/scheduler/thrift/auth/Requires.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/thrift/auth/Requires.java b/src/main/java/org/apache/aurora/scheduler/thrift/auth/Requires.java
index 0fff3f6..766e874 100644
--- a/src/main/java/org/apache/aurora/scheduler/thrift/auth/Requires.java
+++ b/src/main/java/org/apache/aurora/scheduler/thrift/auth/Requires.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.thrift.auth;
+package org.apache.aurora.scheduler.thrift.auth;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import com.twitter.aurora.auth.CapabilityValidator.Capability;
+import org.apache.aurora.auth.CapabilityValidator.Capability;
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/scheduler/thrift/auth/ThriftAuthModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/thrift/auth/ThriftAuthModule.java b/src/main/java/org/apache/aurora/scheduler/thrift/auth/ThriftAuthModule.java
index 66f9033..e0a16dd 100644
--- a/src/main/java/org/apache/aurora/scheduler/thrift/auth/ThriftAuthModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/thrift/auth/ThriftAuthModule.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.thrift.auth;
+package org.apache.aurora.scheduler.thrift.auth;
import java.util.Map;
@@ -23,13 +23,14 @@ import com.google.common.collect.ImmutableMap;
import com.google.inject.AbstractModule;
import com.google.inject.TypeLiteral;
-import com.twitter.aurora.auth.CapabilityValidator;
-import com.twitter.aurora.auth.CapabilityValidator.Capability;
-import com.twitter.aurora.auth.SessionValidator;
import com.twitter.common.args.Arg;
import com.twitter.common.args.CmdLine;
import com.twitter.common.args.constraints.NotEmpty;
+import org.apache.aurora.auth.CapabilityValidator;
+import org.apache.aurora.auth.CapabilityValidator.Capability;
+import org.apache.aurora.auth.SessionValidator;
+
/**
* Binding module for authentication of users with special capabilities for admin functions.
*/
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/admin/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/admin/BUILD b/src/main/python/apache/aurora/admin/BUILD
index c8089b4..8560990 100644
--- a/src/main/python/apache/aurora/admin/BUILD
+++ b/src/main/python/apache/aurora/admin/BUILD
@@ -4,8 +4,8 @@ python_library(
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/log'),
pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
- pants('src/main/python/twitter/aurora/client:api'),
- pants('src/main/python/twitter/aurora/client:base'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+ pants('src/main/python/apache/aurora/client:api'),
+ pants('src/main/python/apache/aurora/client:base'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
]
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/admin/mesos_maintenance.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/admin/mesos_maintenance.py b/src/main/python/apache/aurora/admin/mesos_maintenance.py
index 4e14436..c2c251c 100644
--- a/src/main/python/apache/aurora/admin/mesos_maintenance.py
+++ b/src/main/python/apache/aurora/admin/mesos_maintenance.py
@@ -4,10 +4,10 @@ import time
from twitter.common import log
from twitter.common.quantity import Amount, Time
-from twitter.aurora.client.api import AuroraClientAPI
-from twitter.aurora.client.base import check_and_log_response
+from apache.aurora.client.api import AuroraClientAPI
+from apache.aurora.client.base import check_and_log_response
-from gen.twitter.aurora.ttypes import Hosts, MaintenanceMode
+from gen.apache.aurora.ttypes import Hosts, MaintenanceMode
def group_by_host(hostname):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/client/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/BUILD b/src/main/python/apache/aurora/client/BUILD
index 70eef2e..5102970 100644
--- a/src/main/python/apache/aurora/client/BUILD
+++ b/src/main/python/apache/aurora/client/BUILD
@@ -4,7 +4,7 @@ import os
python_library(
name = 'api',
dependencies = [
- pants('src/main/python/twitter/aurora/client/api')
+ pants('src/main/python/apache/aurora/client/api')
]
)
@@ -14,7 +14,7 @@ python_library(
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/app'),
pants('aurora/twitterdeps/src/python/twitter/common/log'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
]
)
@@ -30,13 +30,13 @@ python_library(
name = 'config',
sources = ['config.py'],
dependencies = [
- pants('src/main/python/twitter/aurora/BUILD.thirdparty:pystachio'),
+ pants('src/main/python/apache/aurora/BUILD.thirdparty:pystachio'),
pants(':base'),
pants(':binding_helper'),
pants('aurora/twitterdeps/src/python/twitter/common/app'),
pants('aurora/twitterdeps/src/python/twitter/common/log'),
- pants('src/main/python/twitter/aurora/config'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+ pants('src/main/python/apache/aurora/config'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
]
)
@@ -46,9 +46,9 @@ python_library(
dependencies = [
pants(':base'),
pants('aurora/twitterdeps/src/python/twitter/common/app'),
- pants('src/main/python/twitter/aurora/client/hooks'),
- pants('src/main/python/twitter/aurora/common:cluster'),
- pants('src/main/python/twitter/aurora/common:clusters'),
+ pants('src/main/python/apache/aurora/client/hooks'),
+ pants('src/main/python/apache/aurora/common:cluster'),
+ pants('src/main/python/apache/aurora/common:clusters'),
]
)
@@ -56,23 +56,23 @@ python_library(
name = 'options',
sources = ['options.py'],
dependencies = [
- pants('src/main/python/twitter/thermos/common:options'),
- pants('src/main/python/twitter/aurora/common:aurora_job_key'),
+ pants('src/main/python/apache/thermos/common:options'),
+ pants('src/main/python/apache/aurora/common:aurora_job_key'),
]
)
python_library(
name = 'client-packaged',
dependencies = [
- pants('src/main/python/twitter/aurora/common'),
- pants('src/main/python/twitter/aurora/config'),
- pants('src/main/python/twitter/thermos/common'),
+ pants('src/main/python/apache/aurora/common'),
+ pants('src/main/python/apache/aurora/config'),
+ pants('src/main/python/apache/thermos/common'),
],
provides = setup_py(
- name = 'twitter.aurora.client',
+ name = 'apache.aurora.client',
version = open(os.path.join(get_buildroot(), '.auroraversion')).read().strip().lower(),
).with_binaries(
- aurora_admin = pants('src/main/python/twitter/aurora/client/bin:aurora_admin'),
- aurora_client = pants('src/main/python/twitter/aurora/client/bin:aurora_client'),
+ aurora_admin = pants('src/main/python/apache/aurora/client/bin:aurora_admin'),
+ aurora_client = pants('src/main/python/apache/aurora/client/bin:aurora_client'),
)
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/client/api/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/api/BUILD b/src/main/python/apache/aurora/client/api/BUILD
index 4935b8a..9af74e9 100644
--- a/src/main/python/apache/aurora/client/api/BUILD
+++ b/src/main/python/apache/aurora/client/api/BUILD
@@ -7,8 +7,8 @@ python_library(
pants(':updater'),
pants('aurora/twitterdeps/src/python/twitter/common/lang'),
pants('aurora/twitterdeps/src/python/twitter/common/log'),
- pants('src/main/python/twitter/aurora/common'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+ pants('src/main/python/apache/aurora/common'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
]
)
@@ -16,12 +16,12 @@ python_library(
name = 'command_runner',
sources = ['command_runner.py'],
dependencies = [
- pants('src/main/python/twitter/aurora/BUILD.thirdparty:pystachio'),
+ pants('src/main/python/apache/aurora/BUILD.thirdparty:pystachio'),
pants(':api'),
- pants('src/main/python/twitter/thermos/config:schema'),
- pants('src/main/python/twitter/aurora/common:cluster'),
- pants('src/main/python/twitter/aurora/config:schema'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+ pants('src/main/python/apache/thermos/config:schema'),
+ pants('src/main/python/apache/aurora/common:cluster'),
+ pants('src/main/python/apache/aurora/config:schema'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
]
)
@@ -31,8 +31,8 @@ python_library(
dependencies = [
pants(':api'),
pants('aurora/twitterdeps/src/python/twitter/common/log'),
- pants('src/main/python/twitter/aurora/client:base'),
- pants('src/main/python/twitter/aurora/common'),
+ pants('src/main/python/apache/aurora/client:base'),
+ pants('src/main/python/apache/aurora/common'),
]
)
@@ -41,7 +41,7 @@ python_library(
sources = ['job_monitor.py'],
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
]
)
@@ -52,7 +52,7 @@ python_library(
pants(':instance_watcher'),
pants(':updater_util'),
pants('aurora/twitterdeps/src/python/twitter/common/log'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
]
)
@@ -65,9 +65,9 @@ python_library(
pants('aurora/twitterdeps/src/python/twitter/common/rpc/transports:tsslsocket'),
pants('aurora/twitterdeps/src/python/twitter/common/zookeeper/serverset:kazoo_serverset'),
pants('aurora/twitterdeps/src/python/twitter/common/zookeeper:kazoo_client'),
- pants('src/main/python/twitter/aurora/common/auth'),
- pants('src/main/python/twitter/aurora/common:cluster'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+ pants('src/main/python/apache/aurora/common/auth'),
+ pants('src/main/python/apache/aurora/common:cluster'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
]
)
@@ -78,8 +78,8 @@ python_library(
pants(':scheduler_client'),
pants('aurora/twitterdeps/src/python/twitter/common/lang'),
pants('aurora/twitterdeps/src/python/twitter/common/log'),
- pants('src/main/python/twitter/aurora/common:http_signaler'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+ pants('src/main/python/apache/aurora/common:http_signaler'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
]
)
@@ -91,7 +91,7 @@ python_library(
pants(':instance_watcher'),
pants(':updater_util'),
pants('aurora/twitterdeps/src/python/twitter/common/log'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
]
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/client/api/__init__.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/api/__init__.py b/src/main/python/apache/aurora/client/api/__init__.py
index 60f4011..09a646b 100644
--- a/src/main/python/apache/aurora/client/api/__init__.py
+++ b/src/main/python/apache/aurora/client/api/__init__.py
@@ -1,11 +1,11 @@
from twitter.common import log
-from twitter.aurora.common.aurora_job_key import AuroraJobKey
-from twitter.aurora.common.auth import make_session_key
-from twitter.aurora.common.cluster import Cluster
+from apache.aurora.common.aurora_job_key import AuroraJobKey
+from apache.aurora.common.auth import make_session_key
+from apache.aurora.common.cluster import Cluster
-from gen.twitter.aurora.constants import LIVE_STATES
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.constants import LIVE_STATES
+from gen.apache.aurora.ttypes import (
Response,
Identity,
Quota,
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/client/api/command_runner.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/api/command_runner.py b/src/main/python/apache/aurora/client/api/command_runner.py
index 0a8ad33..dda7424 100644
--- a/src/main/python/apache/aurora/client/api/command_runner.py
+++ b/src/main/python/apache/aurora/client/api/command_runner.py
@@ -4,13 +4,13 @@ import subprocess
from twitter.common import log
-from twitter.aurora.client.api import AuroraClientAPI
-from twitter.aurora.config.schema.base import MesosContext
-from twitter.aurora.common.cluster import Cluster
-from twitter.thermos.config.schema import ThermosContext
+from apache.aurora.client.api import AuroraClientAPI
+from apache.aurora.config.schema.base import MesosContext
+from apache.aurora.common.cluster import Cluster
+from apache.thermos.config.schema import ThermosContext
-from gen.twitter.aurora.constants import LIVE_STATES
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.constants import LIVE_STATES
+from gen.apache.aurora.ttypes import (
Identity,
ResponseCode,
TaskQuery)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/client/api/disambiguator.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/api/disambiguator.py b/src/main/python/apache/aurora/client/api/disambiguator.py
index 4693574..c3241de 100644
--- a/src/main/python/apache/aurora/client/api/disambiguator.py
+++ b/src/main/python/apache/aurora/client/api/disambiguator.py
@@ -1,8 +1,8 @@
from twitter.common import log
-from twitter.aurora.client.api import AuroraClientAPI
-from twitter.aurora.client.base import check_and_log_response, deprecation_warning, die
-from twitter.aurora.common.aurora_job_key import AuroraJobKey
+from apache.aurora.client.api import AuroraClientAPI
+from apache.aurora.client.base import check_and_log_response, deprecation_warning, die
+from apache.aurora.common.aurora_job_key import AuroraJobKey
class LiveJobDisambiguator(object):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/client/api/health_check.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/api/health_check.py b/src/main/python/apache/aurora/client/api/health_check.py
index b75ee6e..20a7cb1 100644
--- a/src/main/python/apache/aurora/client/api/health_check.py
+++ b/src/main/python/apache/aurora/client/api/health_check.py
@@ -3,9 +3,9 @@ from abc import abstractmethod
from twitter.common import log
from twitter.common.lang import Interface
-from twitter.aurora.common.http_signaler import HttpSignaler
+from apache.aurora.common.http_signaler import HttpSignaler
-from gen.twitter.aurora.ttypes import ScheduleStatus
+from gen.apache.aurora.ttypes import ScheduleStatus
class HealthCheck(Interface):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/client/api/instance_watcher.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/api/instance_watcher.py b/src/main/python/apache/aurora/client/api/instance_watcher.py
index 5c69487..4043948 100644
--- a/src/main/python/apache/aurora/client/api/instance_watcher.py
+++ b/src/main/python/apache/aurora/client/api/instance_watcher.py
@@ -3,7 +3,7 @@ import time
from twitter.common import log
from .health_check import InstanceWatcherHealthCheck
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
Identity,
ResponseCode,
ScheduleStatus,
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/client/api/job_monitor.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/api/job_monitor.py b/src/main/python/apache/aurora/client/api/job_monitor.py
index 45edd1a..f444d1e 100644
--- a/src/main/python/apache/aurora/client/api/job_monitor.py
+++ b/src/main/python/apache/aurora/client/api/job_monitor.py
@@ -2,11 +2,11 @@ import time
from twitter.common.quantity import Amount, Time
-from gen.twitter.aurora.constants import (
+from gen.apache.aurora.constants import (
LIVE_STATES,
TERMINAL_STATES
)
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
Identity,
TaskQuery
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/client/api/restarter.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/api/restarter.py b/src/main/python/apache/aurora/client/api/restarter.py
index bf196e1..bd62a60 100644
--- a/src/main/python/apache/aurora/client/api/restarter.py
+++ b/src/main/python/apache/aurora/client/api/restarter.py
@@ -1,7 +1,7 @@
from twitter.common import log
-from gen.twitter.aurora.constants import ACTIVE_STATES
-from gen.twitter.aurora.ttypes import ResponseCode
+from gen.apache.aurora.constants import ACTIVE_STATES
+from gen.apache.aurora.ttypes import ResponseCode
from .instance_watcher import InstanceWatcher
from .updater_util import FailureThreshold
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/client/api/scheduler_client.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/api/scheduler_client.py b/src/main/python/apache/aurora/client/api/scheduler_client.py
index ffec604..1b38f7b 100644
--- a/src/main/python/apache/aurora/client/api/scheduler_client.py
+++ b/src/main/python/apache/aurora/client/api/scheduler_client.py
@@ -2,16 +2,16 @@ import functools
import threading
import time
-from twitter.aurora.common.auth import make_session_key, SessionKeyError
-from twitter.aurora.common.cluster import Cluster
+from apache.aurora.common.auth import make_session_key, SessionKeyError
+from apache.aurora.common.cluster import Cluster
from twitter.common import log
from twitter.common.quantity import Amount, Time
from twitter.common.rpc.transports.tsslsocket import DelayedHandshakeTSSLSocket
from twitter.common.zookeeper.kazoo_client import TwitterKazooClient
from twitter.common.zookeeper.serverset import ServerSet
-from gen.twitter.aurora import AuroraAdmin
-from gen.twitter.aurora.constants import CURRENT_API_VERSION
+from gen.apache.aurora import AuroraAdmin
+from gen.apache.aurora.constants import CURRENT_API_VERSION
from thrift.protocol import TBinaryProtocol
from thrift.transport import TSocket, TTransport
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/client/api/updater.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/api/updater.py b/src/main/python/apache/aurora/client/api/updater.py
index 6e8e8a9..e364f26 100644
--- a/src/main/python/apache/aurora/client/api/updater.py
+++ b/src/main/python/apache/aurora/client/api/updater.py
@@ -3,9 +3,9 @@ from difflib import unified_diff
from twitter.common import log
-from gen.twitter.aurora.constants import ACTIVE_STATES
+from gen.apache.aurora.constants import ACTIVE_STATES
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
AddInstancesConfig,
JobConfigValidation,
JobKey,
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/client/base.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/base.py b/src/main/python/apache/aurora/client/base.py
index 0936743..ed5737d 100644
--- a/src/main/python/apache/aurora/client/base.py
+++ b/src/main/python/apache/aurora/client/base.py
@@ -5,7 +5,7 @@ from urlparse import urljoin
from twitter.common import app, log
-from gen.twitter.aurora.ttypes import ResponseCode
+from gen.apache.aurora.ttypes import ResponseCode
LOCKED_WARNING = """
Note: if the scheduler detects that a job update is in progress (or was not
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/client/bin/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/bin/BUILD b/src/main/python/apache/aurora/client/bin/BUILD
index 7802245..4561155 100644
--- a/src/main/python/apache/aurora/client/bin/BUILD
+++ b/src/main/python/apache/aurora/client/bin/BUILD
@@ -1,25 +1,25 @@
python_binary(
name = 'aurora_client',
source = 'aurora_client.py',
- entry_point = 'twitter.aurora.client.bin.aurora_client:proxy_main',
+ entry_point = 'apache.aurora.client.bin.aurora_client:proxy_main',
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/app'),
pants('aurora/twitterdeps/src/python/twitter/common/log'),
- pants('src/main/python/twitter/aurora/client/commands:all'),
- pants('src/main/python/twitter/aurora/client:base'),
+ pants('src/main/python/apache/aurora/client/commands:all'),
+ pants('src/main/python/apache/aurora/client:base'),
]
)
python_binary(
name = 'aurora_admin',
source = 'aurora_admin.py',
- entry_point = 'twitter.aurora.client.bin.aurora_admin:proxy_main',
+ entry_point = 'apache.aurora.client.bin.aurora_admin:proxy_main',
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/app'),
pants('aurora/twitterdeps/src/python/twitter/common/log'),
- pants('src/main/python/twitter/aurora/client/commands:admin'),
- pants('src/main/python/twitter/aurora/client/commands:help'),
- pants('src/main/python/twitter/aurora/client:base'),
- pants('src/main/python/twitter/aurora/client:options'),
+ pants('src/main/python/apache/aurora/client/commands:admin'),
+ pants('src/main/python/apache/aurora/client/commands:help'),
+ pants('src/main/python/apache/aurora/client:base'),
+ pants('src/main/python/apache/aurora/client:options'),
]
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/client/bin/aurora_admin.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/bin/aurora_admin.py b/src/main/python/apache/aurora/client/bin/aurora_admin.py
index 53fd882..7b59bbd 100644
--- a/src/main/python/apache/aurora/client/bin/aurora_admin.py
+++ b/src/main/python/apache/aurora/client/bin/aurora_admin.py
@@ -1,6 +1,6 @@
-from twitter.aurora.client.base import generate_terse_usage
-from twitter.aurora.client.commands import admin, help
-from twitter.aurora.client.options import add_verbosity_options
+from apache.aurora.client.base import generate_terse_usage
+from apache.aurora.client.commands import admin, help
+from apache.aurora.client.options import add_verbosity_options
from twitter.common import app
from twitter.common.log.options import LogOptions
[5/9] Refactors java and python code to the Apache namespace.
Posted by wf...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/client/bin/aurora_client.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/bin/aurora_client.py b/src/main/python/apache/aurora/client/bin/aurora_client.py
index 8228b88..1523912 100644
--- a/src/main/python/apache/aurora/client/bin/aurora_client.py
+++ b/src/main/python/apache/aurora/client/bin/aurora_client.py
@@ -1,4 +1,4 @@
-from twitter.aurora.client.base import generate_terse_usage
+from apache.aurora.client.base import generate_terse_usage
from twitter.common import app
from twitter.common.log.options import LogOptions
@@ -6,13 +6,13 @@ from twitter.common.log.options import LogOptions
# app.command. This is a poor code practice and should be fixed long-term
# with the creation of twitter.common.cli that allows for argparse-style CLI
# composition.
-from twitter.aurora.client.commands import (
+from apache.aurora.client.commands import (
core,
help,
run,
ssh,
)
-from twitter.aurora.client.options import add_verbosity_options
+from apache.aurora.client.options import add_verbosity_options
app.register_commands_from(core, run, ssh)
app.register_commands_from(help)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/client/cli/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/cli/BUILD b/src/main/python/apache/aurora/client/cli/BUILD
index 0a44a21..f18c1cd 100644
--- a/src/main/python/apache/aurora/client/cli/BUILD
+++ b/src/main/python/apache/aurora/client/cli/BUILD
@@ -1,7 +1,7 @@
python_binary(
name='client',
- entry_point = 'twitter.aurora.cli:main',
+ entry_point = 'apache.aurora.cli:main',
dependencies = [ pants(':cli') ],
)
@@ -10,17 +10,17 @@ python_library(
sources = [ '__init__.py', 'context.py', 'jobs.py', 'options.py' ],
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/python'),
- pants('src/main/python/twitter/aurora/client/api:command_runner'),
- pants('src/main/python/twitter/aurora/client/api:disambiguator'),
- pants('src/main/python/twitter/aurora/client/api:job_monitor'),
- pants('src/main/python/twitter/aurora/client/api:updater'),
- pants('src/main/python/twitter/aurora/client/hooks'),
- pants('src/main/python/twitter/aurora/client:base'),
- pants('src/main/python/twitter/aurora/client:config'),
- pants('src/main/python/twitter/aurora/client:factory'),
- pants('src/main/python/twitter/aurora/client:options'),
- pants('src/main/python/twitter/aurora/common'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
- pants('src/main/python/twitter/aurora:argparse')
+ pants('src/main/python/apache/aurora/client/api:command_runner'),
+ pants('src/main/python/apache/aurora/client/api:disambiguator'),
+ pants('src/main/python/apache/aurora/client/api:job_monitor'),
+ pants('src/main/python/apache/aurora/client/api:updater'),
+ pants('src/main/python/apache/aurora/client/hooks'),
+ pants('src/main/python/apache/aurora/client:base'),
+ pants('src/main/python/apache/aurora/client:config'),
+ pants('src/main/python/apache/aurora/client:factory'),
+ pants('src/main/python/apache/aurora/client:options'),
+ pants('src/main/python/apache/aurora/common'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
+ pants('src/main/python/apache/aurora:argparse')
]
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/client/cli/context.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/cli/context.py b/src/main/python/apache/aurora/client/cli/context.py
index 2ae92ec..c50f1a1 100644
--- a/src/main/python/apache/aurora/client/cli/context.py
+++ b/src/main/python/apache/aurora/client/cli/context.py
@@ -1,11 +1,11 @@
-from twitter.aurora.client.base import synthesize_url
-from twitter.aurora.client.cli import Context, EXIT_NETWORK_ERROR
-from twitter.aurora.client.config import get_config
-from twitter.aurora.client.factory import make_client
+from apache.aurora.client.base import synthesize_url
+from apache.aurora.client.cli import Context, EXIT_NETWORK_ERROR
+from apache.aurora.client.config import get_config
+from apache.aurora.client.factory import make_client
from twitter.common import log
-from gen.twitter.aurora.ttypes import ResponseCode
+from gen.apache.aurora.ttypes import ResponseCode
class AuroraCommandContext(Context):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/client/cli/jobs.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/cli/jobs.py b/src/main/python/apache/aurora/client/cli/jobs.py
index e66f181..b789361 100644
--- a/src/main/python/apache/aurora/client/cli/jobs.py
+++ b/src/main/python/apache/aurora/client/cli/jobs.py
@@ -1,18 +1,18 @@
-from twitter.aurora.client.api.job_monitor import JobMonitor
-from twitter.aurora.client.cli import (
+from apache.aurora.client.api.job_monitor import JobMonitor
+from apache.aurora.client.cli import (
EXIT_INVALID_CONFIGURATION,
Noun,
Verb
)
-from twitter.aurora.client.cli.context import AuroraCommandContext
-from twitter.aurora.client.cli.options import (
+from apache.aurora.client.cli.context import AuroraCommandContext
+from apache.aurora.client.cli.options import (
BIND_OPTION,
BROWSER_OPTION,
CONFIG_OPTION,
JOBSPEC_OPTION,
JSON_OPTION
)
-from twitter.aurora.common.aurora_job_key import AuroraJobKey
+from apache.aurora.common.aurora_job_key import AuroraJobKey
from pystachio.config import Config
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/client/cli/options.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/cli/options.py b/src/main/python/apache/aurora/client/cli/options.py
index 64a58f8..80fabb9 100644
--- a/src/main/python/apache/aurora/client/cli/options.py
+++ b/src/main/python/apache/aurora/client/cli/options.py
@@ -1,5 +1,5 @@
-from twitter.aurora.client.cli import CommandOption
-from twitter.aurora.common.aurora_job_key import AuroraJobKey
+from apache.aurora.client.cli import CommandOption
+from apache.aurora.common.aurora_job_key import AuroraJobKey
BIND_OPTION = CommandOption('--bind', type=str, default=[], dest='bindings',
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/client/commands/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/commands/BUILD b/src/main/python/apache/aurora/client/commands/BUILD
index 3bcb6fd..556d00a 100644
--- a/src/main/python/apache/aurora/client/commands/BUILD
+++ b/src/main/python/apache/aurora/client/commands/BUILD
@@ -15,11 +15,11 @@ python_library(
pants('aurora/twitterdeps/src/python/twitter/common/app'),
pants('aurora/twitterdeps/src/python/twitter/common/log'),
pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
- pants('src/main/python/twitter/aurora/admin:mesos_maintenance'),
- pants('src/main/python/twitter/aurora/client/api'),
- pants('src/main/python/twitter/aurora/client:base'),
- pants('src/main/python/twitter/aurora/common:clusters'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+ pants('src/main/python/apache/aurora/admin:mesos_maintenance'),
+ pants('src/main/python/apache/aurora/client/api'),
+ pants('src/main/python/apache/aurora/client:base'),
+ pants('src/main/python/apache/aurora/common:clusters'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
]
)
@@ -30,17 +30,17 @@ python_library(
pants('aurora/twitterdeps/src/python/twitter/common/app'),
pants('aurora/twitterdeps/src/python/twitter/common/log'),
pants('aurora/twitterdeps/src/python/twitter/common/python'),
- pants('src/main/python/twitter/aurora/client/api:command_runner'),
- pants('src/main/python/twitter/aurora/client/api:disambiguator'),
- pants('src/main/python/twitter/aurora/client/api:job_monitor'),
- pants('src/main/python/twitter/aurora/client/api:updater'),
- pants('src/main/python/twitter/aurora/client/hooks'),
- pants('src/main/python/twitter/aurora/client:base'),
- pants('src/main/python/twitter/aurora/client:config'),
- pants('src/main/python/twitter/aurora/client:factory'),
- pants('src/main/python/twitter/aurora/client:options'),
- pants('src/main/python/twitter/aurora/common'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+ pants('src/main/python/apache/aurora/client/api:command_runner'),
+ pants('src/main/python/apache/aurora/client/api:disambiguator'),
+ pants('src/main/python/apache/aurora/client/api:job_monitor'),
+ pants('src/main/python/apache/aurora/client/api:updater'),
+ pants('src/main/python/apache/aurora/client/hooks'),
+ pants('src/main/python/apache/aurora/client:base'),
+ pants('src/main/python/apache/aurora/client:config'),
+ pants('src/main/python/apache/aurora/client:factory'),
+ pants('src/main/python/apache/aurora/client:options'),
+ pants('src/main/python/apache/aurora/common'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
]
)
@@ -49,7 +49,7 @@ python_library(
sources = ['help.py'],
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/app'),
- pants('src/main/python/twitter/aurora/client:base'),
+ pants('src/main/python/apache/aurora/client:base'),
]
)
@@ -58,11 +58,11 @@ python_library(
sources = ['run.py'],
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/app'),
- pants('src/main/python/twitter/aurora/client/api:command_runner'),
- pants('src/main/python/twitter/aurora/client:base'),
- pants('src/main/python/twitter/aurora/client:options'),
- pants('src/main/python/twitter/aurora/common:aurora_job_key'),
- pants('src/main/python/twitter/aurora/common:clusters'),
+ pants('src/main/python/apache/aurora/client/api:command_runner'),
+ pants('src/main/python/apache/aurora/client:base'),
+ pants('src/main/python/apache/aurora/client:options'),
+ pants('src/main/python/apache/aurora/common:aurora_job_key'),
+ pants('src/main/python/apache/aurora/common:clusters'),
]
)
@@ -71,11 +71,11 @@ python_library(
sources = ['ssh.py'],
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/app'),
- pants('src/main/python/twitter/aurora/client/api:command_runner'),
- pants('src/main/python/twitter/aurora/client:base'),
- pants('src/main/python/twitter/aurora/client:factory'),
- pants('src/main/python/twitter/aurora/client:options'),
- pants('src/main/python/twitter/aurora/common:aurora_job_key'),
- pants('src/main/python/twitter/aurora/common:clusters'),
+ pants('src/main/python/apache/aurora/client/api:command_runner'),
+ pants('src/main/python/apache/aurora/client:base'),
+ pants('src/main/python/apache/aurora/client:factory'),
+ pants('src/main/python/apache/aurora/client:options'),
+ pants('src/main/python/apache/aurora/common:aurora_job_key'),
+ pants('src/main/python/apache/aurora/common:clusters'),
]
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/client/commands/admin.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/commands/admin.py b/src/main/python/apache/aurora/client/commands/admin.py
index c1c9c42..15e25d5 100644
--- a/src/main/python/apache/aurora/client/commands/admin.py
+++ b/src/main/python/apache/aurora/client/commands/admin.py
@@ -7,16 +7,16 @@ import os
import optparse
import subprocess
-from twitter.aurora.admin.mesos_maintenance import MesosMaintenance
-from twitter.aurora.client.api import AuroraClientAPI
-from twitter.aurora.client.base import check_and_log_response, die, requires
-from twitter.aurora.common.clusters import CLUSTERS
+from apache.aurora.admin.mesos_maintenance import MesosMaintenance
+from apache.aurora.client.api import AuroraClientAPI
+from apache.aurora.client.base import check_and_log_response, die, requires
+from apache.aurora.common.clusters import CLUSTERS
from twitter.common import app, log
from twitter.common.quantity import Amount, Data
from twitter.common.quantity.parse_simple import parse_data
-from gen.twitter.aurora.constants import ACTIVE_STATES, TERMINAL_STATES
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.constants import ACTIVE_STATES, TERMINAL_STATES
+from gen.apache.aurora.ttypes import (
ResponseCode,
ScheduleStatus,
TaskQuery,
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/client/commands/core.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/commands/core.py b/src/main/python/apache/aurora/client/commands/core.py
index 712c7ea..45204b5 100644
--- a/src/main/python/apache/aurora/client/commands/core.py
+++ b/src/main/python/apache/aurora/client/commands/core.py
@@ -17,19 +17,19 @@ from twitter.common import app, log
from twitter.common.python.pex import PexInfo
from twitter.common.python.dirwrapper import PythonDirectoryWrapper
-from twitter.aurora.client.base import (
+from apache.aurora.client.base import (
check_and_log_response,
deprecation_warning,
die,
handle_open,
requires,
synthesize_url)
-from twitter.aurora.client.api.disambiguator import LiveJobDisambiguator
-from twitter.aurora.client.api.job_monitor import JobMonitor
-from twitter.aurora.client.api.updater_util import UpdaterConfig
-from twitter.aurora.client.config import get_config
-from twitter.aurora.client.factory import make_client, make_client_factory
-from twitter.aurora.client.options import (
+from apache.aurora.client.api.disambiguator import LiveJobDisambiguator
+from apache.aurora.client.api.job_monitor import JobMonitor
+from apache.aurora.client.api.updater_util import UpdaterConfig
+from apache.aurora.client.config import get_config
+from apache.aurora.client.factory import make_client, make_client_factory
+from apache.aurora.client.options import (
CLUSTER_CONFIG_OPTION,
CLUSTER_INVOKE_OPTION,
ENV_CONFIG_OPTION,
@@ -40,10 +40,10 @@ from twitter.aurora.client.options import (
OPEN_BROWSER_OPTION,
SHARDS_OPTION,
WAIT_UNTIL_OPTION)
-from twitter.aurora.common.aurora_job_key import AuroraJobKey
+from apache.aurora.common.aurora_job_key import AuroraJobKey
-from gen.twitter.aurora.constants import ACTIVE_STATES, CURRENT_API_VERSION, AURORA_EXECUTOR_NAME
-from gen.twitter.aurora.ttypes import ExecutorConfig, ResponseCode, ScheduleStatus
+from gen.apache.aurora.constants import ACTIVE_STATES, CURRENT_API_VERSION, AURORA_EXECUTOR_NAME
+from gen.apache.aurora.ttypes import ExecutorConfig, ResponseCode, ScheduleStatus
def get_job_config(job_spec, config_file, options):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/client/commands/help.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/commands/help.py b/src/main/python/apache/aurora/client/commands/help.py
index a74c607..20823b4 100644
--- a/src/main/python/apache/aurora/client/commands/help.py
+++ b/src/main/python/apache/aurora/client/commands/help.py
@@ -3,7 +3,7 @@ from __future__ import print_function
import collections
import sys
-from twitter.aurora.client.base import die
+from apache.aurora.client.base import die
from twitter.common import app
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/client/commands/run.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/commands/run.py b/src/main/python/apache/aurora/client/commands/run.py
index 494ce47..60f127c 100644
--- a/src/main/python/apache/aurora/client/commands/run.py
+++ b/src/main/python/apache/aurora/client/commands/run.py
@@ -1,12 +1,12 @@
from twitter.common import app
-from twitter.aurora.client.base import die
-from twitter.aurora.client.options import (
+from apache.aurora.client.base import die
+from apache.aurora.client.options import (
EXECUTOR_SANDBOX_OPTION,
SSH_USER_OPTION,
)
-from twitter.aurora.common.aurora_job_key import AuroraJobKey
-from twitter.aurora.common.clusters import CLUSTERS
-from twitter.aurora.client.api.command_runner import DistributedCommandRunner
+from apache.aurora.common.aurora_job_key import AuroraJobKey
+from apache.aurora.common.clusters import CLUSTERS
+from apache.aurora.client.api.command_runner import DistributedCommandRunner
@app.command
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/client/commands/ssh.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/commands/ssh.py b/src/main/python/apache/aurora/client/commands/ssh.py
index 109229f..7aa767f 100644
--- a/src/main/python/apache/aurora/client/commands/ssh.py
+++ b/src/main/python/apache/aurora/client/commands/ssh.py
@@ -1,14 +1,14 @@
import subprocess
from twitter.common import app
-from twitter.aurora.client.base import check_and_log_response, die
-from twitter.aurora.client.factory import make_client
-from twitter.aurora.client.options import (
+from apache.aurora.client.base import check_and_log_response, die
+from apache.aurora.client.factory import make_client
+from apache.aurora.client.options import (
EXECUTOR_SANDBOX_OPTION,
SSH_USER_OPTION,
)
-from twitter.aurora.common.aurora_job_key import AuroraJobKey
-from twitter.aurora.client.api.command_runner import DistributedCommandRunner
+from apache.aurora.common.aurora_job_key import AuroraJobKey
+from apache.aurora.client.api.command_runner import DistributedCommandRunner
@app.command
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/client/config.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/config.py b/src/main/python/apache/aurora/client/config.py
index 32df4eb..2a78f42 100644
--- a/src/main/python/apache/aurora/client/config.py
+++ b/src/main/python/apache/aurora/client/config.py
@@ -11,12 +11,12 @@ import sys
from twitter.common import app, log
-from twitter.aurora.client import binding_helper
-from twitter.aurora.client.base import deprecation_warning, die
-from twitter.aurora.config import AuroraConfig
-from twitter.thermos.config.schema_helpers import Tasks
+from apache.aurora.client import binding_helper
+from apache.aurora.client.base import deprecation_warning, die
+from apache.aurora.config import AuroraConfig
+from apache.thermos.config.schema_helpers import Tasks
-from gen.twitter.aurora.constants import DEFAULT_ENVIRONMENT
+from gen.apache.aurora.constants import DEFAULT_ENVIRONMENT
from pystachio import Empty, Ref
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/client/factory.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/factory.py b/src/main/python/apache/aurora/client/factory.py
index 7a44e3b..e64c1a7 100644
--- a/src/main/python/apache/aurora/client/factory.py
+++ b/src/main/python/apache/aurora/client/factory.py
@@ -1,8 +1,8 @@
import functools
-from twitter.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
-from twitter.aurora.common.cluster import Cluster
-from twitter.aurora.common.clusters import CLUSTERS
+from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
+from apache.aurora.common.cluster import Cluster
+from apache.aurora.common.clusters import CLUSTERS
from twitter.common import app
from .base import die
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/client/hooks/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/hooks/BUILD b/src/main/python/apache/aurora/client/hooks/BUILD
index c3d0a1a..3feb81b 100644
--- a/src/main/python/apache/aurora/client/hooks/BUILD
+++ b/src/main/python/apache/aurora/client/hooks/BUILD
@@ -3,8 +3,8 @@ python_library(
sources = ['__init__.py', 'hooked_api.py'],
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/log'),
- pants('src/main/python/twitter/aurora/client:api'),
- pants('src/main/python/twitter/aurora/common:aurora_job_key'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+ pants('src/main/python/apache/aurora/client:api'),
+ pants('src/main/python/apache/aurora/common:aurora_job_key'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
]
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/client/hooks/hooked_api.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/hooks/hooked_api.py b/src/main/python/apache/aurora/client/hooks/hooked_api.py
index cc4d3db..da71af4 100644
--- a/src/main/python/apache/aurora/client/hooks/hooked_api.py
+++ b/src/main/python/apache/aurora/client/hooks/hooked_api.py
@@ -2,10 +2,10 @@ import functools
import traceback
from twitter.common import log
-from twitter.aurora.client.api import AuroraClientAPI
-from twitter.aurora.common.aurora_job_key import AuroraJobKey
+from apache.aurora.client.api import AuroraClientAPI
+from apache.aurora.common.aurora_job_key import AuroraJobKey
-from gen.twitter.aurora.ttypes import ResponseCode
+from gen.apache.aurora.ttypes import ResponseCode
def _partial(function, *args, **kw):
@@ -50,7 +50,7 @@ class NonHookedAuroraClientAPI(AuroraClientAPI):
class HookedAuroraClientAPI(NonHookedAuroraClientAPI):
"""
Adds a hooking aspect/behaviour to the lifecycle of Mesos Client API methods
- by injecting hooks (instances of twitter.aurora.client.hooks.Hooks)
+ by injecting hooks (instances of apache.aurora.client.hooks.Hooks)
* Hooks are available in the 'config' (AuroraConfig) param that each API call receives
* Each Hook is run around each API call:
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/client/options.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/options.py b/src/main/python/apache/aurora/client/options.py
index 7ced961..af56351 100644
--- a/src/main/python/apache/aurora/client/options.py
+++ b/src/main/python/apache/aurora/client/options.py
@@ -1,7 +1,7 @@
import optparse
-from twitter.aurora.common.aurora_job_key import AuroraJobKey
-from twitter.thermos.common.options import add_binding_to
+from apache.aurora.common.aurora_job_key import AuroraJobKey
+from apache.thermos.common.options import add_binding_to
__all__ = (
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/common/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/common/BUILD b/src/main/python/apache/aurora/common/BUILD
index 4e839f7..9da66aa 100644
--- a/src/main/python/apache/aurora/common/BUILD
+++ b/src/main/python/apache/aurora/common/BUILD
@@ -5,7 +5,7 @@ python_library(
sources = ['aurora_job_key.py'],
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/lang'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
]
)
@@ -13,7 +13,7 @@ python_library(
name = 'cluster',
sources = ['cluster.py'],
dependencies = [
- pants('src/main/python/twitter/aurora/BUILD.thirdparty:pystachio'),
+ pants('src/main/python/apache/aurora/BUILD.thirdparty:pystachio'),
]
)
@@ -22,7 +22,7 @@ python_library(
sources = ['clusters.py'],
dependencies = [
pants(':cluster'),
- pants('src/main/python/twitter/aurora/BUILD.thirdparty:pystachio'),
+ pants('src/main/python/apache/aurora/BUILD.thirdparty:pystachio'),
pants('aurora/twitterdeps/src/python/twitter/common/collections'),
]
)
@@ -52,10 +52,10 @@ python_library(
pants(':cluster_option'),
pants(':clusters'),
pants(':http_signaler'),
- pants('src/main/python/twitter/aurora/common/auth'),
+ pants('src/main/python/apache/aurora/common/auth'),
],
provides = setup_py(
- name = 'twitter.aurora.common',
+ name = 'apache.aurora.common',
version = open(os.path.join(get_buildroot(), '.auroraversion')).read().strip().lower(),
description = 'Aurora common libraries.',
license = 'Apache License, Version 2.0',
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/common/aurora_job_key.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/common/aurora_job_key.py b/src/main/python/apache/aurora/common/aurora_job_key.py
index 81a8687..70b5eb4 100644
--- a/src/main/python/apache/aurora/common/aurora_job_key.py
+++ b/src/main/python/apache/aurora/common/aurora_job_key.py
@@ -2,8 +2,8 @@ import re
from twitter.common.lang import Compatibility, total_ordering
-from gen.twitter.aurora.constants import GOOD_IDENTIFIER_PATTERN_PYTHON
-from gen.twitter.aurora.ttypes import Identity, JobKey, TaskQuery
+from gen.apache.aurora.constants import GOOD_IDENTIFIER_PATTERN_PYTHON
+from gen.apache.aurora.ttypes import Identity, JobKey, TaskQuery
# TODO(ksweeney): This can just probably just extend namedtuple.
@total_ordering
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/common/auth/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/common/auth/BUILD b/src/main/python/apache/aurora/common/auth/BUILD
index fd5b024..277620b 100644
--- a/src/main/python/apache/aurora/common/auth/BUILD
+++ b/src/main/python/apache/aurora/common/auth/BUILD
@@ -4,6 +4,6 @@ python_library(
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/lang'),
pants('aurora/twitterdeps/src/python/twitter/common/log'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
]
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/common/auth/auth_module.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/common/auth/auth_module.py b/src/main/python/apache/aurora/common/auth/auth_module.py
index 7b146a9..0061a30 100644
--- a/src/main/python/apache/aurora/common/auth/auth_module.py
+++ b/src/main/python/apache/aurora/common/auth/auth_module.py
@@ -5,7 +5,7 @@ import time
from twitter.common.lang import Interface
-from gen.twitter.aurora.ttypes import SessionKey
+from gen.apache.aurora.ttypes import SessionKey
class AuthModule(Interface):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/common/auth/auth_module_manager.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/common/auth/auth_module_manager.py b/src/main/python/apache/aurora/common/auth/auth_module_manager.py
index 03d51b3..a025c6b 100644
--- a/src/main/python/apache/aurora/common/auth/auth_module_manager.py
+++ b/src/main/python/apache/aurora/common/auth/auth_module_manager.py
@@ -1,6 +1,6 @@
from twitter.common import log
-from gen.twitter.aurora.ttypes import SessionKey
+from gen.apache.aurora.ttypes import SessionKey
from .auth_module import AuthModule, InsecureAuthModule
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/config/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/config/BUILD b/src/main/python/apache/aurora/config/BUILD
index 91cb3e4..58a0ab1 100644
--- a/src/main/python/apache/aurora/config/BUILD
+++ b/src/main/python/apache/aurora/config/BUILD
@@ -1,10 +1,10 @@
import os
-# Alias for src/main/python/twitter/aurora/config/schema
+# Alias for src/main/python/apache/aurora/config/schema
python_library(
name = 'schema',
dependencies = [
- pants('src/main/python/twitter/aurora/config/schema'),
+ pants('src/main/python/apache/aurora/config/schema'),
]
)
@@ -17,11 +17,11 @@ python_library(
'thrift.py',
),
dependencies = [
- pants('src/main/python/twitter/aurora/BUILD.thirdparty:pystachio'),
+ pants('src/main/python/apache/aurora/BUILD.thirdparty:pystachio'),
pants('aurora/twitterdeps/src/python/twitter/common/lang'),
- pants('src/main/python/twitter/aurora/common'),
- pants('src/main/python/twitter/aurora/config/schema'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+ pants('src/main/python/apache/aurora/common'),
+ pants('src/main/python/apache/aurora/config/schema'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
],
)
@@ -32,10 +32,10 @@ python_library(
pants(':config'),
# covering dependencies
- pants('src/main/python/twitter/thermos/config'),
+ pants('src/main/python/apache/thermos/config'),
],
provides = setup_py(
- name = 'twitter.aurora.config',
+ name = 'apache.aurora.config',
version = open(os.path.join(get_buildroot(), '.auroraversion')).read().strip().lower(),
description = 'Aurora/Thermos Pystachio schemas for describing job configurations.',
license = 'Apache License, Version 2.0',
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/config/__init__.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/config/__init__.py b/src/main/python/apache/aurora/config/__init__.py
index a3ba981..7d4d485 100644
--- a/src/main/python/apache/aurora/config/__init__.py
+++ b/src/main/python/apache/aurora/config/__init__.py
@@ -2,10 +2,10 @@ from __future__ import absolute_import
from collections import defaultdict
-from twitter.aurora.common.aurora_job_key import AuroraJobKey
-from twitter.aurora.config.schema.base import MesosContext
-from twitter.thermos.config.loader import PortExtractor, ThermosTaskWrapper
-from twitter.thermos.config.schema import ThermosContext
+from apache.aurora.common.aurora_job_key import AuroraJobKey
+from apache.aurora.config.schema.base import MesosContext
+from apache.thermos.config.loader import PortExtractor, ThermosTaskWrapper
+from apache.thermos.config.schema import ThermosContext
from .loader import AuroraConfigLoader
from .port_resolver import PortResolver
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/config/loader.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/config/loader.py b/src/main/python/apache/aurora/config/loader.py
index e3e5559..df82530 100644
--- a/src/main/python/apache/aurora/config/loader.py
+++ b/src/main/python/apache/aurora/config/loader.py
@@ -2,7 +2,7 @@ import json
import pkgutil
import textwrap
-from twitter.aurora.config.schema import base as base_schema
+from apache.aurora.config.schema import base as base_schema
from pystachio.config import Config as PystachioConfig
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/config/repl.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/config/repl.py b/src/main/python/apache/aurora/config/repl.py
index d26f94d..e161668 100644
--- a/src/main/python/apache/aurora/config/repl.py
+++ b/src/main/python/apache/aurora/config/repl.py
@@ -1,4 +1,4 @@
-from twitter.aurora.config.loader import AuroraConfigLoader
+from apache.aurora.config.loader import AuroraConfigLoader
from twitter.common.lang import Compatibility
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/config/schema/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/config/schema/BUILD b/src/main/python/apache/aurora/config/schema/BUILD
index fd08ec7..694fe71 100644
--- a/src/main/python/apache/aurora/config/schema/BUILD
+++ b/src/main/python/apache/aurora/config/schema/BUILD
@@ -2,8 +2,8 @@ python_library(
name = 'schema',
sources = ['base.py'],
dependencies = [
- pants('src/main/python/twitter/aurora/BUILD.thirdparty:pystachio'),
- pants('src/main/python/twitter/thermos/config:schema'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+ pants('src/main/python/apache/aurora/BUILD.thirdparty:pystachio'),
+ pants('src/main/python/apache/thermos/config:schema'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
]
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/config/schema/base.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/config/schema/base.py b/src/main/python/apache/aurora/config/schema/base.py
index b3d437f..7446594 100644
--- a/src/main/python/apache/aurora/config/schema/base.py
+++ b/src/main/python/apache/aurora/config/schema/base.py
@@ -1,6 +1,6 @@
-from twitter.thermos.config.schema import *
+from apache.thermos.config.schema import *
-from gen.twitter.aurora.constants import DEFAULT_ENVIRONMENT
+from gen.apache.aurora.constants import DEFAULT_ENVIRONMENT
# TODO(wickman) Bind {{mesos.instance}} to %shard_id%
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/config/thrift.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/config/thrift.py b/src/main/python/apache/aurora/config/thrift.py
index 8f6a5ce..acfe961 100644
--- a/src/main/python/apache/aurora/config/thrift.py
+++ b/src/main/python/apache/aurora/config/thrift.py
@@ -1,16 +1,16 @@
import getpass
import re
-from twitter.aurora.config.schema.base import (
+from apache.aurora.config.schema.base import (
HealthCheckConfig,
MesosContext,
MesosTaskInstance,
)
from twitter.common.lang import Compatibility
-from twitter.thermos.config.loader import ThermosTaskValidator
+from apache.thermos.config.loader import ThermosTaskValidator
-from gen.twitter.aurora.constants import GOOD_IDENTIFIER_PATTERN_PYTHON, AURORA_EXECUTOR_NAME
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.constants import GOOD_IDENTIFIER_PATTERN_PYTHON, AURORA_EXECUTOR_NAME
+from gen.apache.aurora.ttypes import (
Constraint,
CronCollisionPolicy,
ExecutorConfig,
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/executor/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/executor/BUILD b/src/main/python/apache/aurora/executor/BUILD
index 01701e9..8a3413b 100644
--- a/src/main/python/apache/aurora/executor/BUILD
+++ b/src/main/python/apache/aurora/executor/BUILD
@@ -7,14 +7,14 @@ python_library(
pants('aurora/twitterdeps/src/python/twitter/common/dirutil'),
pants('aurora/twitterdeps/src/python/twitter/common/log'),
pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
- pants('src/main/python/twitter/thermos/common'),
- pants('src/main/python/twitter/thermos/config:schema'),
- pants('src/main/python/twitter/thermos/core'),
- pants('src/main/python/twitter/thermos/monitoring:monitor'),
- pants('src/main/python/twitter/aurora/common:http_signaler'),
- pants('src/main/python/twitter/aurora/executor/common:status_checker'),
- pants('src/main/python/twitter/aurora/executor/common:task_info'),
- pants('src/main/python/twitter/aurora/executor/common:task_runner'),
+ pants('src/main/python/apache/thermos/common'),
+ pants('src/main/python/apache/thermos/config:schema'),
+ pants('src/main/python/apache/thermos/core'),
+ pants('src/main/python/apache/thermos/monitoring:monitor'),
+ pants('src/main/python/apache/aurora/common:http_signaler'),
+ pants('src/main/python/apache/aurora/executor/common:status_checker'),
+ pants('src/main/python/apache/aurora/executor/common:task_info'),
+ pants('src/main/python/apache/aurora/executor/common:task_runner'),
]
)
@@ -30,7 +30,7 @@ python_library(
name = 'executor_vars',
sources = ['executor_vars.py'],
dependencies = [
- pants('src/main/python/twitter/aurora/BUILD.thirdparty:psutil'),
+ pants('src/main/python/apache/aurora/BUILD.thirdparty:psutil'),
pants('aurora/twitterdeps/src/python/twitter/common/exceptions'),
pants('aurora/twitterdeps/src/python/twitter/common/metrics'),
pants('aurora/twitterdeps/src/python/twitter/common/python'),
@@ -46,7 +46,7 @@ python_library(
pants('aurora/twitterdeps/src/python/twitter/common/exceptions'),
pants('aurora/twitterdeps/src/python/twitter/common/log'),
pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
- pants('src/main/python/twitter/aurora/executor/common:status_checker'),
+ pants('src/main/python/apache/aurora/executor/common:status_checker'),
]
)
@@ -55,9 +55,9 @@ python_library(
sources = ['executor_base.py'],
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/log'),
- pants('src/main/thrift/com/twitter/thermos:py-thrift'),
- pants('src/main/python/twitter/aurora:mesos-core'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+ pants('src/main/thrift/org/apache/thermos:py-thrift'),
+ pants('src/main/python/apache/aurora:mesos-core'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
]
)
@@ -65,18 +65,18 @@ python_library(
name = 'thermos_executor',
sources = ['thermos_executor.py'],
dependencies = [
- pants('src/main/python/twitter/aurora/BUILD.thirdparty:pystachio'),
+ pants('src/main/python/apache/aurora/BUILD.thirdparty:pystachio'),
pants(':status_manager'),
pants(':thermos_executor_base'),
pants('aurora/twitterdeps/src/python/twitter/common/app'),
pants('aurora/twitterdeps/src/python/twitter/common/concurrent'),
pants('aurora/twitterdeps/src/python/twitter/common/log'),
pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
- pants('src/main/python/twitter/aurora/executor/common:kill_manager'),
- pants('src/main/python/twitter/aurora/executor/common:sandbox'),
- pants('src/main/python/twitter/aurora/executor/common:task_info'),
- pants('src/main/python/twitter/aurora/executor/common:task_runner'),
- pants('src/main/python/twitter/aurora:mesos-core'),
+ pants('src/main/python/apache/aurora/executor/common:kill_manager'),
+ pants('src/main/python/apache/aurora/executor/common:sandbox'),
+ pants('src/main/python/apache/aurora/executor/common:task_info'),
+ pants('src/main/python/apache/aurora/executor/common:task_runner'),
+ pants('src/main/python/apache/aurora:mesos-core'),
]
)
@@ -86,9 +86,9 @@ python_library(
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/app'),
pants('aurora/twitterdeps/src/python/twitter/common/log'),
- pants('src/main/python/twitter/thermos/common:planner'),
- pants('src/main/python/twitter/thermos/config:schema'),
- pants('src/main/python/twitter/thermos/core'),
+ pants('src/main/python/apache/thermos/common:planner'),
+ pants('src/main/python/apache/thermos/config:schema'),
+ pants('src/main/python/apache/thermos/core'),
],
)
@@ -96,7 +96,7 @@ python_library(
name = 'gc_executor',
sources = ['gc_executor.py'],
dependencies = [
- pants('src/main/python/twitter/aurora/BUILD.thirdparty:psutil'),
+ pants('src/main/python/apache/aurora/BUILD.thirdparty:psutil'),
pants(':executor_detector'),
pants(':thermos_executor_base'),
pants('aurora/twitterdeps/src/python/twitter/common/collections'),
@@ -104,16 +104,16 @@ python_library(
pants('aurora/twitterdeps/src/python/twitter/common/log'),
pants('aurora/twitterdeps/src/python/twitter/common/metrics'),
pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
- pants('src/main/python/twitter/thermos/common:ckpt'),
- pants('src/main/python/twitter/thermos/common:path'),
- pants('src/main/python/twitter/thermos/core:helper'),
- pants('src/main/python/twitter/thermos/core:inspector'),
- pants('src/main/python/twitter/thermos/monitoring:detector'),
- pants('src/main/python/twitter/thermos/monitoring:garbage'),
- pants('src/main/python/twitter/aurora/config:schema'),
- pants('src/main/python/twitter/aurora/executor/common:sandbox'),
- pants('src/main/python/twitter/aurora:mesos-core'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+ pants('src/main/python/apache/thermos/common:ckpt'),
+ pants('src/main/python/apache/thermos/common:path'),
+ pants('src/main/python/apache/thermos/core:helper'),
+ pants('src/main/python/apache/thermos/core:inspector'),
+ pants('src/main/python/apache/thermos/monitoring:detector'),
+ pants('src/main/python/apache/thermos/monitoring:garbage'),
+ pants('src/main/python/apache/aurora/config:schema'),
+ pants('src/main/python/apache/aurora/executor/common:sandbox'),
+ pants('src/main/python/apache/aurora:mesos-core'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
]
)
@@ -121,19 +121,19 @@ python_library(
name = 'executor-packaged',
dependencies = [
# Covering dependencies
- pants('src/main/python/twitter/aurora/common'),
- pants('src/main/python/twitter/aurora/config'),
- pants('src/main/python/twitter/thermos/common'),
- pants('src/main/python/twitter/thermos/config'),
- pants('src/main/python/twitter/thermos/core'),
- pants('src/main/python/twitter/thermos/monitoring'),
+ pants('src/main/python/apache/aurora/common'),
+ pants('src/main/python/apache/aurora/config'),
+ pants('src/main/python/apache/thermos/common'),
+ pants('src/main/python/apache/thermos/config'),
+ pants('src/main/python/apache/thermos/core'),
+ pants('src/main/python/apache/thermos/monitoring'),
],
provides = setup_py(
- name = 'twitter.aurora.executor',
+ name = 'apache.aurora.executor',
version = open(os.path.join(get_buildroot(), '.auroraversion')).read().strip().lower(),
).with_binaries(
- gc_executor = pants('src/main/python/twitter/aurora/executor/bin:gc_executor'),
- thermos_executor = pants('src/main/python/twitter/aurora/executor/bin:thermos_executor'),
- thermos_runner = pants('src/main/python/twitter/aurora/executor/bin:thermos_runner'),
+ gc_executor = pants('src/main/python/apache/aurora/executor/bin:gc_executor'),
+ thermos_executor = pants('src/main/python/apache/aurora/executor/bin:thermos_executor'),
+ thermos_runner = pants('src/main/python/apache/aurora/executor/bin:thermos_runner'),
)
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/executor/bin/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/executor/bin/BUILD b/src/main/python/apache/aurora/executor/bin/BUILD
index 5e9cab1..5ead9ca 100644
--- a/src/main/python/apache/aurora/executor/bin/BUILD
+++ b/src/main/python/apache/aurora/executor/bin/BUILD
@@ -1,47 +1,47 @@
python_binary(
name = 'thermos_executor',
source = 'thermos_executor_main.py',
- entry_point = 'twitter.aurora.executor.bin.thermos_executor_main:proxy_main',
+ entry_point = 'apache.aurora.executor.bin.thermos_executor_main:proxy_main',
ignore_errors = True,
always_write_cache = True,
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/app'),
pants('aurora/twitterdeps/src/python/twitter/common/log'),
pants('aurora/twitterdeps/src/python/twitter/common/metrics'),
- pants('src/main/python/twitter/aurora/executor/common:executor_timeout'),
- pants('src/main/python/twitter/aurora/executor/common:health_checker'),
- pants('src/main/python/twitter/aurora/executor/common:sandbox'),
- pants('src/main/python/twitter/aurora/executor:executor_detector'),
- pants('src/main/python/twitter/aurora/executor:executor_vars'),
- pants('src/main/python/twitter/aurora/executor:thermos_executor'),
- pants('src/main/python/twitter/aurora/executor:thermos_task_runner'),
+ pants('src/main/python/apache/aurora/executor/common:executor_timeout'),
+ pants('src/main/python/apache/aurora/executor/common:health_checker'),
+ pants('src/main/python/apache/aurora/executor/common:sandbox'),
+ pants('src/main/python/apache/aurora/executor:executor_detector'),
+ pants('src/main/python/apache/aurora/executor:executor_vars'),
+ pants('src/main/python/apache/aurora/executor:thermos_executor'),
+ pants('src/main/python/apache/aurora/executor:thermos_task_runner'),
]
)
python_binary(
name = 'gc_executor',
source = 'gc_executor_main.py',
- entry_point = 'twitter.aurora.executor.bin.gc_executor_main:proxy_main',
+ entry_point = 'apache.aurora.executor.bin.gc_executor_main:proxy_main',
ignore_errors = True,
always_write_cache = True,
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/app'),
pants('aurora/twitterdeps/src/python/twitter/common/log'),
pants('aurora/twitterdeps/src/python/twitter/common/metrics'),
- pants('src/main/python/twitter/thermos/common:path'),
- pants('src/main/python/twitter/aurora/executor:executor_detector'),
- pants('src/main/python/twitter/aurora/executor:executor_vars'),
- pants('src/main/python/twitter/aurora/executor:gc_executor'),
+ pants('src/main/python/apache/thermos/common:path'),
+ pants('src/main/python/apache/aurora/executor:executor_detector'),
+ pants('src/main/python/apache/aurora/executor:executor_vars'),
+ pants('src/main/python/apache/aurora/executor:gc_executor'),
]
)
python_binary(
name = 'thermos_runner',
source = 'thermos_runner_main.py',
- entry_point = 'twitter.aurora.executor.bin.thermos_runner_main:proxy_main',
+ entry_point = 'apache.aurora.executor.bin.thermos_runner_main:proxy_main',
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/app'),
pants('aurora/twitterdeps/src/python/twitter/common/log'),
- pants('src/main/python/twitter/aurora/executor:thermos_runner'),
+ pants('src/main/python/apache/aurora/executor:thermos_runner'),
],
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/executor/bin/gc_executor_main.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/executor/bin/gc_executor_main.py b/src/main/python/apache/aurora/executor/bin/gc_executor_main.py
index fad20e6..48ccbf6 100644
--- a/src/main/python/apache/aurora/executor/bin/gc_executor_main.py
+++ b/src/main/python/apache/aurora/executor/bin/gc_executor_main.py
@@ -5,12 +5,12 @@ slave.
"""
-from twitter.aurora.executor.executor_detector import ExecutorDetector
-from twitter.aurora.executor.gc_executor import ThermosGCExecutor
+from apache.aurora.executor.executor_detector import ExecutorDetector
+from apache.aurora.executor.gc_executor import ThermosGCExecutor
from twitter.common import app, log
from twitter.common.log.options import LogOptions
from twitter.common.metrics.sampler import DiskMetricWriter
-from twitter.thermos.common.path import TaskPath
+from apache.thermos.common.path import TaskPath
import mesos
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/executor/bin/thermos_executor_main.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/executor/bin/thermos_executor_main.py b/src/main/python/apache/aurora/executor/bin/thermos_executor_main.py
index 31e718e..d393968 100644
--- a/src/main/python/apache/aurora/executor/bin/thermos_executor_main.py
+++ b/src/main/python/apache/aurora/executor/bin/thermos_executor_main.py
@@ -10,10 +10,10 @@ import os
from twitter.common import app, log
from twitter.common.log.options import LogOptions
-from twitter.aurora.executor.common.executor_timeout import ExecutorTimeout
-from twitter.aurora.executor.common.health_checker import HealthCheckerProvider
-from twitter.aurora.executor.thermos_executor import ThermosExecutor
-from twitter.aurora.executor.thermos_task_runner import DefaultThermosTaskRunnerProvider
+from apache.aurora.executor.common.executor_timeout import ExecutorTimeout
+from apache.aurora.executor.common.health_checker import HealthCheckerProvider
+from apache.aurora.executor.thermos_executor import ThermosExecutor
+from apache.aurora.executor.thermos_task_runner import DefaultThermosTaskRunnerProvider
import mesos
@@ -29,13 +29,13 @@ LogOptions.set_log_dir('.')
# as a resource, shell out to one on the PATH.
def dump_runner_pex():
import pkg_resources
- import twitter.aurora.executor.resources
+ import apache.aurora.executor.resources
pex_name = 'thermos_runner.pex'
runner_pex = os.path.join(os.path.realpath('.'), pex_name)
with open(runner_pex, 'w') as fp:
# TODO(wickman) Use shutil.copyfileobj to reduce memory footprint here.
fp.write(pkg_resources.resource_stream(
- twitter.aurora.executor.resources.__name__, pex_name).read())
+ apache.aurora.executor.resources.__name__, pex_name).read())
return runner_pex
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/executor/bin/thermos_runner_main.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/executor/bin/thermos_runner_main.py b/src/main/python/apache/aurora/executor/bin/thermos_runner_main.py
index 602111e..33d22e4 100644
--- a/src/main/python/apache/aurora/executor/bin/thermos_runner_main.py
+++ b/src/main/python/apache/aurora/executor/bin/thermos_runner_main.py
@@ -1,6 +1,6 @@
from twitter.common import app
from twitter.common.log.options import LogOptions
-from twitter.aurora.executor.thermos_runner import proxy_main as runner_proxy_main
+from apache.aurora.executor.thermos_runner import proxy_main as runner_proxy_main
LogOptions.set_simple(True)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/executor/common/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/executor/common/BUILD b/src/main/python/apache/aurora/executor/common/BUILD
index 9c932d1..54c7d22 100644
--- a/src/main/python/apache/aurora/executor/common/BUILD
+++ b/src/main/python/apache/aurora/executor/common/BUILD
@@ -25,7 +25,7 @@ python_library(
pants(':task_info'),
pants('aurora/twitterdeps/src/python/twitter/common/log'),
pants('aurora/twitterdeps/src/python/twitter/common/exceptions'),
- pants('src/main/python/twitter/aurora/common:http_signaler'),
+ pants('src/main/python/apache/aurora/common:http_signaler'),
]
)
@@ -60,10 +60,10 @@ python_library(
name = 'task_info',
sources = ['task_info.py'],
dependencies = [
- pants('src/main/python/twitter/aurora/BUILD.thirdparty:pystachio'),
+ pants('src/main/python/apache/aurora/BUILD.thirdparty:pystachio'),
pants('aurora/twitterdeps/src/python/twitter/common/log'),
- pants('src/main/python/twitter/aurora/config'),
- pants('src/main/python/twitter/aurora/config/schema'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+ pants('src/main/python/apache/aurora/config'),
+ pants('src/main/python/apache/aurora/config/schema'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
]
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/executor/common/health_checker.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/executor/common/health_checker.py b/src/main/python/apache/aurora/executor/common/health_checker.py
index 3b25f0e..3f522b0 100644
--- a/src/main/python/apache/aurora/executor/common/health_checker.py
+++ b/src/main/python/apache/aurora/executor/common/health_checker.py
@@ -1,7 +1,7 @@
import threading
import time
-from twitter.aurora.common.http_signaler import HttpSignaler
+from apache.aurora.common.http_signaler import HttpSignaler
from twitter.common import log
from twitter.common.exceptions import ExceptionalThread
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/executor/common/task_info.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/executor/common/task_info.py b/src/main/python/apache/aurora/executor/common/task_info.py
index 1a7cf27..f36a045 100644
--- a/src/main/python/apache/aurora/executor/common/task_info.py
+++ b/src/main/python/apache/aurora/executor/common/task_info.py
@@ -1,11 +1,11 @@
import json
-from twitter.aurora.config.port_resolver import PortResolver
-from twitter.aurora.config.schema.base import MesosJob, MesosTaskInstance
-from twitter.aurora.config.thrift import task_instance_from_job
+from apache.aurora.config.port_resolver import PortResolver
+from apache.aurora.config.schema.base import MesosJob, MesosTaskInstance
+from apache.aurora.config.thrift import task_instance_from_job
from twitter.common import log
-from gen.twitter.aurora.ttypes import AssignedTask
+from gen.apache.aurora.ttypes import AssignedTask
from pystachio import Ref
from thrift.Thrift import TException
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/executor/executor_base.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/executor/executor_base.py b/src/main/python/apache/aurora/executor/executor_base.py
index 4fd9aa4..0cab2e5 100644
--- a/src/main/python/apache/aurora/executor/executor_base.py
+++ b/src/main/python/apache/aurora/executor/executor_base.py
@@ -1,8 +1,8 @@
from twitter.common import log
-from gen.twitter.aurora.constants import TERMINAL_STATES as AURORA_TERMINAL_STATES
-from gen.twitter.aurora.ttypes import ScheduleStatus
-from gen.twitter.thermos.ttypes import TaskState
+from gen.apache.aurora.constants import TERMINAL_STATES as AURORA_TERMINAL_STATES
+from gen.apache.aurora.ttypes import ScheduleStatus
+from gen.apache.thermos.ttypes import TaskState
import mesos
import mesos_pb2 as mesos_pb
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/executor/gc_executor.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/executor/gc_executor.py b/src/main/python/apache/aurora/executor/gc_executor.py
index f17d0a2..c68181a 100644
--- a/src/main/python/apache/aurora/executor/gc_executor.py
+++ b/src/main/python/apache/aurora/executor/gc_executor.py
@@ -15,18 +15,18 @@ from twitter.common.exceptions import ExceptionalThread
from twitter.common.metrics import Observable
from twitter.common.metrics.gauge import AtomicGauge
from twitter.common.quantity import Amount, Time
-from twitter.thermos.common.ckpt import CheckpointDispatcher
-from twitter.thermos.common.path import TaskPath
-from twitter.thermos.core.inspector import CheckpointInspector
-from twitter.thermos.core.helper import TaskKiller
-from twitter.thermos.monitoring.detector import TaskDetector
-from twitter.thermos.monitoring.garbage import TaskGarbageCollector
-
-from gen.twitter.aurora.comm.ttypes import (
+from apache.thermos.common.ckpt import CheckpointDispatcher
+from apache.thermos.common.path import TaskPath
+from apache.thermos.core.inspector import CheckpointInspector
+from apache.thermos.core.helper import TaskKiller
+from apache.thermos.monitoring.detector import TaskDetector
+from apache.thermos.monitoring.garbage import TaskGarbageCollector
+
+from gen.apache.aurora.comm.ttypes import (
AdjustRetainedTasks,
DeletedTasks,
SchedulerMessage)
-from gen.twitter.aurora.ttypes import ScheduleStatus
+from gen.apache.aurora.ttypes import ScheduleStatus
from .common.sandbox import DirectorySandbox, SandboxInterface
from .executor_base import ThermosExecutorBase
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/executor/thermos_runner.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/executor/thermos_runner.py b/src/main/python/apache/aurora/executor/thermos_runner.py
index 0c9af05..fc706e7 100644
--- a/src/main/python/apache/aurora/executor/thermos_runner.py
+++ b/src/main/python/apache/aurora/executor/thermos_runner.py
@@ -5,10 +5,10 @@ import sys
import traceback
from twitter.common import app, log
-from twitter.thermos.common.options import add_port_to
-from twitter.thermos.common.planner import TaskPlanner
-from twitter.thermos.config.loader import ThermosConfigLoader
-from twitter.thermos.core.runner import TaskRunner
+from apache.thermos.common.options import add_port_to
+from apache.thermos.common.planner import TaskPlanner
+from apache.thermos.config.loader import ThermosConfigLoader
+from apache.thermos.core.runner import TaskRunner
app.add_option(
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/executor/thermos_task_runner.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/executor/thermos_task_runner.py b/src/main/python/apache/aurora/executor/thermos_task_runner.py
index dba99d2..6ecb51a 100644
--- a/src/main/python/apache/aurora/executor/thermos_task_runner.py
+++ b/src/main/python/apache/aurora/executor/thermos_task_runner.py
@@ -6,17 +6,17 @@ import subprocess
import threading
import time
-from twitter.aurora.common.http_signaler import HttpSignaler
+from apache.aurora.common.http_signaler import HttpSignaler
from twitter.common import log
from twitter.common.dirutil import chmod_plus_x, safe_mkdtemp
from twitter.common.log.options import LogOptions
from twitter.common.quantity import Amount, Time
-from twitter.thermos.common.path import TaskPath
-from twitter.thermos.config.loader import ThermosTaskWrapper
-from twitter.thermos.core import runner as core
-from twitter.thermos.monitoring.monitor import TaskMonitor
+from apache.thermos.common.path import TaskPath
+from apache.thermos.config.loader import ThermosTaskWrapper
+from apache.thermos.core import runner as core
+from apache.thermos.monitoring.monitor import TaskMonitor
-from gen.twitter.thermos.ttypes import TaskState
+from gen.apache.thermos.ttypes import TaskState
from .common.status_checker import ExitState, StatusResult
from .common.task_info import (
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/tools/java/organize_imports.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/tools/java/organize_imports.py b/src/main/python/apache/aurora/tools/java/organize_imports.py
index 48a0821..6dce4c1 100644
--- a/src/main/python/apache/aurora/tools/java/organize_imports.py
+++ b/src/main/python/apache/aurora/tools/java/organize_imports.py
@@ -1,8 +1,7 @@
#!/bin/env python
'''
-Organizes a java source file's import statements in a way that pleases Twitter's checkstyle
-configuration.
-This expects exactly one argument: the name of the file to modify with preferred import
+Organizes a java source file's import statements in a way that pleases Apache Aurora's checkstyle
+configuration. This expects exactly one argument: the name of the file to modify with preferred import
ordering.
'''
@@ -18,10 +17,7 @@ def get_group(import_statement):
matcher = IMPORT_RE.match(import_statement)
assert matcher, 'Could not parse import statement: %s' % import_statement
class_name = matcher.group(1)
- if class_name.startswith('com.twitter'):
- group = 'com.twitter'
- else:
- group = class_name.split('.')[0]
+ group = class_name.split('.')[0]
return group
@@ -56,7 +52,7 @@ def get_all_group_lines(import_groups):
return lines
all_lines = []
- explicit_groups = ['java', 'javax', 'scala', 'com', 'net', 'org', 'com.twitter']
+ explicit_groups = ['java', 'javax', 'scala', 'com', 'net', 'org']
for group in explicit_groups:
if group in import_groups:
all_lines += get_group_lines(group)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/aurora/tools/java/thrift_wrapper_codegen.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/tools/java/thrift_wrapper_codegen.py b/src/main/python/apache/aurora/tools/java/thrift_wrapper_codegen.py
index 4376e85..ec3ac20 100644
--- a/src/main/python/apache/aurora/tools/java/thrift_wrapper_codegen.py
+++ b/src/main/python/apache/aurora/tools/java/thrift_wrapper_codegen.py
@@ -110,10 +110,10 @@ STRUCT_COLLECTION_FIELD_ASSIGNMENT = '''this.%(field)s = !wrapped.%(isset)s()
.transform(%(params)s.FROM_BUILDER)
.to%(collection)s();'''
-PACKAGE_NAME = 'com.twitter.aurora.scheduler.storage.entities'
+PACKAGE_NAME = 'org.apache.aurora.scheduler.storage.entities'
CLASS_TEMPLATE = '''/*
- * Copyright 2013 Twitter, Inc.
+ * Copyright 2013 Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -263,7 +263,7 @@ class GeneratedCode(object):
# A namespace declaration, e.g.:
-# namespace java com.twitter.aurora.gen
+# namespace java org.apache.aurora.gen
NAMESPACE_RE = 'namespace\s+(?P<lang>\w+)\s+(?P<namespace>[^\s]+)'
# A possibly-parameterized type name, e.g.:
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/thermos/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/BUILD b/src/main/python/apache/thermos/BUILD
index 937bcf3..81a0c40 100644
--- a/src/main/python/apache/thermos/BUILD
+++ b/src/main/python/apache/thermos/BUILD
@@ -5,14 +5,14 @@ page(name = 'readme', source = 'README.md')
python_library(
name = 'thermos',
dependencies = [
- pants('src/main/python/twitter/thermos/core'),
- pants('src/main/python/twitter/thermos/monitoring'),
+ pants('src/main/python/apache/thermos/core'),
+ pants('src/main/python/apache/thermos/monitoring'),
],
provides = setup_py(
- name = 'twitter.thermos',
+ name = 'apache.thermos',
version = open(os.path.join(get_buildroot(), '.auroraversion')).read().strip().lower(),
- descripton = 'The Twitter Thermos runtime.',
+ descripton = 'The Apache Aurora Thermos runtime.',
).with_binaries(
- thermos = pants('src/main/python/twitter/thermos/bin:thermos'),
+ thermos = pants('src/main/python/apache/thermos/bin:thermos'),
)
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/thermos/README.md
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/README.md b/src/main/python/apache/thermos/README.md
index e456e93..4bfefd3 100644
--- a/src/main/python/apache/thermos/README.md
+++ b/src/main/python/apache/thermos/README.md
@@ -28,8 +28,8 @@ Thermos lives in `science` at Twitter and publically on GitHub in `twitter-commo
Build the Thermos CLI and the Thermos observer.
```shell
-$ ./pants src/python/twitter/thermos
-$ ./pants src/python/twitter/thermos/bin:thermos_observe
+$ ./pants src/python/apache/thermos
+$ ./pants src/python/apache/thermos/bin:thermos_observe
```
You can copy `dist/thermos.pex` to `thermos` somewhere in your `$PATH` or use a la carte.
@@ -131,7 +131,7 @@ export({
```
The full Thermos pystachio schema can be found at
-`src/python/twitter/thermos/config/schema.py` and is mostly described below.
+`src/python/apache/thermos/config/schema.py` and is mostly described below.
## Configuration reference ##
@@ -351,11 +351,11 @@ mostly a best-effort signal.
## REPL ##
You can interactively experiment with the Thermos configuration REPL via the
-`src/python/twitter/thermos/config:repl` target:
+`src/python/apache/thermos/config:repl` target:
```python
-$ ./pants py src/python/twitter/thermos/config:repl
-Build operating on target: PythonBinary(src/python/twitter/thermos/config/BUILD:repl)
+$ ./pants py src/python/apache/thermos/config:repl
+Build operating on target: PythonBinary(src/python/apache/thermos/config/BUILD:repl)
Thermos Config REPL
>>> boilerplate = Process(cmdline = "echo hello world")
>>> boilerplate
@@ -397,7 +397,7 @@ If this is left unbound, the thermos CLI will complain:
```
$ thermos run thermos/examples/tutorial/unbound.thermos
-twitter.thermos.config.loader.InvalidTask: Task[processes] failed: Element in ProcessList failed check: Process[cmdline] failed: Uninterpolated variables: {{first}}
+apache.thermos.config.loader.InvalidTask: Task[processes] failed: Element in ProcessList failed check: Process[cmdline] failed: Uninterpolated variables: {{first}}
```
But free variables can be populated at runtime using the `-E` parameter:
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/thermos/bin/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/bin/BUILD b/src/main/python/apache/thermos/bin/BUILD
index 5aa41a2..9d5e7e0 100644
--- a/src/main/python/apache/thermos/bin/BUILD
+++ b/src/main/python/apache/thermos/bin/BUILD
@@ -4,8 +4,8 @@ python_binary(
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/app'),
pants('aurora/twitterdeps/src/python/twitter/common/recordio:recordio-thrift'),
- pants('src/main/python/twitter/thermos/common'),
- pants('src/main/thrift/com/twitter/thermos:py-thrift')
+ pants('src/main/python/apache/thermos/common'),
+ pants('src/main/thrift/org/apache/thermos:py-thrift')
]
)
@@ -15,10 +15,10 @@ python_binary(
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/app'),
pants('aurora/twitterdeps/src/python/twitter/common/log'),
- pants('src/main/python/twitter/thermos/common'),
- pants('src/main/python/twitter/thermos/config:schema'),
- pants('src/main/python/twitter/thermos/core'),
- pants('src/main/python/twitter/thermos/monitoring'),
- pants('src/main/thrift/com/twitter/thermos:py-thrift'),
+ pants('src/main/python/apache/thermos/common'),
+ pants('src/main/python/apache/thermos/config:schema'),
+ pants('src/main/python/apache/thermos/core'),
+ pants('src/main/python/apache/thermos/monitoring'),
+ pants('src/main/thrift/org/apache/thermos:py-thrift'),
],
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/thermos/bin/thermos.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/bin/thermos.py b/src/main/python/apache/thermos/bin/thermos.py
index 5e695b4..334297a 100644
--- a/src/main/python/apache/thermos/bin/thermos.py
+++ b/src/main/python/apache/thermos/bin/thermos.py
@@ -18,21 +18,21 @@ from twitter.common.dirutil.tail import tail as tail_closed
from twitter.common.quantity import Amount, Time, Data
from twitter.common.quantity.parse_simple import parse_time, parse_data
from twitter.common.recordio import RecordIO, ThriftRecordReader
-from twitter.thermos.common.path import TkPath
-from twitter.thermos.common.ckpt import CheckpointDispatcher
-from twitter.thermos.common.options import add_port_to, add_binding_to
-from twitter.thermos.config.loader import ThermosConfigLoader, ThermosTaskWrapper
-from twitter.thermos.config.schema import (
+from apache.thermos.common.path import TkPath
+from apache.thermos.common.ckpt import CheckpointDispatcher
+from apache.thermos.common.options import add_port_to, add_binding_to
+from apache.thermos.config.loader import ThermosConfigLoader, ThermosTaskWrapper
+from apache.thermos.config.schema import (
Process,
Resources,
Task)
-from twitter.thermos.core.helper import TaskRunnerHelper
-from twitter.thermos.core.runner import TaskRunner
-from twitter.thermos.monitoring.detector import TaskDetector
-from twitter.thermos.monitoring.garbage import TaskGarbageCollector, DefaultCollector
-from twitter.thermos.monitoring.monitor import TaskMonitor
+from apache.thermos.core.helper import TaskRunnerHelper
+from apache.thermos.core.runner import TaskRunner
+from apache.thermos.monitoring.detector import TaskDetector
+from apache.thermos.monitoring.garbage import TaskGarbageCollector, DefaultCollector
+from apache.thermos.monitoring.monitor import TaskMonitor
-from gen.twitter.thermos.ttypes import (
+from gen.apache.thermos.ttypes import (
ProcessState,
RunnerCkpt,
RunnerState,
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/thermos/bin/thermos_ckpt.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/bin/thermos_ckpt.py b/src/main/python/apache/thermos/bin/thermos_ckpt.py
old mode 100755
new mode 100644
index 36fd419..fa9414f
--- a/src/main/python/apache/thermos/bin/thermos_ckpt.py
+++ b/src/main/python/apache/thermos/bin/thermos_ckpt.py
@@ -3,11 +3,11 @@ import sys
import pprint
import time
-from gen.twitter.thermos.ttypes import RunnerState, RunnerCkpt, TaskState
+from gen.apache.thermos.ttypes import RunnerState, RunnerCkpt, TaskState
from twitter.common import app
from twitter.common.recordio import RecordIO, ThriftRecordReader
-from twitter.thermos.common.ckpt import CheckpointDispatcher
+from apache.thermos.common.ckpt import CheckpointDispatcher
app.add_option("--checkpoint", dest = "ckpt", metavar = "CKPT",
help = "read checkpoint from CKPT")
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/thermos/common/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/common/BUILD b/src/main/python/apache/thermos/common/BUILD
index d97c771..006147c 100644
--- a/src/main/python/apache/thermos/common/BUILD
+++ b/src/main/python/apache/thermos/common/BUILD
@@ -6,7 +6,7 @@ python_library(
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/log'),
pants('aurora/twitterdeps/src/python/twitter/common/recordio:recordio-thrift'),
- pants('src/main/thrift/com/twitter/thermos:py-thrift')
+ pants('src/main/thrift/org/apache/thermos:py-thrift')
]
)
@@ -24,8 +24,8 @@ python_library(
name = 'options',
sources = ['options.py'],
dependencies = [
- pants('src/main/python/twitter/thermos:pystachio'),
- pants('src/main/thrift/com/twitter/thermos:py-thrift'),
+ pants('src/main/python/apache/thermos:pystachio'),
+ pants('src/main/thrift/org/apache/thermos:py-thrift'),
]
)
@@ -38,7 +38,7 @@ python_library(
pants(':planner'),
],
provides = setup_py(
- name = 'twitter.thermos.common',
+ name = 'apache.thermos.common',
version = open(os.path.join(get_buildroot(), '.auroraversion')).read().strip().lower(),
description = 'Thermos common libraries.',
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/thermos/common/ckpt.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/common/ckpt.py b/src/main/python/apache/thermos/common/ckpt.py
index 9c5a949..da00c21 100644
--- a/src/main/python/apache/thermos/common/ckpt.py
+++ b/src/main/python/apache/thermos/common/ckpt.py
@@ -12,7 +12,7 @@ import os
from twitter.common import log
from twitter.common.recordio import RecordIO, ThriftRecordReader
-from gen.twitter.thermos.ttypes import (
+from gen.apache.thermos.ttypes import (
ProcessState,
ProcessStatus,
RunnerCkpt,
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/thermos/config/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/config/BUILD b/src/main/python/apache/thermos/config/BUILD
index 57e7f0d..084efed 100644
--- a/src/main/python/apache/thermos/config/BUILD
+++ b/src/main/python/apache/thermos/config/BUILD
@@ -5,8 +5,8 @@ python_library(
sources = globs('*.py'),
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/lang'),
- pants('src/main/python/twitter/thermos:pystachio'),
- pants('src/main/python/twitter/thermos/common:planner')
+ pants('src/main/python/apache/thermos:pystachio'),
+ pants('src/main/python/apache/thermos/common:planner')
],
)
@@ -14,10 +14,10 @@ python_library(
name = 'config',
dependencies = [
pants(':schema'),
- pants('src/main/python/twitter/thermos/common'), # cover common:planner
+ pants('src/main/python/apache/thermos/common'), # cover common:planner
],
provides = setup_py(
- name = 'twitter.thermos.config',
+ name = 'apache.thermos.config',
version = open(os.path.join(get_buildroot(), '.auroraversion')).read().strip().lower(),
description = 'Thermos configuration schema and loader.',
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/thermos/config/bin/config_load.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/config/bin/config_load.py b/src/main/python/apache/thermos/config/bin/config_load.py
index c0680ec..4af0163 100644
--- a/src/main/python/apache/thermos/config/bin/config_load.py
+++ b/src/main/python/apache/thermos/config/bin/config_load.py
@@ -4,7 +4,7 @@ import json
import pprint
from twitter.common import app
-from twitter.thermos.config.loader import ThermosConfigLoader
+from apache.thermos.config.loader import ThermosConfigLoader
def main(args):
"""
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/thermos/config/bin/config_repl.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/config/bin/config_repl.py b/src/main/python/apache/thermos/config/bin/config_repl.py
index 4a5c797..4ba9667 100644
--- a/src/main/python/apache/thermos/config/bin/config_repl.py
+++ b/src/main/python/apache/thermos/config/bin/config_repl.py
@@ -1,3 +1,3 @@
-from twitter.thermos.config.schema import *
+from apache.thermos.config.schema import *
from code import interact
interact('Thermos Config REPL', local=locals())
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/thermos/config/loader.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/config/loader.py b/src/main/python/apache/thermos/config/loader.py
index 54721c3..4499d43 100644
--- a/src/main/python/apache/thermos/config/loader.py
+++ b/src/main/python/apache/thermos/config/loader.py
@@ -6,8 +6,8 @@ import textwrap
from twitter.common.dirutil import safe_open
from twitter.common.lang import Compatibility
-from twitter.thermos.common.planner import TaskPlanner
-from twitter.thermos.config.schema import Task
+from apache.thermos.common.planner import TaskPlanner
+from apache.thermos.config.schema import Task
from pystachio import Ref
from pystachio.config import Config
@@ -147,7 +147,7 @@ class ThermosTaskValidator(object):
class ThermosConfigLoader(object):
SCHEMA = textwrap.dedent("""
from pystachio import *
- from twitter.thermos.config.schema import *
+ from apache.thermos.config.schema import *
__TASKS = []
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/thermos/core/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/core/BUILD b/src/main/python/apache/thermos/core/BUILD
index d260112..0515e03 100644
--- a/src/main/python/apache/thermos/core/BUILD
+++ b/src/main/python/apache/thermos/core/BUILD
@@ -4,14 +4,14 @@ python_library(
name = 'helper',
sources = ['helper.py'],
dependencies = [
- pants('src/main/python/twitter/thermos:psutil'),
+ pants('src/main/python/apache/thermos:psutil'),
pants('aurora/twitterdeps/src/python/twitter/common/dirutil'),
pants('aurora/twitterdeps/src/python/twitter/common/log'),
pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
pants('aurora/twitterdeps/src/python/twitter/common/recordio:recordio-thrift'),
- pants('src/main/python/twitter/thermos/common:ckpt'),
- pants('src/main/python/twitter/thermos/common:path'),
- pants('src/main/thrift/com/twitter/thermos:py-thrift'),
+ pants('src/main/python/apache/thermos/common:ckpt'),
+ pants('src/main/python/apache/thermos/common:path'),
+ pants('src/main/thrift/org/apache/thermos:py-thrift'),
]
)
@@ -21,9 +21,9 @@ python_library(
dependencies = [
pants(':muxer'),
pants('aurora/twitterdeps/src/python/twitter/common/recordio:recordio-thrift'),
- pants('src/main/python/twitter/thermos/common:ckpt'),
- pants('src/main/python/twitter/thermos/common:path'),
- pants('src/main/thrift/com/twitter/thermos:py-thrift'),
+ pants('src/main/python/apache/thermos/common:ckpt'),
+ pants('src/main/python/apache/thermos/common:path'),
+ pants('src/main/thrift/org/apache/thermos:py-thrift'),
]
)
@@ -33,7 +33,7 @@ python_library(
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/log'),
pants('aurora/twitterdeps/src/python/twitter/common/recordio:recordio-thrift'),
- pants('src/main/thrift/com/twitter/thermos:py-thrift'),
+ pants('src/main/thrift/org/apache/thermos:py-thrift'),
]
)
@@ -46,7 +46,7 @@ python_library(
pants('aurora/twitterdeps/src/python/twitter/common/log'),
pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
pants('aurora/twitterdeps/src/python/twitter/common/recordio:recordio-thrift'),
- pants('src/main/thrift/com/twitter/thermos:py-thrift'),
+ pants('src/main/thrift/org/apache/thermos:py-thrift'),
]
)
@@ -61,12 +61,12 @@ python_library(
pants('aurora/twitterdeps/src/python/twitter/common/log'),
pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
pants('aurora/twitterdeps/src/python/twitter/common/recordio:recordio-thrift'),
- pants('src/main/python/twitter/thermos:psutil'),
- pants('src/main/python/twitter/thermos/common:ckpt'),
- pants('src/main/python/twitter/thermos/common:path'),
- pants('src/main/python/twitter/thermos/common:planner'),
- pants('src/main/python/twitter/thermos/config:schema'),
- pants('src/main/thrift/com/twitter/thermos:py-thrift'),
+ pants('src/main/python/apache/thermos:psutil'),
+ pants('src/main/python/apache/thermos/common:ckpt'),
+ pants('src/main/python/apache/thermos/common:path'),
+ pants('src/main/python/apache/thermos/common:planner'),
+ pants('src/main/python/apache/thermos/config:schema'),
+ pants('src/main/thrift/org/apache/thermos:py-thrift'),
]
)
@@ -77,11 +77,11 @@ python_library(
pants(':runner'),
# covering libs
- pants('src/main/python/twitter/thermos/common'),
- pants('src/main/python/twitter/thermos/config'),
+ pants('src/main/python/apache/thermos/common'),
+ pants('src/main/python/apache/thermos/config'),
],
provides = setup_py(
- name = 'twitter.thermos.core',
+ name = 'apache.thermos.core',
version = open(os.path.join(get_buildroot(), '.auroraversion')).read().strip().lower(),
description = 'The Thermos core state machine.',
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/thermos/core/helper.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/core/helper.py b/src/main/python/apache/thermos/core/helper.py
index 3587a85..8c954bc 100644
--- a/src/main/python/apache/thermos/core/helper.py
+++ b/src/main/python/apache/thermos/core/helper.py
@@ -8,10 +8,10 @@ from twitter.common import log
from twitter.common.dirutil import lock_file, safe_mkdir
from twitter.common.quantity import Amount, Time
from twitter.common.recordio import ThriftRecordWriter
-from twitter.thermos.common.ckpt import CheckpointDispatcher
-from twitter.thermos.common.path import TaskPath
+from apache.thermos.common.ckpt import CheckpointDispatcher
+from apache.thermos.common.path import TaskPath
-from gen.twitter.thermos.ttypes import (
+from gen.apache.thermos.ttypes import (
ProcessState,
ProcessStatus,
RunnerCkpt,
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/thermos/core/inspector.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/core/inspector.py b/src/main/python/apache/thermos/core/inspector.py
index 8c646a1..ad9213e 100644
--- a/src/main/python/apache/thermos/core/inspector.py
+++ b/src/main/python/apache/thermos/core/inspector.py
@@ -5,10 +5,10 @@ import pwd
from twitter.common import log
from twitter.common.recordio import RecordIO, ThriftRecordReader
-from twitter.thermos.common.ckpt import CheckpointDispatcher
-from twitter.thermos.common.path import TaskPath
+from apache.thermos.common.ckpt import CheckpointDispatcher
+from apache.thermos.common.path import TaskPath
-from gen.twitter.thermos.ttypes import (
+from gen.apache.thermos.ttypes import (
ProcessState,
RunnerCkpt,
RunnerState)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/thermos/core/muxer.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/core/muxer.py b/src/main/python/apache/thermos/core/muxer.py
index 9c0b389..7588dca 100644
--- a/src/main/python/apache/thermos/core/muxer.py
+++ b/src/main/python/apache/thermos/core/muxer.py
@@ -3,7 +3,7 @@ import errno
from twitter.common import log
from twitter.common.recordio import ThriftRecordReader
-from gen.twitter.thermos.ttypes import RunnerCkpt
+from gen.apache.thermos.ttypes import RunnerCkpt
class ProcessMuxer(object):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/thermos/core/process.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/core/process.py b/src/main/python/apache/thermos/core/process.py
index dd1d62a..a87a6e0 100644
--- a/src/main/python/apache/thermos/core/process.py
+++ b/src/main/python/apache/thermos/core/process.py
@@ -26,7 +26,7 @@ from twitter.common.lang import Interface
from twitter.common.quantity import Amount, Time
from twitter.common.recordio import ThriftRecordReader, ThriftRecordWriter
-from gen.twitter.thermos.ttypes import (
+from gen.apache.thermos.ttypes import (
ProcessState,
ProcessStatus,
RunnerCkpt,
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/thermos/core/runner.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/core/runner.py b/src/main/python/apache/thermos/core/runner.py
index b10cf16..9466ab4 100644
--- a/src/main/python/apache/thermos/core/runner.py
+++ b/src/main/python/apache/thermos/core/runner.py
@@ -39,21 +39,21 @@ from twitter.common.dirutil import safe_mkdir
from twitter.common.quantity import Amount, Time
from twitter.common.recordio import ThriftRecordReader
-from twitter.thermos.common.ckpt import (
+from apache.thermos.common.ckpt import (
CheckpointDispatcher,
UniversalStateHandler,
ProcessStateHandler,
TaskStateHandler)
-from twitter.thermos.common.path import TaskPath
-from twitter.thermos.common.planner import TaskPlanner
-from twitter.thermos.config.loader import (
+from apache.thermos.common.path import TaskPath
+from apache.thermos.common.planner import TaskPlanner
+from apache.thermos.config.loader import (
ThermosConfigLoader,
ThermosProcessWrapper,
ThermosTaskWrapper,
ThermosTaskValidator)
-from twitter.thermos.config.schema import ThermosContext
+from apache.thermos.config.schema import ThermosContext
-from gen.twitter.thermos.ttypes import (
+from gen.apache.thermos.ttypes import (
ProcessState,
ProcessStatus,
RunnerCkpt,
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/thermos/monitoring/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/monitoring/BUILD b/src/main/python/apache/thermos/monitoring/BUILD
index a977878..f5b1b0e 100644
--- a/src/main/python/apache/thermos/monitoring/BUILD
+++ b/src/main/python/apache/thermos/monitoring/BUILD
@@ -4,7 +4,7 @@ python_library(
name = 'detector',
sources = ['detector.py'],
dependencies = [
- pants('src/main/python/twitter/thermos/common:path')
+ pants('src/main/python/apache/thermos/common:path')
]
)
@@ -16,8 +16,8 @@ python_library(
pants('aurora/twitterdeps/src/python/twitter/common/dirutil'),
pants('aurora/twitterdeps/src/python/twitter/common/lang'),
pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
- pants('src/main/python/twitter/thermos/common:ckpt'),
- pants('src/main/python/twitter/thermos/common:path'),
+ pants('src/main/python/apache/thermos/common:ckpt'),
+ pants('src/main/python/apache/thermos/common:path'),
]
)
@@ -27,8 +27,8 @@ python_library(
dependencies = [
pants('aurora/twitterdeps/src/python/twitter/common/log'),
pants('aurora/twitterdeps/src/python/twitter/common/recordio:recordio-thrift'),
- pants('src/main/python/twitter/thermos/common:ckpt'),
- pants('src/main/thrift/com/twitter/thermos:py-thrift'),
+ pants('src/main/python/apache/thermos/common:ckpt'),
+ pants('src/main/thrift/org/apache/thermos:py-thrift'),
]
)
@@ -56,7 +56,7 @@ python_library(
dependencies = [
pants(':process'),
pants('aurora/twitterdeps/src/python/twitter/common/log'),
- pants('src/main/python/twitter/thermos:psutil'),
+ pants('src/main/python/apache/thermos:psutil'),
]
)
@@ -87,10 +87,10 @@ python_library(
pants(':resource'),
# covering dependency for common
- pants('src/main/python/twitter/thermos/common'),
+ pants('src/main/python/apache/thermos/common'),
],
provides = setup_py(
- name = 'twitter.thermos.monitoring',
+ name = 'apache.thermos.monitoring',
version = open(os.path.join(get_buildroot(), '.auroraversion')).read().strip().lower(),
description = 'Thermos monitoring library.',
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/main/python/apache/thermos/monitoring/detector.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/monitoring/detector.py b/src/main/python/apache/thermos/monitoring/detector.py
index ed48c93..f2c59ce 100644
--- a/src/main/python/apache/thermos/monitoring/detector.py
+++ b/src/main/python/apache/thermos/monitoring/detector.py
@@ -8,7 +8,7 @@ import glob
import os
import re
-from twitter.thermos.common.path import TaskPath
+from apache.thermos.common.path import TaskPath
class TaskDetector(object):
[3/9] Refactors java and python code to the Apache namespace.
Posted by wf...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/filter/SchedulingFilterImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/filter/SchedulingFilterImplTest.java b/src/test/java/org/apache/aurora/scheduler/filter/SchedulingFilterImplTest.java
index 3e46d40..75aba2e 100644
--- a/src/test/java/org/apache/aurora/scheduler/filter/SchedulingFilterImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/filter/SchedulingFilterImplTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.filter;
+package org.apache.aurora.scheduler.filter;
import java.util.Arrays;
import java.util.Set;
@@ -23,54 +23,57 @@ import com.google.common.base.Optional;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
+import com.twitter.common.quantity.Amount;
+import com.twitter.common.quantity.Data;
+import com.twitter.common.testing.easymock.EasyMockTest;
+
+import org.apache.aurora.gen.AssignedTask;
+import org.apache.aurora.gen.Attribute;
+import org.apache.aurora.gen.Constraint;
+import org.apache.aurora.gen.ExecutorConfig;
+import org.apache.aurora.gen.HostAttributes;
+import org.apache.aurora.gen.Identity;
+import org.apache.aurora.gen.LimitConstraint;
+import org.apache.aurora.gen.MaintenanceMode;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.gen.TaskConstraint;
+import org.apache.aurora.gen.ValueConstraint;
+import org.apache.aurora.scheduler.ResourceSlot;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.configuration.ConfigurationManager;
+import org.apache.aurora.scheduler.filter.SchedulingFilter.Veto;
+import org.apache.aurora.scheduler.state.MaintenanceController;
+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.Quiet;
+import org.apache.aurora.scheduler.storage.TaskStore;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
+
import org.easymock.EasyMock;
import org.easymock.IAnswer;
import org.easymock.IExpectationSetters;
+
import org.junit.Before;
import org.junit.Test;
-import com.twitter.aurora.gen.AssignedTask;
-import com.twitter.aurora.gen.Attribute;
-import com.twitter.aurora.gen.Constraint;
-import com.twitter.aurora.gen.ExecutorConfig;
-import com.twitter.aurora.gen.HostAttributes;
-import com.twitter.aurora.gen.Identity;
-import com.twitter.aurora.gen.LimitConstraint;
-import com.twitter.aurora.gen.MaintenanceMode;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.gen.TaskConstraint;
-import com.twitter.aurora.gen.ValueConstraint;
-import com.twitter.aurora.scheduler.ResourceSlot;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.configuration.ConfigurationManager;
-import com.twitter.aurora.scheduler.filter.SchedulingFilter.Veto;
-import com.twitter.aurora.scheduler.state.MaintenanceController;
-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.Quiet;
-import com.twitter.aurora.scheduler.storage.TaskStore;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
-import com.twitter.common.quantity.Amount;
-import com.twitter.common.quantity.Data;
-import com.twitter.common.testing.easymock.EasyMockTest;
+import static org.apache.aurora.scheduler.configuration.ConfigurationManager.DEDICATED_ATTRIBUTE;
+import static org.apache.aurora.scheduler.filter.ConstraintFilter.limitVeto;
+import static org.apache.aurora.scheduler.filter.ConstraintFilter.mismatchVeto;
+import static org.apache.aurora.scheduler.filter.SchedulingFilterImpl.DEDICATED_HOST_VETO;
+import static org.apache.aurora.scheduler.filter.SchedulingFilterImpl.ResourceVector.CPU;
+import static org.apache.aurora.scheduler.filter.SchedulingFilterImpl.ResourceVector.DISK;
+import static org.apache.aurora.scheduler.filter.SchedulingFilterImpl.ResourceVector.PORTS;
+import static org.apache.aurora.scheduler.filter.SchedulingFilterImpl.ResourceVector.RAM;
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.expect;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static com.twitter.aurora.scheduler.configuration.ConfigurationManager.DEDICATED_ATTRIBUTE;
-import static com.twitter.aurora.scheduler.filter.ConstraintFilter.limitVeto;
-import static com.twitter.aurora.scheduler.filter.ConstraintFilter.mismatchVeto;
-import static com.twitter.aurora.scheduler.filter.SchedulingFilterImpl.DEDICATED_HOST_VETO;
-import static com.twitter.aurora.scheduler.filter.SchedulingFilterImpl.ResourceVector.CPU;
-import static com.twitter.aurora.scheduler.filter.SchedulingFilterImpl.ResourceVector.DISK;
-import static com.twitter.aurora.scheduler.filter.SchedulingFilterImpl.ResourceVector.PORTS;
-import static com.twitter.aurora.scheduler.filter.SchedulingFilterImpl.ResourceVector.RAM;
-
public class SchedulingFilterImplTest extends EasyMockTest {
private static final String TASK_ID = "taskId";
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/http/LeaderRedirectTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/http/LeaderRedirectTest.java b/src/test/java/org/apache/aurora/scheduler/http/LeaderRedirectTest.java
index 6bbe927..a859be6 100644
--- a/src/test/java/org/apache/aurora/scheduler/http/LeaderRedirectTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/http/LeaderRedirectTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.http;
+package org.apache.aurora.scheduler.http;
import java.util.Arrays;
import java.util.Set;
@@ -26,11 +26,6 @@ import com.google.common.collect.Iterables;
import com.google.common.net.HostAndPort;
import com.google.inject.util.Providers;
-import org.easymock.Capture;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
import com.twitter.common.application.ShutdownRegistry.ShutdownRegistryImpl;
import com.twitter.common.application.modules.LifecycleModule.ServiceRunner;
import com.twitter.common.application.modules.LocalServiceRegistry;
@@ -43,12 +38,18 @@ import com.twitter.common.testing.easymock.EasyMockTest;
import com.twitter.thrift.Endpoint;
import com.twitter.thrift.ServiceInstance;
+import org.easymock.Capture;
+
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.apache.aurora.scheduler.http.LeaderRedirect.HTTP_PORT_NAME;
+
import static org.easymock.EasyMock.capture;
import static org.easymock.EasyMock.expect;
import static org.junit.Assert.assertEquals;
-import static com.twitter.aurora.scheduler.http.LeaderRedirect.HTTP_PORT_NAME;
-
public class LeaderRedirectTest extends EasyMockTest {
private static final int HTTP_PORT = 500;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/http/MnameTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/http/MnameTest.java b/src/test/java/org/apache/aurora/scheduler/http/MnameTest.java
index d030705..e5de63c 100644
--- a/src/test/java/org/apache/aurora/scheduler/http/MnameTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/http/MnameTest.java
@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.http;
+package org.apache.aurora.scheduler.http;
import java.util.Map;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
-import org.junit.Test;
+import org.apache.aurora.gen.AssignedTask;
+import org.apache.aurora.scheduler.storage.entities.IAssignedTask;
-import com.twitter.aurora.gen.AssignedTask;
-import com.twitter.aurora.scheduler.storage.entities.IAssignedTask;
+import org.junit.Test;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/http/SchedulerzRoleTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/http/SchedulerzRoleTest.java b/src/test/java/org/apache/aurora/scheduler/http/SchedulerzRoleTest.java
index eb0c48a..5ea9dc4 100644
--- a/src/test/java/org/apache/aurora/scheduler/http/SchedulerzRoleTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/http/SchedulerzRoleTest.java
@@ -1,4 +1,4 @@
-package com.twitter.aurora.scheduler.http;
+package org.apache.aurora.scheduler.http;
import java.util.Collections;
import java.util.List;
@@ -6,22 +6,22 @@ import java.util.List;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
+import org.apache.aurora.gen.AssignedTask;
+import org.apache.aurora.gen.Identity;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.gen.TaskEvent;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+
import org.junit.Test;
-import com.twitter.aurora.gen.AssignedTask;
-import com.twitter.aurora.gen.Identity;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.gen.TaskEvent;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
+import static org.apache.aurora.gen.ScheduleStatus.FINISHED;
+import static org.apache.aurora.gen.ScheduleStatus.RUNNING;
+import static org.apache.aurora.scheduler.http.SchedulerzRole.getFreshestTask;
import static org.junit.Assert.assertEquals;
-import static com.twitter.aurora.gen.ScheduleStatus.FINISHED;
-import static com.twitter.aurora.gen.ScheduleStatus.RUNNING;
-import static com.twitter.aurora.scheduler.http.SchedulerzRole.getFreshestTask;
-
public class SchedulerzRoleTest {
@Test
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/log/mesos/MesosLogTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/log/mesos/MesosLogTest.java b/src/test/java/org/apache/aurora/scheduler/log/mesos/MesosLogTest.java
index 2b3a47d..560efcc 100644
--- a/src/test/java/org/apache/aurora/scheduler/log/mesos/MesosLogTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/log/mesos/MesosLogTest.java
@@ -1,4 +1,4 @@
-package com.twitter.aurora.scheduler.log.mesos;
+package org.apache.aurora.scheduler.log.mesos;
import java.util.concurrent.TimeoutException;
@@ -6,18 +6,21 @@ import javax.inject.Provider;
import com.google.inject.util.Providers;
+import com.twitter.common.quantity.Amount;
+import com.twitter.common.quantity.Time;
+import com.twitter.common.testing.easymock.EasyMockTest;
+
+import org.apache.aurora.scheduler.log.Log.Stream.StreamAccessException;
+import org.apache.aurora.scheduler.log.mesos.LogInterface.ReaderInterface;
+import org.apache.aurora.scheduler.log.mesos.LogInterface.WriterInterface;
+
import org.apache.mesos.Log;
+
import org.easymock.EasyMock;
+
import org.junit.Before;
import org.junit.Test;
-import com.twitter.aurora.scheduler.log.Log.Stream.StreamAccessException;
-import com.twitter.aurora.scheduler.log.mesos.LogInterface.ReaderInterface;
-import com.twitter.aurora.scheduler.log.mesos.LogInterface.WriterInterface;
-import com.twitter.common.quantity.Amount;
-import com.twitter.common.quantity.Time;
-import com.twitter.common.testing.easymock.EasyMockTest;
-
import static org.easymock.EasyMock.expect;
public class MesosLogTest extends EasyMockTest {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/log/testing/FileLogTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/log/testing/FileLogTest.java b/src/test/java/org/apache/aurora/scheduler/log/testing/FileLogTest.java
index 40eafd8..8d49a76 100644
--- a/src/test/java/org/apache/aurora/scheduler/log/testing/FileLogTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/log/testing/FileLogTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.log.testing;
+package org.apache.aurora.scheduler.log.testing;
import java.io.File;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/metadata/NearestFitTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/metadata/NearestFitTest.java b/src/test/java/org/apache/aurora/scheduler/metadata/NearestFitTest.java
index 9125658..c8193bd 100644
--- a/src/test/java/org/apache/aurora/scheduler/metadata/NearestFitTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/metadata/NearestFitTest.java
@@ -13,27 +13,28 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.metadata;
+package org.apache.aurora.scheduler.metadata;
import java.util.Set;
import com.google.common.collect.ImmutableSet;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.twitter.aurora.gen.AssignedTask;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.scheduler.events.PubsubEvent.TaskStateChange;
-import com.twitter.aurora.scheduler.events.PubsubEvent.TasksDeleted;
-import com.twitter.aurora.scheduler.events.PubsubEvent.Vetoed;
-import com.twitter.aurora.scheduler.filter.SchedulingFilter.Veto;
-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.testing.FakeTicker;
+import org.apache.aurora.gen.AssignedTask;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.scheduler.events.PubsubEvent.TaskStateChange;
+import org.apache.aurora.scheduler.events.PubsubEvent.TasksDeleted;
+import org.apache.aurora.scheduler.events.PubsubEvent.Vetoed;
+import org.apache.aurora.scheduler.filter.SchedulingFilter.Veto;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+
+import org.junit.Before;
+import org.junit.Test;
+
import static org.junit.Assert.assertEquals;
public class NearestFitTest {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/periodic/GcExecutorLauncherTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/periodic/GcExecutorLauncherTest.java b/src/test/java/org/apache/aurora/scheduler/periodic/GcExecutorLauncherTest.java
index 6124c7a..708da80 100644
--- a/src/test/java/org/apache/aurora/scheduler/periodic/GcExecutorLauncherTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/periodic/GcExecutorLauncherTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.periodic;
+package org.apache.aurora.scheduler.periodic;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
@@ -22,6 +22,26 @@ import com.google.common.base.Optional;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
+import com.twitter.common.quantity.Amount;
+import com.twitter.common.quantity.Time;
+import com.twitter.common.testing.easymock.EasyMockTest;
+import com.twitter.common.util.testing.FakeClock;
+
+import org.apache.aurora.codec.ThriftBinaryCodec;
+import org.apache.aurora.gen.AssignedTask;
+import org.apache.aurora.gen.ExecutorConfig;
+import org.apache.aurora.gen.Identity;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.gen.comm.AdjustRetainedTasks;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.base.Tasks;
+import org.apache.aurora.scheduler.configuration.Resources;
+import org.apache.aurora.scheduler.periodic.GcExecutorLauncher.GcExecutorSettings;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+import org.apache.aurora.scheduler.storage.testing.StorageTestUtil;
+
import org.apache.mesos.Protos.ExecutorInfo;
import org.apache.mesos.Protos.FrameworkID;
import org.apache.mesos.Protos.Offer;
@@ -29,27 +49,11 @@ import org.apache.mesos.Protos.OfferID;
import org.apache.mesos.Protos.Resource;
import org.apache.mesos.Protos.SlaveID;
import org.apache.mesos.Protos.TaskInfo;
+
import org.junit.Before;
import org.junit.Test;
-import com.twitter.aurora.codec.ThriftBinaryCodec;
-import com.twitter.aurora.gen.AssignedTask;
-import com.twitter.aurora.gen.ExecutorConfig;
-import com.twitter.aurora.gen.Identity;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.gen.comm.AdjustRetainedTasks;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.base.Tasks;
-import com.twitter.aurora.scheduler.configuration.Resources;
-import com.twitter.aurora.scheduler.periodic.GcExecutorLauncher.GcExecutorSettings;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.testing.StorageTestUtil;
-import com.twitter.common.quantity.Amount;
-import com.twitter.common.quantity.Time;
-import com.twitter.common.testing.easymock.EasyMockTest;
-import com.twitter.common.util.testing.FakeClock;
+import static org.apache.aurora.gen.ScheduleStatus.FAILED;
import static org.easymock.EasyMock.expect;
@@ -58,8 +62,6 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static com.twitter.aurora.gen.ScheduleStatus.FAILED;
-
public class GcExecutorLauncherTest extends EasyMockTest {
private static final String HOST = "slave-host";
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/quota/QuotaComparisonResultTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/quota/QuotaComparisonResultTest.java b/src/test/java/org/apache/aurora/scheduler/quota/QuotaComparisonResultTest.java
index f40764b..86d3541 100644
--- a/src/test/java/org/apache/aurora/scheduler/quota/QuotaComparisonResultTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/quota/QuotaComparisonResultTest.java
@@ -13,19 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.quota;
+package org.apache.aurora.scheduler.quota;
+
+import org.apache.aurora.gen.Quota;
+import org.apache.aurora.scheduler.storage.entities.IQuota;
import org.junit.Test;
-import com.twitter.aurora.gen.Quota;
-import com.twitter.aurora.scheduler.storage.entities.IQuota;
+import static org.apache.aurora.scheduler.quota.QuotaComparisonResult.Result.INSUFFICIENT_QUOTA;
+import static org.apache.aurora.scheduler.quota.QuotaComparisonResult.Result.SUFFICIENT_QUOTA;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static com.twitter.aurora.scheduler.quota.QuotaComparisonResult.Result.INSUFFICIENT_QUOTA;
-import static com.twitter.aurora.scheduler.quota.QuotaComparisonResult.Result.SUFFICIENT_QUOTA;
-
public class QuotaComparisonResultTest {
@Test
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/quota/QuotaFilterTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/quota/QuotaFilterTest.java b/src/test/java/org/apache/aurora/scheduler/quota/QuotaFilterTest.java
index f980bef..3f27e38 100644
--- a/src/test/java/org/apache/aurora/scheduler/quota/QuotaFilterTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/quota/QuotaFilterTest.java
@@ -13,35 +13,37 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.quota;
+package org.apache.aurora.scheduler.quota;
+
+import com.twitter.common.testing.easymock.EasyMockTest;
+
+import org.apache.aurora.gen.AssignedTask;
+import org.apache.aurora.gen.Identity;
+import org.apache.aurora.gen.JobConfiguration;
+import org.apache.aurora.gen.Quota;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.scheduler.base.JobKeys;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.quota.QuotaManager.QuotaManagerImpl;
+import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
+import org.apache.aurora.scheduler.storage.entities.IQuota;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
+import org.apache.aurora.scheduler.storage.testing.StorageTestUtil;
import org.junit.Before;
import org.junit.Test;
-import com.twitter.aurora.gen.AssignedTask;
-import com.twitter.aurora.gen.Identity;
-import com.twitter.aurora.gen.JobConfiguration;
-import com.twitter.aurora.gen.Quota;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.scheduler.base.JobKeys;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.quota.QuotaManager.QuotaManagerImpl;
-import com.twitter.aurora.scheduler.storage.entities.IJobConfiguration;
-import com.twitter.aurora.scheduler.storage.entities.IJobKey;
-import com.twitter.aurora.scheduler.storage.entities.IQuota;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
-import com.twitter.aurora.scheduler.storage.testing.StorageTestUtil;
-import com.twitter.common.testing.easymock.EasyMockTest;
+import static org.apache.aurora.scheduler.quota.QuotaComparisonResult.Result.INSUFFICIENT_QUOTA;
+import static org.apache.aurora.scheduler.quota.QuotaComparisonResult.Result.SUFFICIENT_QUOTA;
import static org.easymock.EasyMock.expect;
+
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import static com.twitter.aurora.scheduler.quota.QuotaComparisonResult.Result.INSUFFICIENT_QUOTA;
-import static com.twitter.aurora.scheduler.quota.QuotaComparisonResult.Result.SUFFICIENT_QUOTA;
-
public class QuotaFilterTest extends EasyMockTest {
private static final int DEFAULT_TASKS_IN_QUOTA = 10;
private static final String ROLE = "test";
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/quota/QuotaManagerImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/quota/QuotaManagerImplTest.java b/src/test/java/org/apache/aurora/scheduler/quota/QuotaManagerImplTest.java
index 0a72eaf..0812353 100644
--- a/src/test/java/org/apache/aurora/scheduler/quota/QuotaManagerImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/quota/QuotaManagerImplTest.java
@@ -13,34 +13,37 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.quota;
+package org.apache.aurora.scheduler.quota;
import com.google.common.base.Optional;
+import com.twitter.common.testing.easymock.EasyMockTest;
+
+import org.apache.aurora.gen.AssignedTask;
+import org.apache.aurora.gen.Identity;
+import org.apache.aurora.gen.Quota;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.quota.QuotaManager.QuotaManagerImpl;
+import org.apache.aurora.scheduler.storage.entities.IQuota;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+import org.apache.aurora.scheduler.storage.testing.StorageTestUtil;
+
import org.easymock.IExpectationSetters;
+
import org.junit.Before;
import org.junit.Test;
-import com.twitter.aurora.gen.AssignedTask;
-import com.twitter.aurora.gen.Identity;
-import com.twitter.aurora.gen.Quota;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.quota.QuotaManager.QuotaManagerImpl;
-import com.twitter.aurora.scheduler.storage.entities.IQuota;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.testing.StorageTestUtil;
-import com.twitter.common.testing.easymock.EasyMockTest;
+import static org.apache.aurora.scheduler.quota.QuotaComparisonResult.Result.INSUFFICIENT_QUOTA;
+import static org.apache.aurora.scheduler.quota.QuotaComparisonResult.Result.SUFFICIENT_QUOTA;
import static org.easymock.EasyMock.expect;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static com.twitter.aurora.scheduler.quota.QuotaComparisonResult.Result.INSUFFICIENT_QUOTA;
-import static com.twitter.aurora.scheduler.quota.QuotaComparisonResult.Result.SUFFICIENT_QUOTA;
-
public class QuotaManagerImplTest extends EasyMockTest {
private static final String ROLE = "foo";
private static final Query.Builder ACTIVE_QUERY = Query.roleScoped(ROLE).active();
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/state/BaseSchedulerCoreImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/state/BaseSchedulerCoreImplTest.java b/src/test/java/org/apache/aurora/scheduler/state/BaseSchedulerCoreImplTest.java
index 3e4a502..11f153b 100644
--- a/src/test/java/org/apache/aurora/scheduler/state/BaseSchedulerCoreImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/state/BaseSchedulerCoreImplTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.state;
+package org.apache.aurora.scheduler.state;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -39,78 +39,82 @@ import com.google.common.collect.Iterables;
import com.google.common.collect.Range;
import com.google.common.collect.Sets;
-import org.apache.mesos.Protos.SlaveID;
-import org.easymock.EasyMock;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.twitter.aurora.gen.AssignedTask;
-import com.twitter.aurora.gen.Constraint;
-import com.twitter.aurora.gen.CronCollisionPolicy;
-import com.twitter.aurora.gen.ExecutorConfig;
-import com.twitter.aurora.gen.Identity;
-import com.twitter.aurora.gen.JobConfiguration;
-import com.twitter.aurora.gen.JobKey;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.gen.TaskConstraint;
-import com.twitter.aurora.gen.TaskEvent;
-import com.twitter.aurora.gen.TaskQuery;
-import com.twitter.aurora.gen.ValueConstraint;
-import com.twitter.aurora.scheduler.Driver;
-import com.twitter.aurora.scheduler.TaskIdGenerator;
-import com.twitter.aurora.scheduler.base.JobKeys;
-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.configuration.ConfigurationManager;
-import com.twitter.aurora.scheduler.configuration.ConfigurationManager.TaskDescriptionException;
-import com.twitter.aurora.scheduler.configuration.SanitizedConfiguration;
-import com.twitter.aurora.scheduler.cron.CronScheduler;
-import com.twitter.aurora.scheduler.events.PubsubEvent;
-import com.twitter.aurora.scheduler.state.JobFilter.JobFilterResult;
-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.StorageBackfill;
-import com.twitter.aurora.scheduler.storage.entities.IAssignedTask;
-import com.twitter.aurora.scheduler.storage.entities.IIdentity;
-import com.twitter.aurora.scheduler.storage.entities.IJobConfiguration;
-import com.twitter.aurora.scheduler.storage.entities.IJobKey;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
-import com.twitter.aurora.scheduler.storage.entities.ITaskEvent;
import com.twitter.common.application.ShutdownRegistry;
import com.twitter.common.base.Closure;
import com.twitter.common.collections.Pair;
import com.twitter.common.testing.easymock.EasyMockTest;
import com.twitter.common.util.testing.FakeClock;
+import org.apache.aurora.gen.AssignedTask;
+import org.apache.aurora.gen.Constraint;
+import org.apache.aurora.gen.CronCollisionPolicy;
+import org.apache.aurora.gen.ExecutorConfig;
+import org.apache.aurora.gen.Identity;
+import org.apache.aurora.gen.JobConfiguration;
+import org.apache.aurora.gen.JobKey;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.gen.TaskConstraint;
+import org.apache.aurora.gen.TaskEvent;
+import org.apache.aurora.gen.TaskQuery;
+import org.apache.aurora.gen.ValueConstraint;
+import org.apache.aurora.scheduler.Driver;
+import org.apache.aurora.scheduler.TaskIdGenerator;
+import org.apache.aurora.scheduler.base.JobKeys;
+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.configuration.ConfigurationManager;
+import org.apache.aurora.scheduler.configuration.ConfigurationManager.TaskDescriptionException;
+import org.apache.aurora.scheduler.configuration.SanitizedConfiguration;
+import org.apache.aurora.scheduler.cron.CronScheduler;
+import org.apache.aurora.scheduler.events.PubsubEvent;
+import org.apache.aurora.scheduler.state.JobFilter.JobFilterResult;
+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.StorageBackfill;
+import org.apache.aurora.scheduler.storage.entities.IAssignedTask;
+import org.apache.aurora.scheduler.storage.entities.IIdentity;
+import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
+import org.apache.aurora.scheduler.storage.entities.ITaskEvent;
+
+import org.apache.mesos.Protos.SlaveID;
+
+import org.easymock.EasyMock;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.apache.aurora.gen.ScheduleStatus.ASSIGNED;
+import static org.apache.aurora.gen.ScheduleStatus.FAILED;
+import static org.apache.aurora.gen.ScheduleStatus.FINISHED;
+import static org.apache.aurora.gen.ScheduleStatus.KILLED;
+import static org.apache.aurora.gen.ScheduleStatus.KILLING;
+import static org.apache.aurora.gen.ScheduleStatus.LOST;
+import static org.apache.aurora.gen.ScheduleStatus.PENDING;
+import static org.apache.aurora.gen.ScheduleStatus.RESTARTING;
+import static org.apache.aurora.gen.ScheduleStatus.RUNNING;
+import static org.apache.aurora.gen.ScheduleStatus.STARTING;
+import static org.apache.aurora.scheduler.configuration.ConfigurationManager.DEDICATED_ATTRIBUTE;
+import static org.apache.aurora.scheduler.configuration.ConfigurationManager.hostLimitConstraint;
+import static org.apache.aurora.scheduler.configuration.ConfigurationManager.validateAndPopulate;
+
import static org.easymock.EasyMock.anyInt;
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.expectLastCall;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static com.twitter.aurora.gen.ScheduleStatus.ASSIGNED;
-import static com.twitter.aurora.gen.ScheduleStatus.FAILED;
-import static com.twitter.aurora.gen.ScheduleStatus.FINISHED;
-import static com.twitter.aurora.gen.ScheduleStatus.KILLED;
-import static com.twitter.aurora.gen.ScheduleStatus.KILLING;
-import static com.twitter.aurora.gen.ScheduleStatus.LOST;
-import static com.twitter.aurora.gen.ScheduleStatus.PENDING;
-import static com.twitter.aurora.gen.ScheduleStatus.RESTARTING;
-import static com.twitter.aurora.gen.ScheduleStatus.RUNNING;
-import static com.twitter.aurora.gen.ScheduleStatus.STARTING;
-import static com.twitter.aurora.scheduler.configuration.ConfigurationManager.DEDICATED_ATTRIBUTE;
-import static com.twitter.aurora.scheduler.configuration.ConfigurationManager.hostLimitConstraint;
-import static com.twitter.aurora.scheduler.configuration.ConfigurationManager.validateAndPopulate;
-
/**
* Base integration test for the SchedulerCoreImpl, subclasses should supply a concrete Storage
* system.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/state/CronJobManagerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/state/CronJobManagerTest.java b/src/test/java/org/apache/aurora/scheduler/state/CronJobManagerTest.java
index b88ccff..229948e 100644
--- a/src/test/java/org/apache/aurora/scheduler/state/CronJobManagerTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/state/CronJobManagerTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.state;
+package org.apache.aurora.scheduler.state;
import java.util.Map;
import java.util.concurrent.Executor;
@@ -25,45 +25,48 @@ import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.Injector;
+import com.twitter.common.application.ShutdownRegistry;
+import com.twitter.common.base.Closure;
+import com.twitter.common.base.ExceptionalCommand;
+import com.twitter.common.testing.easymock.EasyMockTest;
+
+import org.apache.aurora.gen.AssignedTask;
+import org.apache.aurora.gen.ExecutorConfig;
+import org.apache.aurora.gen.Identity;
+import org.apache.aurora.gen.JobConfiguration;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.scheduler.base.JobKeys;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.base.ScheduleException;
+import org.apache.aurora.scheduler.configuration.SanitizedConfiguration;
+import org.apache.aurora.scheduler.cron.CronScheduler;
+import org.apache.aurora.scheduler.events.PubsubEvent;
+import org.apache.aurora.scheduler.events.PubsubEvent.StorageStarted;
+import org.apache.aurora.scheduler.storage.Storage;
+import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
+import org.apache.aurora.scheduler.storage.testing.StorageTestUtil;
+
import org.easymock.Capture;
import org.easymock.EasyMock;
import org.easymock.IExpectationSetters;
+
import org.junit.Before;
import org.junit.Test;
-import com.twitter.aurora.gen.AssignedTask;
-import com.twitter.aurora.gen.ExecutorConfig;
-import com.twitter.aurora.gen.Identity;
-import com.twitter.aurora.gen.JobConfiguration;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.scheduler.base.JobKeys;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.base.ScheduleException;
-import com.twitter.aurora.scheduler.configuration.SanitizedConfiguration;
-import com.twitter.aurora.scheduler.cron.CronScheduler;
-import com.twitter.aurora.scheduler.events.PubsubEvent;
-import com.twitter.aurora.scheduler.events.PubsubEvent.StorageStarted;
-import com.twitter.aurora.scheduler.storage.Storage;
-import com.twitter.aurora.scheduler.storage.entities.IJobConfiguration;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
-import com.twitter.aurora.scheduler.storage.testing.StorageTestUtil;
-import com.twitter.common.application.ShutdownRegistry;
-import com.twitter.common.base.Closure;
-import com.twitter.common.base.ExceptionalCommand;
-import com.twitter.common.testing.easymock.EasyMockTest;
+import static org.apache.aurora.gen.CronCollisionPolicy.RUN_OVERLAP;
+import static org.apache.aurora.gen.apiConstants.DEFAULT_ENVIRONMENT;
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.capture;
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.expectLastCall;
-import static org.junit.Assert.fail;
-import static com.twitter.aurora.gen.CronCollisionPolicy.RUN_OVERLAP;
-import static com.twitter.aurora.gen.apiConstants.DEFAULT_ENVIRONMENT;
+import static org.junit.Assert.fail;
public class CronJobManagerTest extends EasyMockTest {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/state/LockManagerImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/state/LockManagerImplTest.java b/src/test/java/org/apache/aurora/scheduler/state/LockManagerImplTest.java
index ec0c8dd..c3e47c6 100644
--- a/src/test/java/org/apache/aurora/scheduler/state/LockManagerImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/state/LockManagerImplTest.java
@@ -13,36 +13,38 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.state;
+package org.apache.aurora.scheduler.state;
import java.util.UUID;
import com.google.common.base.Optional;
+import com.twitter.common.quantity.Amount;
+import com.twitter.common.quantity.Time;
+import com.twitter.common.testing.easymock.EasyMockTest;
+import com.twitter.common.util.testing.FakeClock;
+
+import org.apache.aurora.gen.Identity;
+import org.apache.aurora.gen.Lock;
+import org.apache.aurora.gen.LockKey;
+import org.apache.aurora.scheduler.base.JobKeys;
+import org.apache.aurora.scheduler.state.LockManager.LockException;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
+import org.apache.aurora.scheduler.storage.entities.ILock;
+import org.apache.aurora.scheduler.storage.entities.ILockKey;
+import org.apache.aurora.scheduler.storage.mem.MemStorage;
+
import org.easymock.EasyMock;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import com.twitter.aurora.gen.Identity;
-import com.twitter.aurora.gen.Lock;
-import com.twitter.aurora.gen.LockKey;
-import com.twitter.aurora.scheduler.base.JobKeys;
-import com.twitter.aurora.scheduler.state.LockManager.LockException;
-import com.twitter.aurora.scheduler.storage.entities.IJobKey;
-import com.twitter.aurora.scheduler.storage.entities.ILock;
-import com.twitter.aurora.scheduler.storage.entities.ILockKey;
-import com.twitter.aurora.scheduler.storage.mem.MemStorage;
-import com.twitter.common.quantity.Amount;
-import com.twitter.common.quantity.Time;
-import com.twitter.common.testing.easymock.EasyMockTest;
-import com.twitter.common.util.testing.FakeClock;
+import static org.apache.aurora.gen.apiConstants.DEFAULT_ENVIRONMENT;
import static org.junit.Assert.assertEquals;
-import static com.twitter.aurora.gen.apiConstants.DEFAULT_ENVIRONMENT;
-
public class LockManagerImplTest extends EasyMockTest {
private static final String USER = "jim-user";
private static final Identity JIM = new Identity("jim", USER);
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/state/MaintenanceControllerImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/state/MaintenanceControllerImplTest.java b/src/test/java/org/apache/aurora/scheduler/state/MaintenanceControllerImplTest.java
index 52cdda0..e162073 100644
--- a/src/test/java/org/apache/aurora/scheduler/state/MaintenanceControllerImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/state/MaintenanceControllerImplTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.state;
+package org.apache.aurora.scheduler.state;
import java.util.Set;
@@ -23,37 +23,39 @@ import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.Injector;
+import com.twitter.common.base.Closure;
+import com.twitter.common.testing.easymock.EasyMockTest;
+
+import org.apache.aurora.gen.AssignedTask;
+import org.apache.aurora.gen.HostAttributes;
+import org.apache.aurora.gen.HostStatus;
+import org.apache.aurora.gen.Identity;
+import org.apache.aurora.gen.MaintenanceMode;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.events.PubsubEvent;
+import org.apache.aurora.scheduler.events.PubsubEvent.StorageStarted;
+import org.apache.aurora.scheduler.events.PubsubEvent.TaskStateChange;
+import org.apache.aurora.scheduler.storage.Storage;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+import org.apache.aurora.scheduler.storage.testing.StorageTestUtil;
+
import org.junit.Before;
import org.junit.Test;
-import com.twitter.aurora.gen.AssignedTask;
-import com.twitter.aurora.gen.HostAttributes;
-import com.twitter.aurora.gen.HostStatus;
-import com.twitter.aurora.gen.Identity;
-import com.twitter.aurora.gen.MaintenanceMode;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.events.PubsubEvent;
-import com.twitter.aurora.scheduler.events.PubsubEvent.StorageStarted;
-import com.twitter.aurora.scheduler.events.PubsubEvent.TaskStateChange;
-import com.twitter.aurora.scheduler.storage.Storage;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.testing.StorageTestUtil;
-import com.twitter.common.base.Closure;
-import com.twitter.common.testing.easymock.EasyMockTest;
+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;
+import static org.apache.aurora.gen.ScheduleStatus.FINISHED;
+import static org.apache.aurora.gen.ScheduleStatus.RUNNING;
+import static org.apache.aurora.scheduler.state.MaintenanceController.MaintenanceControllerImpl;
import static org.easymock.EasyMock.expect;
-import static org.junit.Assert.assertEquals;
-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 static com.twitter.aurora.gen.ScheduleStatus.FINISHED;
-import static com.twitter.aurora.gen.ScheduleStatus.RUNNING;
-import static com.twitter.aurora.scheduler.state.MaintenanceController.MaintenanceControllerImpl;
+import static org.junit.Assert.assertEquals;
public class MaintenanceControllerImplTest extends EasyMockTest {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/state/PubsubTestUtil.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/state/PubsubTestUtil.java b/src/test/java/org/apache/aurora/scheduler/state/PubsubTestUtil.java
index 25a822d..648a66f 100644
--- a/src/test/java/org/apache/aurora/scheduler/state/PubsubTestUtil.java
+++ b/src/test/java/org/apache/aurora/scheduler/state/PubsubTestUtil.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.state;
+package org.apache.aurora.scheduler.state;
import java.util.Set;
@@ -22,12 +22,13 @@ import com.google.inject.Injector;
import com.google.inject.Key;
import com.google.inject.TypeLiteral;
-import com.twitter.aurora.scheduler.events.PubsubEvent;
-import com.twitter.aurora.scheduler.events.PubsubEventModule;
import com.twitter.common.application.StartupStage;
import com.twitter.common.base.Closure;
import com.twitter.common.base.ExceptionalCommand;
+import org.apache.aurora.scheduler.events.PubsubEvent;
+import org.apache.aurora.scheduler.events.PubsubEventModule;
+
/**
* A convenience utility for unit tests that which to verify pubsub wiring.
* TODO(wfarner): Clean this up - make it integrate more cleanly with callers and LifecycleModule.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/state/StateManagerImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/state/StateManagerImplTest.java b/src/test/java/org/apache/aurora/scheduler/state/StateManagerImplTest.java
index 7de377c..5ad2658 100644
--- a/src/test/java/org/apache/aurora/scheduler/state/StateManagerImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/state/StateManagerImplTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.state;
+package org.apache.aurora.scheduler.state;
import java.util.List;
import java.util.NoSuchElementException;
@@ -26,48 +26,52 @@ import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterators;
import com.google.common.collect.PeekingIterator;
+import com.twitter.common.base.Closure;
+import com.twitter.common.testing.easymock.EasyMockTest;
+import com.twitter.common.util.testing.FakeClock;
+
+import org.apache.aurora.gen.AssignedTask;
+import org.apache.aurora.gen.Identity;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.gen.TaskEvent;
+import org.apache.aurora.scheduler.Driver;
+import org.apache.aurora.scheduler.TaskIdGenerator;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.base.Tasks;
+import org.apache.aurora.scheduler.events.PubsubEvent;
+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.IScheduledTask;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
+import org.apache.aurora.scheduler.storage.mem.MemStorage;
+
import org.apache.mesos.Protos.SlaveID;
+
import org.easymock.EasyMock;
import org.easymock.IAnswer;
import org.easymock.IArgumentMatcher;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.twitter.aurora.gen.AssignedTask;
-import com.twitter.aurora.gen.Identity;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.gen.TaskEvent;
-import com.twitter.aurora.scheduler.Driver;
-import com.twitter.aurora.scheduler.TaskIdGenerator;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.base.Tasks;
-import com.twitter.aurora.scheduler.events.PubsubEvent;
-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.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
-import com.twitter.aurora.scheduler.storage.mem.MemStorage;
-import com.twitter.common.base.Closure;
-import com.twitter.common.testing.easymock.EasyMockTest;
-import com.twitter.common.util.testing.FakeClock;
+import static org.apache.aurora.gen.ScheduleStatus.ASSIGNED;
+import static org.apache.aurora.gen.ScheduleStatus.INIT;
+import static org.apache.aurora.gen.ScheduleStatus.KILLING;
+import static org.apache.aurora.gen.ScheduleStatus.PENDING;
+import static org.apache.aurora.gen.ScheduleStatus.RUNNING;
+import static org.apache.aurora.gen.ScheduleStatus.UNKNOWN;
+import static org.apache.aurora.gen.apiConstants.DEFAULT_ENVIRONMENT;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.expectLastCall;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static com.twitter.aurora.gen.ScheduleStatus.ASSIGNED;
-import static com.twitter.aurora.gen.ScheduleStatus.INIT;
-import static com.twitter.aurora.gen.ScheduleStatus.KILLING;
-import static com.twitter.aurora.gen.ScheduleStatus.PENDING;
-import static com.twitter.aurora.gen.ScheduleStatus.RUNNING;
-import static com.twitter.aurora.gen.ScheduleStatus.UNKNOWN;
-import static com.twitter.aurora.gen.apiConstants.DEFAULT_ENVIRONMENT;
-
public class StateManagerImplTest extends EasyMockTest {
private static final String HOST_A = "host_a";
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/state/TaskStateMachineTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/state/TaskStateMachineTest.java b/src/test/java/org/apache/aurora/scheduler/state/TaskStateMachineTest.java
index 4188772..2ec6dd1 100644
--- a/src/test/java/org/apache/aurora/scheduler/state/TaskStateMachineTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/state/TaskStateMachineTest.java
@@ -13,54 +13,58 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.state;
+package org.apache.aurora.scheduler.state;
import java.util.Set;
import com.google.common.base.Function;
+import com.twitter.common.testing.easymock.EasyMockTest;
+import com.twitter.common.util.testing.FakeClock;
+
+import org.apache.aurora.gen.AssignedTask;
+import org.apache.aurora.gen.Identity;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.gen.TaskEvent;
+import org.apache.aurora.scheduler.base.Tasks;
+import org.apache.aurora.scheduler.state.TaskStateMachine.WorkSink;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+
import org.easymock.EasyMock;
import org.easymock.IExpectationSetters;
+
import org.junit.Before;
import org.junit.Test;
-import com.twitter.aurora.gen.AssignedTask;
-import com.twitter.aurora.gen.Identity;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.gen.TaskEvent;
-import com.twitter.aurora.scheduler.base.Tasks;
-import com.twitter.aurora.scheduler.state.TaskStateMachine.WorkSink;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.common.testing.easymock.EasyMockTest;
-import com.twitter.common.util.testing.FakeClock;
+import static org.apache.aurora.gen.ScheduleStatus.ASSIGNED;
+import static org.apache.aurora.gen.ScheduleStatus.FAILED;
+import static org.apache.aurora.gen.ScheduleStatus.FINISHED;
+import static org.apache.aurora.gen.ScheduleStatus.INIT;
+import static org.apache.aurora.gen.ScheduleStatus.KILLED;
+import static org.apache.aurora.gen.ScheduleStatus.KILLING;
+import static org.apache.aurora.gen.ScheduleStatus.LOST;
+import static org.apache.aurora.gen.ScheduleStatus.PENDING;
+import static org.apache.aurora.gen.ScheduleStatus.RESTARTING;
+import static org.apache.aurora.gen.ScheduleStatus.RUNNING;
+import static org.apache.aurora.gen.ScheduleStatus.STARTING;
+import static org.apache.aurora.gen.ScheduleStatus.UNKNOWN;
+import static org.apache.aurora.scheduler.state.WorkCommand.DELETE;
+import static org.apache.aurora.scheduler.state.WorkCommand.INCREMENT_FAILURES;
+import static org.apache.aurora.scheduler.state.WorkCommand.KILL;
+import static org.apache.aurora.scheduler.state.WorkCommand.RESCHEDULE;
+import static org.apache.aurora.scheduler.state.WorkCommand.UPDATE_STATE;
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expectLastCall;
+
import static org.hamcrest.CoreMatchers.is;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
-import static com.twitter.aurora.gen.ScheduleStatus.ASSIGNED;
-import static com.twitter.aurora.gen.ScheduleStatus.FAILED;
-import static com.twitter.aurora.gen.ScheduleStatus.FINISHED;
-import static com.twitter.aurora.gen.ScheduleStatus.INIT;
-import static com.twitter.aurora.gen.ScheduleStatus.KILLED;
-import static com.twitter.aurora.gen.ScheduleStatus.KILLING;
-import static com.twitter.aurora.gen.ScheduleStatus.LOST;
-import static com.twitter.aurora.gen.ScheduleStatus.PENDING;
-import static com.twitter.aurora.gen.ScheduleStatus.RESTARTING;
-import static com.twitter.aurora.gen.ScheduleStatus.RUNNING;
-import static com.twitter.aurora.gen.ScheduleStatus.STARTING;
-import static com.twitter.aurora.gen.ScheduleStatus.UNKNOWN;
-import static com.twitter.aurora.scheduler.state.WorkCommand.DELETE;
-import static com.twitter.aurora.scheduler.state.WorkCommand.INCREMENT_FAILURES;
-import static com.twitter.aurora.scheduler.state.WorkCommand.KILL;
-import static com.twitter.aurora.scheduler.state.WorkCommand.RESCHEDULE;
-import static com.twitter.aurora.scheduler.state.WorkCommand.UPDATE_STATE;
-
public class TaskStateMachineTest extends EasyMockTest {
private WorkSink workSink;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/stats/SlotSizeCounterTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/stats/SlotSizeCounterTest.java b/src/test/java/org/apache/aurora/scheduler/stats/SlotSizeCounterTest.java
index d78acd4..6d3f15f 100644
--- a/src/test/java/org/apache/aurora/scheduler/stats/SlotSizeCounterTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/stats/SlotSizeCounterTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.stats;
+package org.apache.aurora.scheduler.stats;
import java.util.Map;
import java.util.concurrent.atomic.AtomicLong;
@@ -21,17 +21,19 @@ import java.util.concurrent.atomic.AtomicLong;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.twitter.aurora.gen.Quota;
-import com.twitter.aurora.scheduler.quota.Quotas;
-import com.twitter.aurora.scheduler.stats.SlotSizeCounter.ResourceSlotProvider;
-import com.twitter.aurora.scheduler.storage.entities.IQuota;
import com.twitter.common.stats.StatsProvider;
import com.twitter.common.testing.easymock.EasyMockTest;
+import org.apache.aurora.gen.Quota;
+import org.apache.aurora.scheduler.quota.Quotas;
+import org.apache.aurora.scheduler.stats.SlotSizeCounter.ResourceSlotProvider;
+import org.apache.aurora.scheduler.storage.entities.IQuota;
+
+import org.junit.Before;
+import org.junit.Test;
+
import static org.easymock.EasyMock.expect;
+
import static org.junit.Assert.assertEquals;
public class SlotSizeCounterTest extends EasyMockTest {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/storage/ReadWriteLockManagerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/storage/ReadWriteLockManagerTest.java b/src/test/java/org/apache/aurora/scheduler/storage/ReadWriteLockManagerTest.java
index f595ea2..615bb4b 100644
--- a/src/test/java/org/apache/aurora/scheduler/storage/ReadWriteLockManagerTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/storage/ReadWriteLockManagerTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage;
+package org.apache.aurora.scheduler.storage;
import java.util.concurrent.Callable;
import java.util.concurrent.CountDownLatch;
@@ -25,13 +25,13 @@ import com.google.common.testing.TearDown;
import com.google.common.testing.junit4.TearDownTestCase;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import org.junit.Before;
-import org.junit.Test;
-
import com.twitter.common.quantity.Amount;
import com.twitter.common.quantity.Time;
import com.twitter.common.util.concurrent.ExecutorServiceShutdown;
+import org.junit.Before;
+import org.junit.Test;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/storage/StorageBackfillTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/storage/StorageBackfillTest.java b/src/test/java/org/apache/aurora/scheduler/storage/StorageBackfillTest.java
index 56f96b5..9c6dfde 100644
--- a/src/test/java/org/apache/aurora/scheduler/storage/StorageBackfillTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/storage/StorageBackfillTest.java
@@ -1,27 +1,28 @@
-package com.twitter.aurora.scheduler.storage;
+package org.apache.aurora.scheduler.storage;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
+import com.twitter.common.util.testing.FakeClock;
+
+import org.apache.aurora.gen.AssignedTask;
+import org.apache.aurora.gen.Constraint;
+import org.apache.aurora.gen.Identity;
+import org.apache.aurora.gen.LimitConstraint;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.gen.TaskConstraint;
+import org.apache.aurora.scheduler.base.Query;
+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.aurora.scheduler.storage.mem.MemStorage;
+
import org.junit.Before;
import org.junit.Test;
-import com.twitter.aurora.gen.AssignedTask;
-import com.twitter.aurora.gen.Constraint;
-import com.twitter.aurora.gen.Identity;
-import com.twitter.aurora.gen.LimitConstraint;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.gen.TaskConstraint;
-import com.twitter.aurora.scheduler.base.Query;
-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.aurora.scheduler.storage.mem.MemStorage;
-import com.twitter.common.util.testing.FakeClock;
-
import static org.junit.Assert.assertEquals;
public class StorageBackfillTest {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/storage/backup/RecoveryTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/storage/backup/RecoveryTest.java b/src/test/java/org/apache/aurora/scheduler/storage/backup/RecoveryTest.java
index ded3a3f..8dafe14 100644
--- a/src/test/java/org/apache/aurora/scheduler/storage/backup/RecoveryTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/storage/backup/RecoveryTest.java
@@ -13,40 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage.backup;
+package org.apache.aurora.scheduler.storage.backup;
import java.io.File;
import com.google.common.collect.ImmutableSet;
import com.google.common.testing.TearDown;
-import org.easymock.Capture;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.twitter.aurora.gen.AssignedTask;
-import com.twitter.aurora.gen.HostAttributes;
-import com.twitter.aurora.gen.Identity;
-import com.twitter.aurora.gen.Lock;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.gen.storage.QuotaConfiguration;
-import com.twitter.aurora.gen.storage.SchedulerMetadata;
-import com.twitter.aurora.gen.storage.Snapshot;
-import com.twitter.aurora.gen.storage.StoredJob;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.base.Tasks;
-import com.twitter.aurora.scheduler.storage.DistributedSnapshotStore;
-import com.twitter.aurora.scheduler.storage.SnapshotStore;
-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.backup.Recovery.RecoveryException;
-import com.twitter.aurora.scheduler.storage.backup.Recovery.RecoveryImpl;
-import com.twitter.aurora.scheduler.storage.backup.StorageBackup.StorageBackupImpl;
-import com.twitter.aurora.scheduler.storage.backup.StorageBackup.StorageBackupImpl.BackupConfig;
-import com.twitter.aurora.scheduler.storage.backup.TemporaryStorage.TemporaryStorageFactory;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
import com.twitter.common.base.Command;
import com.twitter.common.io.FileUtils;
import com.twitter.common.quantity.Amount;
@@ -54,11 +27,41 @@ import com.twitter.common.quantity.Time;
import com.twitter.common.testing.easymock.EasyMockTest;
import com.twitter.common.util.testing.FakeClock;
+import org.apache.aurora.gen.AssignedTask;
+import org.apache.aurora.gen.HostAttributes;
+import org.apache.aurora.gen.Identity;
+import org.apache.aurora.gen.Lock;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.gen.storage.QuotaConfiguration;
+import org.apache.aurora.gen.storage.SchedulerMetadata;
+import org.apache.aurora.gen.storage.Snapshot;
+import org.apache.aurora.gen.storage.StoredJob;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.base.Tasks;
+import org.apache.aurora.scheduler.storage.DistributedSnapshotStore;
+import org.apache.aurora.scheduler.storage.SnapshotStore;
+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.backup.Recovery.RecoveryException;
+import org.apache.aurora.scheduler.storage.backup.Recovery.RecoveryImpl;
+import org.apache.aurora.scheduler.storage.backup.StorageBackup.StorageBackupImpl;
+import org.apache.aurora.scheduler.storage.backup.StorageBackup.StorageBackupImpl.BackupConfig;
+import org.apache.aurora.scheduler.storage.backup.TemporaryStorage.TemporaryStorageFactory;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+
+import org.easymock.Capture;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.apache.aurora.gen.apiConstants.CURRENT_API_VERSION;
+
import static org.easymock.EasyMock.capture;
import static org.easymock.EasyMock.expect;
-import static org.junit.Assert.assertEquals;
-import static com.twitter.aurora.gen.apiConstants.CURRENT_API_VERSION;
+import static org.junit.Assert.assertEquals;
public class RecoveryTest extends EasyMockTest {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/storage/backup/StorageBackupTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/storage/backup/StorageBackupTest.java b/src/test/java/org/apache/aurora/scheduler/storage/backup/StorageBackupTest.java
index 46403e5..58c1dc8 100644
--- a/src/test/java/org/apache/aurora/scheduler/storage/backup/StorageBackupTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/storage/backup/StorageBackupTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage.backup;
+package org.apache.aurora.scheduler.storage.backup;
import java.io.File;
import java.util.List;
@@ -24,30 +24,32 @@ import com.google.common.collect.ImmutableSet;
import com.google.common.io.Files;
import com.google.common.testing.TearDown;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.twitter.aurora.codec.ThriftBinaryCodec;
-import com.twitter.aurora.gen.Attribute;
-import com.twitter.aurora.gen.HostAttributes;
-import com.twitter.aurora.gen.JobConfiguration;
-import com.twitter.aurora.gen.JobKey;
-import com.twitter.aurora.gen.Quota;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.storage.QuotaConfiguration;
-import com.twitter.aurora.gen.storage.SchedulerMetadata;
-import com.twitter.aurora.gen.storage.Snapshot;
-import com.twitter.aurora.gen.storage.StoredJob;
-import com.twitter.aurora.scheduler.storage.SnapshotStore;
-import com.twitter.aurora.scheduler.storage.backup.StorageBackup.StorageBackupImpl;
-import com.twitter.aurora.scheduler.storage.backup.StorageBackup.StorageBackupImpl.BackupConfig;
import com.twitter.common.io.FileUtils;
import com.twitter.common.quantity.Amount;
import com.twitter.common.quantity.Time;
import com.twitter.common.testing.easymock.EasyMockTest;
import com.twitter.common.util.testing.FakeClock;
+import org.apache.aurora.codec.ThriftBinaryCodec;
+import org.apache.aurora.gen.Attribute;
+import org.apache.aurora.gen.HostAttributes;
+import org.apache.aurora.gen.JobConfiguration;
+import org.apache.aurora.gen.JobKey;
+import org.apache.aurora.gen.Quota;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.storage.QuotaConfiguration;
+import org.apache.aurora.gen.storage.SchedulerMetadata;
+import org.apache.aurora.gen.storage.Snapshot;
+import org.apache.aurora.gen.storage.StoredJob;
+import org.apache.aurora.scheduler.storage.SnapshotStore;
+import org.apache.aurora.scheduler.storage.backup.StorageBackup.StorageBackupImpl;
+import org.apache.aurora.scheduler.storage.backup.StorageBackup.StorageBackupImpl.BackupConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+
import static org.easymock.EasyMock.expect;
+
import static org.junit.Assert.assertEquals;
public class StorageBackupTest extends EasyMockTest {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/storage/log/LogManagerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/storage/log/LogManagerTest.java b/src/test/java/org/apache/aurora/scheduler/storage/log/LogManagerTest.java
index d14fb4b..76758f3 100644
--- a/src/test/java/org/apache/aurora/scheduler/storage/log/LogManagerTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/storage/log/LogManagerTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage.log;
+package org.apache.aurora.scheduler.storage.log;
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -31,38 +31,6 @@ import com.google.common.collect.Iterables;
import com.google.common.collect.Iterators;
import com.google.common.collect.Lists;
-import org.easymock.Capture;
-import org.easymock.EasyMock;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.twitter.aurora.codec.ThriftBinaryCodec;
-import com.twitter.aurora.codec.ThriftBinaryCodec.CodingException;
-import com.twitter.aurora.gen.AssignedTask;
-import com.twitter.aurora.gen.Attribute;
-import com.twitter.aurora.gen.HostAttributes;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.gen.storage.Frame;
-import com.twitter.aurora.gen.storage.FrameChunk;
-import com.twitter.aurora.gen.storage.FrameHeader;
-import com.twitter.aurora.gen.storage.LogEntry;
-import com.twitter.aurora.gen.storage.Op;
-import com.twitter.aurora.gen.storage.RemoveJob;
-import com.twitter.aurora.gen.storage.RemoveTasks;
-import com.twitter.aurora.gen.storage.SaveFrameworkId;
-import com.twitter.aurora.gen.storage.SaveTasks;
-import com.twitter.aurora.gen.storage.Snapshot;
-import com.twitter.aurora.gen.storage.Transaction;
-import com.twitter.aurora.gen.storage.storageConstants;
-import com.twitter.aurora.scheduler.base.JobKeys;
-import com.twitter.aurora.scheduler.log.Log;
-import com.twitter.aurora.scheduler.log.Log.Entry;
-import com.twitter.aurora.scheduler.log.Log.Position;
-import com.twitter.aurora.scheduler.log.Log.Stream;
-import com.twitter.aurora.scheduler.storage.log.LogManager.StreamManager;
-import com.twitter.aurora.scheduler.storage.log.LogManager.StreamManager.StreamTransaction;
import com.twitter.common.application.ShutdownRegistry;
import com.twitter.common.base.Closure;
import com.twitter.common.base.ExceptionalCommand;
@@ -70,9 +38,44 @@ import com.twitter.common.quantity.Amount;
import com.twitter.common.quantity.Data;
import com.twitter.common.testing.easymock.EasyMockTest;
+import org.apache.aurora.codec.ThriftBinaryCodec;
+import org.apache.aurora.codec.ThriftBinaryCodec.CodingException;
+import org.apache.aurora.gen.AssignedTask;
+import org.apache.aurora.gen.Attribute;
+import org.apache.aurora.gen.HostAttributes;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.gen.storage.Frame;
+import org.apache.aurora.gen.storage.FrameChunk;
+import org.apache.aurora.gen.storage.FrameHeader;
+import org.apache.aurora.gen.storage.LogEntry;
+import org.apache.aurora.gen.storage.Op;
+import org.apache.aurora.gen.storage.RemoveJob;
+import org.apache.aurora.gen.storage.RemoveTasks;
+import org.apache.aurora.gen.storage.SaveFrameworkId;
+import org.apache.aurora.gen.storage.SaveTasks;
+import org.apache.aurora.gen.storage.Snapshot;
+import org.apache.aurora.gen.storage.Transaction;
+import org.apache.aurora.gen.storage.storageConstants;
+import org.apache.aurora.scheduler.base.JobKeys;
+import org.apache.aurora.scheduler.log.Log;
+import org.apache.aurora.scheduler.log.Log.Entry;
+import org.apache.aurora.scheduler.log.Log.Position;
+import org.apache.aurora.scheduler.log.Log.Stream;
+import org.apache.aurora.scheduler.storage.log.LogManager.StreamManager;
+import org.apache.aurora.scheduler.storage.log.LogManager.StreamManager.StreamTransaction;
+
+import org.easymock.Capture;
+import org.easymock.EasyMock;
+
+import org.junit.Before;
+import org.junit.Test;
+
import static org.easymock.EasyMock.aryEq;
import static org.easymock.EasyMock.capture;
import static org.easymock.EasyMock.expect;
+
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotSame;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/storage/log/LogStorageTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/storage/log/LogStorageTest.java b/src/test/java/org/apache/aurora/scheduler/storage/log/LogStorageTest.java
index e2d1836..23a774e 100644
--- a/src/test/java/org/apache/aurora/scheduler/storage/log/LogStorageTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/storage/log/LogStorageTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage.log;
+package org.apache.aurora.scheduler.storage.log;
import java.io.IOException;
import java.util.Set;
@@ -27,62 +27,6 @@ import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterators;
import com.google.common.testing.TearDown;
-import org.easymock.Capture;
-import org.easymock.EasyMock;
-import org.easymock.IAnswer;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.twitter.aurora.codec.ThriftBinaryCodec;
-import com.twitter.aurora.codec.ThriftBinaryCodec.CodingException;
-import com.twitter.aurora.gen.AssignedTask;
-import com.twitter.aurora.gen.Attribute;
-import com.twitter.aurora.gen.HostAttributes;
-import com.twitter.aurora.gen.JobConfiguration;
-import com.twitter.aurora.gen.JobKey;
-import com.twitter.aurora.gen.Lock;
-import com.twitter.aurora.gen.LockKey;
-import com.twitter.aurora.gen.Quota;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.gen.storage.LogEntry;
-import com.twitter.aurora.gen.storage.Op;
-import com.twitter.aurora.gen.storage.RemoveJob;
-import com.twitter.aurora.gen.storage.RemoveLock;
-import com.twitter.aurora.gen.storage.RemoveQuota;
-import com.twitter.aurora.gen.storage.RemoveTasks;
-import com.twitter.aurora.gen.storage.RewriteTask;
-import com.twitter.aurora.gen.storage.SaveAcceptedJob;
-import com.twitter.aurora.gen.storage.SaveFrameworkId;
-import com.twitter.aurora.gen.storage.SaveHostAttributes;
-import com.twitter.aurora.gen.storage.SaveLock;
-import com.twitter.aurora.gen.storage.SaveQuota;
-import com.twitter.aurora.gen.storage.SaveTasks;
-import com.twitter.aurora.gen.storage.Snapshot;
-import com.twitter.aurora.gen.storage.Transaction;
-import com.twitter.aurora.gen.storage.storageConstants;
-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.log.Log;
-import com.twitter.aurora.scheduler.log.Log.Entry;
-import com.twitter.aurora.scheduler.log.Log.Position;
-import com.twitter.aurora.scheduler.log.Log.Stream;
-import com.twitter.aurora.scheduler.storage.SnapshotStore;
-import com.twitter.aurora.scheduler.storage.Storage.MutableStoreProvider;
-import com.twitter.aurora.scheduler.storage.Storage.MutateWork;
-import com.twitter.aurora.scheduler.storage.entities.IJobConfiguration;
-import com.twitter.aurora.scheduler.storage.entities.IJobKey;
-import com.twitter.aurora.scheduler.storage.entities.ILock;
-import com.twitter.aurora.scheduler.storage.entities.ILockKey;
-import com.twitter.aurora.scheduler.storage.entities.IQuota;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
-import com.twitter.aurora.scheduler.storage.log.LogStorage.SchedulingService;
-import com.twitter.aurora.scheduler.storage.log.testing.LogOpMatcher;
-import com.twitter.aurora.scheduler.storage.log.testing.LogOpMatcher.StreamMatcher;
-import com.twitter.aurora.scheduler.storage.testing.StorageTestUtil;
import com.twitter.common.application.ShutdownRegistry;
import com.twitter.common.base.Command;
import com.twitter.common.base.ExceptionalCommand;
@@ -91,11 +35,70 @@ import com.twitter.common.quantity.Data;
import com.twitter.common.quantity.Time;
import com.twitter.common.testing.easymock.EasyMockTest;
+import org.apache.aurora.codec.ThriftBinaryCodec;
+import org.apache.aurora.codec.ThriftBinaryCodec.CodingException;
+import org.apache.aurora.gen.AssignedTask;
+import org.apache.aurora.gen.Attribute;
+import org.apache.aurora.gen.HostAttributes;
+import org.apache.aurora.gen.JobConfiguration;
+import org.apache.aurora.gen.JobKey;
+import org.apache.aurora.gen.Lock;
+import org.apache.aurora.gen.LockKey;
+import org.apache.aurora.gen.Quota;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.gen.storage.LogEntry;
+import org.apache.aurora.gen.storage.Op;
+import org.apache.aurora.gen.storage.RemoveJob;
+import org.apache.aurora.gen.storage.RemoveLock;
+import org.apache.aurora.gen.storage.RemoveQuota;
+import org.apache.aurora.gen.storage.RemoveTasks;
+import org.apache.aurora.gen.storage.RewriteTask;
+import org.apache.aurora.gen.storage.SaveAcceptedJob;
+import org.apache.aurora.gen.storage.SaveFrameworkId;
+import org.apache.aurora.gen.storage.SaveHostAttributes;
+import org.apache.aurora.gen.storage.SaveLock;
+import org.apache.aurora.gen.storage.SaveQuota;
+import org.apache.aurora.gen.storage.SaveTasks;
+import org.apache.aurora.gen.storage.Snapshot;
+import org.apache.aurora.gen.storage.Transaction;
+import org.apache.aurora.gen.storage.storageConstants;
+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.log.Log;
+import org.apache.aurora.scheduler.log.Log.Entry;
+import org.apache.aurora.scheduler.log.Log.Position;
+import org.apache.aurora.scheduler.log.Log.Stream;
+import org.apache.aurora.scheduler.storage.SnapshotStore;
+import org.apache.aurora.scheduler.storage.Storage.MutableStoreProvider;
+import org.apache.aurora.scheduler.storage.Storage.MutateWork;
+import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
+import org.apache.aurora.scheduler.storage.entities.ILock;
+import org.apache.aurora.scheduler.storage.entities.ILockKey;
+import org.apache.aurora.scheduler.storage.entities.IQuota;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
+import org.apache.aurora.scheduler.storage.log.LogStorage.SchedulingService;
+import org.apache.aurora.scheduler.storage.log.testing.LogOpMatcher;
+import org.apache.aurora.scheduler.storage.log.testing.LogOpMatcher.StreamMatcher;
+import org.apache.aurora.scheduler.storage.testing.StorageTestUtil;
+
+import org.easymock.Capture;
+import org.easymock.EasyMock;
+import org.easymock.IAnswer;
+
+import org.junit.Before;
+import org.junit.Test;
+
import static org.easymock.EasyMock.capture;
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.expectLastCall;
import static org.easymock.EasyMock.notNull;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImplTest.java b/src/test/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImplTest.java
index 5062795..f8ea3bf 100644
--- a/src/test/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImplTest.java
@@ -13,43 +13,45 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage.log;
+package org.apache.aurora.scheduler.storage.log;
import java.util.Set;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
+import com.twitter.common.testing.easymock.EasyMockTest;
+import com.twitter.common.util.testing.FakeClock;
+
+import org.apache.aurora.gen.Attribute;
+import org.apache.aurora.gen.HostAttributes;
+import org.apache.aurora.gen.JobConfiguration;
+import org.apache.aurora.gen.JobKey;
+import org.apache.aurora.gen.Lock;
+import org.apache.aurora.gen.LockKey;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.storage.QuotaConfiguration;
+import org.apache.aurora.gen.storage.SchedulerMetadata;
+import org.apache.aurora.gen.storage.Snapshot;
+import org.apache.aurora.gen.storage.StoredJob;
+import org.apache.aurora.scheduler.base.JobKeys;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.quota.Quotas;
+import org.apache.aurora.scheduler.storage.SnapshotStore;
+import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
+import org.apache.aurora.scheduler.storage.entities.ILock;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+import org.apache.aurora.scheduler.storage.testing.StorageTestUtil;
+
import org.junit.Before;
import org.junit.Test;
-import com.twitter.aurora.gen.Attribute;
-import com.twitter.aurora.gen.HostAttributes;
-import com.twitter.aurora.gen.JobConfiguration;
-import com.twitter.aurora.gen.JobKey;
-import com.twitter.aurora.gen.Lock;
-import com.twitter.aurora.gen.LockKey;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.storage.QuotaConfiguration;
-import com.twitter.aurora.gen.storage.SchedulerMetadata;
-import com.twitter.aurora.gen.storage.Snapshot;
-import com.twitter.aurora.gen.storage.StoredJob;
-import com.twitter.aurora.scheduler.base.JobKeys;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.quota.Quotas;
-import com.twitter.aurora.scheduler.storage.SnapshotStore;
-import com.twitter.aurora.scheduler.storage.entities.IJobConfiguration;
-import com.twitter.aurora.scheduler.storage.entities.ILock;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.testing.StorageTestUtil;
-import com.twitter.common.testing.easymock.EasyMockTest;
-import com.twitter.common.util.testing.FakeClock;
+import static org.apache.aurora.gen.apiConstants.CURRENT_API_VERSION;
import static org.easymock.EasyMock.expect;
-import static org.junit.Assert.assertEquals;
-import static com.twitter.aurora.gen.apiConstants.CURRENT_API_VERSION;
+import static org.junit.Assert.assertEquals;
public class SnapshotStoreImplTest extends EasyMockTest {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/storage/mem/InternerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/storage/mem/InternerTest.java b/src/test/java/org/apache/aurora/scheduler/storage/mem/InternerTest.java
index ad6a989..b445d44 100644
--- a/src/test/java/org/apache/aurora/scheduler/storage/mem/InternerTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/storage/mem/InternerTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage.mem;
+package org.apache.aurora.scheduler.storage.mem;
import com.google.common.collect.ImmutableSet;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/storage/mem/MemJobStoreTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/storage/mem/MemJobStoreTest.java b/src/test/java/org/apache/aurora/scheduler/storage/mem/MemJobStoreTest.java
index d384b14..b3ec816 100644
--- a/src/test/java/org/apache/aurora/scheduler/storage/mem/MemJobStoreTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/storage/mem/MemJobStoreTest.java
@@ -13,19 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage.mem;
+package org.apache.aurora.scheduler.storage.mem;
import com.google.common.collect.ImmutableSet;
+import org.apache.aurora.gen.JobConfiguration;
+import org.apache.aurora.scheduler.base.JobKeys;
+import org.apache.aurora.scheduler.storage.JobStore;
+import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
+
import org.junit.Before;
import org.junit.Test;
-import com.twitter.aurora.gen.JobConfiguration;
-import com.twitter.aurora.scheduler.base.JobKeys;
-import com.twitter.aurora.scheduler.storage.JobStore;
-import com.twitter.aurora.scheduler.storage.entities.IJobConfiguration;
-import com.twitter.aurora.scheduler.storage.entities.IJobKey;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
[2/9] Refactors java and python code to the Apache namespace.
Posted by wf...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/storage/mem/MemLockStoreTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/storage/mem/MemLockStoreTest.java b/src/test/java/org/apache/aurora/scheduler/storage/mem/MemLockStoreTest.java
index 9187578..88b7378 100644
--- a/src/test/java/org/apache/aurora/scheduler/storage/mem/MemLockStoreTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/storage/mem/MemLockStoreTest.java
@@ -13,21 +13,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage.mem;
+package org.apache.aurora.scheduler.storage.mem;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableSet;
+import org.apache.aurora.gen.Lock;
+import org.apache.aurora.gen.LockKey;
+import org.apache.aurora.scheduler.base.JobKeys;
+import org.apache.aurora.scheduler.storage.LockStore;
+import org.apache.aurora.scheduler.storage.entities.ILock;
+import org.apache.aurora.scheduler.storage.entities.ILockKey;
+
import org.junit.Before;
import org.junit.Test;
-import com.twitter.aurora.gen.Lock;
-import com.twitter.aurora.gen.LockKey;
-import com.twitter.aurora.scheduler.base.JobKeys;
-import com.twitter.aurora.scheduler.storage.LockStore;
-import com.twitter.aurora.scheduler.storage.entities.ILock;
-import com.twitter.aurora.scheduler.storage.entities.ILockKey;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/storage/mem/MemStorageSchedulerCoreImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/storage/mem/MemStorageSchedulerCoreImplTest.java b/src/test/java/org/apache/aurora/scheduler/storage/mem/MemStorageSchedulerCoreImplTest.java
index f4ffdc4..cbed31f 100644
--- a/src/test/java/org/apache/aurora/scheduler/storage/mem/MemStorageSchedulerCoreImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/storage/mem/MemStorageSchedulerCoreImplTest.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage.mem;
+package org.apache.aurora.scheduler.storage.mem;
-import com.twitter.aurora.scheduler.state.BaseSchedulerCoreImplTest;
-import com.twitter.aurora.scheduler.storage.Storage;
+import org.apache.aurora.scheduler.state.BaseSchedulerCoreImplTest;
+import org.apache.aurora.scheduler.storage.Storage;
public class MemStorageSchedulerCoreImplTest extends BaseSchedulerCoreImplTest {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/storage/mem/MemStorageTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/storage/mem/MemStorageTest.java b/src/test/java/org/apache/aurora/scheduler/storage/mem/MemStorageTest.java
index 8f932c5..81e90f3 100644
--- a/src/test/java/org/apache/aurora/scheduler/storage/mem/MemStorageTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/storage/mem/MemStorageTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage.mem;
+package org.apache.aurora.scheduler.storage.mem;
import java.util.Set;
import java.util.concurrent.Callable;
@@ -28,26 +28,26 @@ import com.google.common.collect.Iterables;
import com.google.common.testing.TearDown;
import com.google.common.testing.junit4.TearDownTestCase;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.twitter.aurora.gen.AssignedTask;
-import com.twitter.aurora.gen.Identity;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.TaskConfig;
-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.Storage.MutableStoreProvider;
-import com.twitter.aurora.scheduler.storage.Storage.MutateWork;
-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.quantity.Amount;
import com.twitter.common.quantity.Time;
import com.twitter.common.util.concurrent.ExecutorServiceShutdown;
+import org.apache.aurora.gen.AssignedTask;
+import org.apache.aurora.gen.Identity;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.TaskConfig;
+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.Storage.MutableStoreProvider;
+import org.apache.aurora.scheduler.storage.Storage.MutateWork;
+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 org.junit.Before;
+import org.junit.Test;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/storage/mem/MemTaskStoreTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/storage/mem/MemTaskStoreTest.java b/src/test/java/org/apache/aurora/scheduler/storage/mem/MemTaskStoreTest.java
index 18b4379..0aba36a 100644
--- a/src/test/java/org/apache/aurora/scheduler/storage/mem/MemTaskStoreTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/storage/mem/MemTaskStoreTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.storage.mem;
+package org.apache.aurora.scheduler.storage.mem;
import java.util.Map;
import java.util.Set;
@@ -24,29 +24,29 @@ import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.collect.Maps;
+import org.apache.aurora.gen.AssignedTask;
+import org.apache.aurora.gen.ExecutorConfig;
+import org.apache.aurora.gen.Identity;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.gen.TaskQuery;
+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.storage.TaskStore.Mutable.TaskMutation;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
+
import org.junit.Before;
import org.junit.Test;
-import com.twitter.aurora.gen.AssignedTask;
-import com.twitter.aurora.gen.ExecutorConfig;
-import com.twitter.aurora.gen.Identity;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.gen.TaskQuery;
-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.storage.TaskStore.Mutable.TaskMutation;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
+import static org.apache.aurora.gen.ScheduleStatus.RUNNING;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import static com.twitter.aurora.gen.ScheduleStatus.RUNNING;
-
public class MemTaskStoreTest {
private static final IScheduledTask TASK_A = makeTask("a");
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterfaceTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterfaceTest.java b/src/test/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterfaceTest.java
index 7e641b7..17319b3 100644
--- a/src/test/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterfaceTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterfaceTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.thrift;
+package org.apache.aurora.scheduler.thrift;
import java.util.Set;
@@ -27,94 +27,97 @@ import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Module;
+import com.twitter.common.testing.easymock.EasyMockTest;
+import com.twitter.common.util.Clock;
+import com.twitter.common.util.testing.FakeClock;
+
+import org.apache.aurora.auth.CapabilityValidator;
+import org.apache.aurora.auth.CapabilityValidator.AuditCheck;
+import org.apache.aurora.auth.CapabilityValidator.Capability;
+import org.apache.aurora.auth.SessionValidator.AuthFailedException;
+import org.apache.aurora.gen.AddInstancesConfig;
+import org.apache.aurora.gen.AssignedTask;
+import org.apache.aurora.gen.AuroraAdmin;
+import org.apache.aurora.gen.ConfigRewrite;
+import org.apache.aurora.gen.Constraint;
+import org.apache.aurora.gen.ExecutorConfig;
+import org.apache.aurora.gen.HostStatus;
+import org.apache.aurora.gen.Hosts;
+import org.apache.aurora.gen.Identity;
+import org.apache.aurora.gen.InstanceConfigRewrite;
+import org.apache.aurora.gen.InstanceKey;
+import org.apache.aurora.gen.JobConfigRewrite;
+import org.apache.aurora.gen.JobConfigValidation;
+import org.apache.aurora.gen.JobConfiguration;
+import org.apache.aurora.gen.JobKey;
+import org.apache.aurora.gen.JobSummary;
+import org.apache.aurora.gen.JobSummaryResult;
+import org.apache.aurora.gen.LimitConstraint;
+import org.apache.aurora.gen.Lock;
+import org.apache.aurora.gen.LockKey;
+import org.apache.aurora.gen.Quota;
+import org.apache.aurora.gen.Response;
+import org.apache.aurora.gen.ResponseCode;
+import org.apache.aurora.gen.RewriteConfigsRequest;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.SessionKey;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.gen.TaskConstraint;
+import org.apache.aurora.gen.TaskQuery;
+import org.apache.aurora.gen.ValueConstraint;
+import org.apache.aurora.scheduler.base.JobKeys;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.base.ScheduleException;
+import org.apache.aurora.scheduler.configuration.ConfigurationManager;
+import org.apache.aurora.scheduler.configuration.SanitizedConfiguration;
+import org.apache.aurora.scheduler.state.CronJobManager;
+import org.apache.aurora.scheduler.state.LockManager;
+import org.apache.aurora.scheduler.state.LockManager.LockException;
+import org.apache.aurora.scheduler.state.MaintenanceController;
+import org.apache.aurora.scheduler.state.SchedulerCore;
+import org.apache.aurora.scheduler.storage.Storage;
+import org.apache.aurora.scheduler.storage.backup.Recovery;
+import org.apache.aurora.scheduler.storage.backup.StorageBackup;
+import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
+import org.apache.aurora.scheduler.storage.entities.ILock;
+import org.apache.aurora.scheduler.storage.entities.ILockKey;
+import org.apache.aurora.scheduler.storage.entities.IQuota;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
+import org.apache.aurora.scheduler.storage.testing.StorageTestUtil;
+import org.apache.aurora.scheduler.thrift.aop.AopModule;
+
import org.easymock.IExpectationSetters;
+
import org.junit.Before;
import org.junit.Test;
-import com.twitter.aurora.auth.CapabilityValidator;
-import com.twitter.aurora.auth.CapabilityValidator.AuditCheck;
-import com.twitter.aurora.auth.CapabilityValidator.Capability;
-import com.twitter.aurora.auth.SessionValidator.AuthFailedException;
-import com.twitter.aurora.gen.AddInstancesConfig;
-import com.twitter.aurora.gen.AssignedTask;
-import com.twitter.aurora.gen.AuroraAdmin;
-import com.twitter.aurora.gen.ConfigRewrite;
-import com.twitter.aurora.gen.Constraint;
-import com.twitter.aurora.gen.ExecutorConfig;
-import com.twitter.aurora.gen.HostStatus;
-import com.twitter.aurora.gen.Hosts;
-import com.twitter.aurora.gen.Identity;
-import com.twitter.aurora.gen.InstanceConfigRewrite;
-import com.twitter.aurora.gen.InstanceKey;
-import com.twitter.aurora.gen.JobConfigRewrite;
-import com.twitter.aurora.gen.JobConfigValidation;
-import com.twitter.aurora.gen.JobConfiguration;
-import com.twitter.aurora.gen.JobKey;
-import com.twitter.aurora.gen.JobSummary;
-import com.twitter.aurora.gen.JobSummaryResult;
-import com.twitter.aurora.gen.LimitConstraint;
-import com.twitter.aurora.gen.Lock;
-import com.twitter.aurora.gen.LockKey;
-import com.twitter.aurora.gen.Quota;
-import com.twitter.aurora.gen.Response;
-import com.twitter.aurora.gen.ResponseCode;
-import com.twitter.aurora.gen.RewriteConfigsRequest;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.SessionKey;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.gen.TaskConstraint;
-import com.twitter.aurora.gen.TaskQuery;
-import com.twitter.aurora.gen.ValueConstraint;
-import com.twitter.aurora.scheduler.base.JobKeys;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.base.ScheduleException;
-import com.twitter.aurora.scheduler.configuration.ConfigurationManager;
-import com.twitter.aurora.scheduler.configuration.SanitizedConfiguration;
-import com.twitter.aurora.scheduler.state.CronJobManager;
-import com.twitter.aurora.scheduler.state.LockManager;
-import com.twitter.aurora.scheduler.state.LockManager.LockException;
-import com.twitter.aurora.scheduler.state.MaintenanceController;
-import com.twitter.aurora.scheduler.state.SchedulerCore;
-import com.twitter.aurora.scheduler.storage.Storage;
-import com.twitter.aurora.scheduler.storage.backup.Recovery;
-import com.twitter.aurora.scheduler.storage.backup.StorageBackup;
-import com.twitter.aurora.scheduler.storage.entities.IJobConfiguration;
-import com.twitter.aurora.scheduler.storage.entities.IJobKey;
-import com.twitter.aurora.scheduler.storage.entities.ILock;
-import com.twitter.aurora.scheduler.storage.entities.ILockKey;
-import com.twitter.aurora.scheduler.storage.entities.IQuota;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
-import com.twitter.aurora.scheduler.storage.testing.StorageTestUtil;
-import com.twitter.aurora.scheduler.thrift.aop.AopModule;
-import com.twitter.common.testing.easymock.EasyMockTest;
-import com.twitter.common.util.Clock;
-import com.twitter.common.util.testing.FakeClock;
+import static org.apache.aurora.auth.CapabilityValidator.Capability.ROOT;
+import static org.apache.aurora.auth.SessionValidator.SessionContext;
+import static org.apache.aurora.gen.LockValidation.CHECKED;
+import static org.apache.aurora.gen.MaintenanceMode.DRAINING;
+import static org.apache.aurora.gen.MaintenanceMode.NONE;
+import static org.apache.aurora.gen.MaintenanceMode.SCHEDULED;
+import static org.apache.aurora.gen.ResponseCode.AUTH_FAILED;
+import static org.apache.aurora.gen.ResponseCode.ERROR;
+import static org.apache.aurora.gen.ResponseCode.INVALID_REQUEST;
+import static org.apache.aurora.gen.ResponseCode.LOCK_ERROR;
+import static org.apache.aurora.gen.ResponseCode.OK;
+import static org.apache.aurora.gen.ResponseCode.WARNING;
+import static org.apache.aurora.gen.apiConstants.DEFAULT_ENVIRONMENT;
+import static org.apache.aurora.scheduler.configuration.ConfigurationManager.DEDICATED_ATTRIBUTE;
+import static org.apache.aurora.scheduler.thrift.SchedulerThriftInterface.transitionMessage;
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.expectLastCall;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static com.twitter.aurora.auth.CapabilityValidator.Capability.ROOT;
-import static com.twitter.aurora.auth.SessionValidator.SessionContext;
-import static com.twitter.aurora.gen.LockValidation.CHECKED;
-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 static com.twitter.aurora.gen.ResponseCode.AUTH_FAILED;
-import static com.twitter.aurora.gen.ResponseCode.ERROR;
-import static com.twitter.aurora.gen.ResponseCode.INVALID_REQUEST;
-import static com.twitter.aurora.gen.ResponseCode.LOCK_ERROR;
-import static com.twitter.aurora.gen.ResponseCode.OK;
-import static com.twitter.aurora.gen.ResponseCode.WARNING;
-import static com.twitter.aurora.gen.apiConstants.DEFAULT_ENVIRONMENT;
-import static com.twitter.aurora.scheduler.configuration.ConfigurationManager.DEDICATED_ATTRIBUTE;
-import static com.twitter.aurora.scheduler.thrift.SchedulerThriftInterface.transitionMessage;
-
public class SchedulerThriftInterfaceTest extends EasyMockTest {
private static final String ROLE = "bar_role";
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/thrift/ThriftIT.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/thrift/ThriftIT.java b/src/test/java/org/apache/aurora/scheduler/thrift/ThriftIT.java
index 7737124..53bc519 100644
--- a/src/test/java/org/apache/aurora/scheduler/thrift/ThriftIT.java
+++ b/src/test/java/org/apache/aurora/scheduler/thrift/ThriftIT.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.thrift;
+package org.apache.aurora.scheduler.thrift;
import java.util.Arrays;
import java.util.Map;
@@ -25,35 +25,37 @@ import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.Injector;
+import com.twitter.common.application.ShutdownRegistry;
+import com.twitter.common.testing.easymock.EasyMockTest;
+
+import org.apache.aurora.auth.CapabilityValidator;
+import org.apache.aurora.auth.CapabilityValidator.Capability;
+import org.apache.aurora.auth.SessionValidator;
+import org.apache.aurora.gen.AuroraAdmin;
+import org.apache.aurora.gen.Quota;
+import org.apache.aurora.gen.SessionKey;
+import org.apache.aurora.scheduler.cron.CronScheduler;
+import org.apache.aurora.scheduler.state.LockManager;
+import org.apache.aurora.scheduler.state.MaintenanceController;
+import org.apache.aurora.scheduler.state.SchedulerCore;
+import org.apache.aurora.scheduler.state.StateManager;
+import org.apache.aurora.scheduler.storage.Storage;
+import org.apache.aurora.scheduler.storage.backup.Recovery;
+import org.apache.aurora.scheduler.storage.backup.StorageBackup;
+import org.apache.aurora.scheduler.storage.entities.IQuota;
+import org.apache.aurora.scheduler.storage.testing.StorageTestUtil;
+import org.apache.aurora.scheduler.thrift.auth.ThriftAuthModule;
+
import org.junit.Before;
import org.junit.Test;
-import com.twitter.aurora.auth.CapabilityValidator;
-import com.twitter.aurora.auth.CapabilityValidator.Capability;
-import com.twitter.aurora.auth.SessionValidator;
-import com.twitter.aurora.gen.AuroraAdmin;
-import com.twitter.aurora.gen.Quota;
-import com.twitter.aurora.gen.SessionKey;
-import com.twitter.aurora.scheduler.cron.CronScheduler;
-import com.twitter.aurora.scheduler.state.LockManager;
-import com.twitter.aurora.scheduler.state.MaintenanceController;
-import com.twitter.aurora.scheduler.state.SchedulerCore;
-import com.twitter.aurora.scheduler.state.StateManager;
-import com.twitter.aurora.scheduler.storage.Storage;
-import com.twitter.aurora.scheduler.storage.backup.Recovery;
-import com.twitter.aurora.scheduler.storage.backup.StorageBackup;
-import com.twitter.aurora.scheduler.storage.entities.IQuota;
-import com.twitter.aurora.scheduler.storage.testing.StorageTestUtil;
-import com.twitter.aurora.scheduler.thrift.auth.ThriftAuthModule;
-import com.twitter.common.application.ShutdownRegistry;
-import com.twitter.common.testing.easymock.EasyMockTest;
+import static org.apache.aurora.auth.SessionValidator.SessionContext;
+import static org.apache.aurora.gen.ResponseCode.AUTH_FAILED;
+import static org.apache.aurora.gen.ResponseCode.OK;
import static org.easymock.EasyMock.expectLastCall;
-import static org.junit.Assert.assertEquals;
-import static com.twitter.aurora.auth.SessionValidator.SessionContext;
-import static com.twitter.aurora.gen.ResponseCode.AUTH_FAILED;
-import static com.twitter.aurora.gen.ResponseCode.OK;
+import static org.junit.Assert.assertEquals;
public class ThriftIT extends EasyMockTest {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/thrift/aop/APIVersionInterceptorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/thrift/aop/APIVersionInterceptorTest.java b/src/test/java/org/apache/aurora/scheduler/thrift/aop/APIVersionInterceptorTest.java
index c1907ac..e32d828 100644
--- a/src/test/java/org/apache/aurora/scheduler/thrift/aop/APIVersionInterceptorTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/thrift/aop/APIVersionInterceptorTest.java
@@ -1,4 +1,4 @@
-package com.twitter.aurora.scheduler.thrift.aop;
+package org.apache.aurora.scheduler.thrift.aop;
import com.google.common.collect.ImmutableSet;
import com.google.inject.AbstractModule;
@@ -6,24 +6,26 @@ import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.matcher.Matchers;
+import com.twitter.common.testing.easymock.EasyMockTest;
+
+import org.apache.aurora.gen.APIVersion;
+import org.apache.aurora.gen.AuroraAdmin;
+import org.apache.aurora.gen.GetJobsResult;
+import org.apache.aurora.gen.JobConfiguration;
+import org.apache.aurora.gen.Response;
+import org.apache.aurora.gen.Result;
+import org.apache.aurora.scheduler.thrift.auth.DecoratedThrift;
+
import org.junit.Before;
import org.junit.Test;
-import com.twitter.aurora.gen.APIVersion;
-import com.twitter.aurora.gen.AuroraAdmin;
-import com.twitter.aurora.gen.GetJobsResult;
-import com.twitter.aurora.gen.JobConfiguration;
-import com.twitter.aurora.gen.Response;
-import com.twitter.aurora.gen.Result;
-import com.twitter.aurora.scheduler.thrift.auth.DecoratedThrift;
-import com.twitter.common.testing.easymock.EasyMockTest;
+import static org.apache.aurora.gen.ResponseCode.OK;
import static org.easymock.EasyMock.expect;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static com.twitter.aurora.gen.ResponseCode.OK;
-
public class APIVersionInterceptorTest extends EasyMockTest {
private static final String ROLE = "bob";
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/thrift/aop/AopModuleTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/thrift/aop/AopModuleTest.java b/src/test/java/org/apache/aurora/scheduler/thrift/aop/AopModuleTest.java
index 2a97aba..a0f2bdb 100644
--- a/src/test/java/org/apache/aurora/scheduler/thrift/aop/AopModuleTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/thrift/aop/AopModuleTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.thrift.aop;
+package org.apache.aurora.scheduler.thrift.aop;
import java.util.Map;
@@ -23,18 +23,20 @@ import com.google.inject.CreationException;
import com.google.inject.Guice;
import com.google.inject.Injector;
+import com.twitter.common.testing.easymock.EasyMockTest;
+
+import org.apache.aurora.auth.CapabilityValidator;
+import org.apache.aurora.gen.AuroraAdmin.Iface;
+import org.apache.aurora.gen.JobConfiguration;
+import org.apache.aurora.gen.Response;
+import org.apache.aurora.gen.ResponseCode;
+import org.apache.aurora.gen.SessionKey;
+
import org.junit.Before;
import org.junit.Test;
-import com.twitter.aurora.auth.CapabilityValidator;
-import com.twitter.aurora.gen.AuroraAdmin.Iface;
-import com.twitter.aurora.gen.JobConfiguration;
-import com.twitter.aurora.gen.Response;
-import com.twitter.aurora.gen.ResponseCode;
-import com.twitter.aurora.gen.SessionKey;
-import com.twitter.common.testing.easymock.EasyMockTest;
-
import static org.easymock.EasyMock.expect;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/thrift/aop/FeatureToggleInterceptorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/thrift/aop/FeatureToggleInterceptorTest.java b/src/test/java/org/apache/aurora/scheduler/thrift/aop/FeatureToggleInterceptorTest.java
index 81b2cf3..bd29ecc 100644
--- a/src/test/java/org/apache/aurora/scheduler/thrift/aop/FeatureToggleInterceptorTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/thrift/aop/FeatureToggleInterceptorTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.thrift.aop;
+package org.apache.aurora.scheduler.thrift.aop;
import java.lang.reflect.Method;
@@ -24,18 +24,21 @@ import com.google.inject.Injector;
import com.google.inject.TypeLiteral;
import com.google.inject.matcher.Matchers;
+import com.twitter.common.testing.easymock.EasyMockTest;
+
+import org.apache.aurora.gen.AuroraAdmin;
+import org.apache.aurora.gen.Response;
+import org.apache.aurora.gen.ResponseCode;
+import org.apache.aurora.gen.TaskQuery;
+import org.apache.aurora.scheduler.thrift.auth.DecoratedThrift;
+
import org.easymock.EasyMock;
+
import org.junit.Before;
import org.junit.Test;
-import com.twitter.aurora.gen.AuroraAdmin;
-import com.twitter.aurora.gen.Response;
-import com.twitter.aurora.gen.ResponseCode;
-import com.twitter.aurora.gen.TaskQuery;
-import com.twitter.aurora.scheduler.thrift.auth.DecoratedThrift;
-import com.twitter.common.testing.easymock.EasyMockTest;
-
import static org.easymock.EasyMock.expect;
+
import static org.junit.Assert.assertSame;
public class FeatureToggleInterceptorTest extends EasyMockTest {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/thrift/aop/ForwardingThrift.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/thrift/aop/ForwardingThrift.java b/src/test/java/org/apache/aurora/scheduler/thrift/aop/ForwardingThrift.java
index 37c0da2..0894131 100644
--- a/src/test/java/org/apache/aurora/scheduler/thrift/aop/ForwardingThrift.java
+++ b/src/test/java/org/apache/aurora/scheduler/thrift/aop/ForwardingThrift.java
@@ -13,27 +13,27 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.thrift.aop;
+package org.apache.aurora.scheduler.thrift.aop;
import java.util.Set;
-import org.apache.thrift.TException;
+import org.apache.aurora.gen.AddInstancesConfig;
+import org.apache.aurora.gen.AuroraAdmin;
+import org.apache.aurora.gen.Hosts;
+import org.apache.aurora.gen.JobConfigValidation;
+import org.apache.aurora.gen.JobConfiguration;
+import org.apache.aurora.gen.JobKey;
+import org.apache.aurora.gen.Lock;
+import org.apache.aurora.gen.LockKey;
+import org.apache.aurora.gen.LockValidation;
+import org.apache.aurora.gen.Quota;
+import org.apache.aurora.gen.Response;
+import org.apache.aurora.gen.RewriteConfigsRequest;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.SessionKey;
+import org.apache.aurora.gen.TaskQuery;
-import com.twitter.aurora.gen.AddInstancesConfig;
-import com.twitter.aurora.gen.AuroraAdmin;
-import com.twitter.aurora.gen.Hosts;
-import com.twitter.aurora.gen.JobConfigValidation;
-import com.twitter.aurora.gen.JobConfiguration;
-import com.twitter.aurora.gen.JobKey;
-import com.twitter.aurora.gen.Lock;
-import com.twitter.aurora.gen.LockKey;
-import com.twitter.aurora.gen.LockValidation;
-import com.twitter.aurora.gen.Quota;
-import com.twitter.aurora.gen.Response;
-import com.twitter.aurora.gen.RewriteConfigsRequest;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.SessionKey;
-import com.twitter.aurora.gen.TaskQuery;
+import org.apache.thrift.TException;
import static com.google.common.base.Preconditions.checkNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/thrift/aop/MockDecoratedThrift.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/thrift/aop/MockDecoratedThrift.java b/src/test/java/org/apache/aurora/scheduler/thrift/aop/MockDecoratedThrift.java
index 289dff5..e8ec77e 100644
--- a/src/test/java/org/apache/aurora/scheduler/thrift/aop/MockDecoratedThrift.java
+++ b/src/test/java/org/apache/aurora/scheduler/thrift/aop/MockDecoratedThrift.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.thrift.aop;
+package org.apache.aurora.scheduler.thrift.aop;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -25,8 +25,8 @@ import javax.inject.Inject;
import com.google.inject.Binder;
import com.google.inject.BindingAnnotation;
-import com.twitter.aurora.gen.AuroraAdmin;
-import com.twitter.aurora.scheduler.thrift.auth.DecoratedThrift;
+import org.apache.aurora.gen.AuroraAdmin;
+import org.apache.aurora.scheduler.thrift.auth.DecoratedThrift;
/**
* An injected forwarding thrift implementation that delegates to a bound mock interface.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/thrift/aop/ThriftStatsExporterInterceptorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/thrift/aop/ThriftStatsExporterInterceptorTest.java b/src/test/java/org/apache/aurora/scheduler/thrift/aop/ThriftStatsExporterInterceptorTest.java
index 8a5cb17..f6cd7e0 100644
--- a/src/test/java/org/apache/aurora/scheduler/thrift/aop/ThriftStatsExporterInterceptorTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/thrift/aop/ThriftStatsExporterInterceptorTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.twitter.aurora.scheduler.thrift.aop;
+package org.apache.aurora.scheduler.thrift.aop;
import com.google.common.collect.ImmutableSet;
import com.google.inject.AbstractModule;
@@ -21,24 +21,26 @@ import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.matcher.Matchers;
+import com.twitter.common.stats.Stats;
+import com.twitter.common.testing.easymock.EasyMockTest;
+
+import org.apache.aurora.gen.AuroraAdmin;
+import org.apache.aurora.gen.GetJobsResult;
+import org.apache.aurora.gen.JobConfiguration;
+import org.apache.aurora.gen.Response;
+import org.apache.aurora.gen.Result;
+import org.apache.aurora.scheduler.thrift.auth.DecoratedThrift;
+
import org.junit.Before;
import org.junit.Test;
-import com.twitter.aurora.gen.AuroraAdmin;
-import com.twitter.aurora.gen.GetJobsResult;
-import com.twitter.aurora.gen.JobConfiguration;
-import com.twitter.aurora.gen.Response;
-import com.twitter.aurora.gen.Result;
-import com.twitter.aurora.scheduler.thrift.auth.DecoratedThrift;
-import com.twitter.common.stats.Stats;
-import com.twitter.common.testing.easymock.EasyMockTest;
+import static org.apache.aurora.gen.ResponseCode.OK;
import static org.easymock.EasyMock.expect;
+
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
-import static com.twitter.aurora.gen.ResponseCode.OK;
-
public class ThriftStatsExporterInterceptorTest extends EasyMockTest {
private static final String ROLE = "bob";
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/BUILD b/src/test/python/BUILD
index 487398f..3801b31 100644
--- a/src/test/python/BUILD
+++ b/src/test/python/BUILD
@@ -1,7 +1,7 @@
python_test_suite(
name = 'all',
dependencies = [
- pants('src/test/python/twitter/aurora:all'),
- pants('src/test/python/twitter/thermos:all'),
+ pants('src/test/python/apache/aurora:all'),
+ pants('src/test/python/apache/thermos:all'),
]
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/BUILD b/src/test/python/apache/aurora/BUILD
index 09dc572..ab88f66 100644
--- a/src/test/python/apache/aurora/BUILD
+++ b/src/test/python/apache/aurora/BUILD
@@ -1,10 +1,10 @@
python_test_suite(
name = 'all',
dependencies = [
- pants('src/test/python/twitter/aurora/admin:all'),
- pants('src/test/python/twitter/aurora/client:all'),
- pants('src/test/python/twitter/aurora/common:all'),
- pants('src/test/python/twitter/aurora/config:all'),
- pants('src/test/python/twitter/aurora/executor:all'),
+ pants('src/test/python/apache/aurora/admin:all'),
+ pants('src/test/python/apache/aurora/client:all'),
+ pants('src/test/python/apache/aurora/common:all'),
+ pants('src/test/python/apache/aurora/config:all'),
+ pants('src/test/python/apache/aurora/executor:all'),
]
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/admin/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/admin/BUILD b/src/test/python/apache/aurora/admin/BUILD
index 232ec68..c5468d2 100644
--- a/src/test/python/apache/aurora/admin/BUILD
+++ b/src/test/python/apache/aurora/admin/BUILD
@@ -7,9 +7,9 @@ python_test_suite(name = 'all',
python_tests(name = 'mesos_maintenance',
sources = ['test_mesos_maintenance.py'],
dependencies = [
- pants('src/main/python/twitter/aurora/common:cluster'),
- pants('src/main/python/twitter/aurora/admin:mesos_maintenance'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
- pants('src/main/python/twitter/aurora/BUILD.thirdparty:mock'),
+ pants('src/main/python/apache/aurora/common:cluster'),
+ pants('src/main/python/apache/aurora/admin:mesos_maintenance'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
+ pants('src/main/python/apache/aurora/BUILD.thirdparty:mock'),
],
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/admin/test_mesos_maintenance.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/admin/test_mesos_maintenance.py b/src/test/python/apache/aurora/admin/test_mesos_maintenance.py
index fc4b6c1..4d85b4c 100644
--- a/src/test/python/apache/aurora/admin/test_mesos_maintenance.py
+++ b/src/test/python/apache/aurora/admin/test_mesos_maintenance.py
@@ -1,9 +1,9 @@
import unittest
-from twitter.aurora.admin.mesos_maintenance import MesosMaintenance
-from twitter.aurora.common.cluster import Cluster
+from apache.aurora.admin.mesos_maintenance import MesosMaintenance
+from apache.aurora.common.cluster import Cluster
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
Hosts,
Response,
ResponseCode,
@@ -21,7 +21,7 @@ MOCK_TEST_HOSTS = ['us-west-001.example.com']
class TestMesosMaintenance(unittest.TestCase):
- @mock.patch("twitter.aurora.client.api.AuroraClientAPI.start_maintenance")
+ @mock.patch("apache.aurora.client.api.AuroraClientAPI.start_maintenance")
def test_start_maintenance(self, mock_api):
mock_api.return_value = Response(responseCode=ResponseCode.OK)
maintenance = MesosMaintenance(DEFAULT_CLUSTER, 'quiet')
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/BUILD b/src/test/python/apache/aurora/client/BUILD
index 108a0fc..27ebaf5 100644
--- a/src/test/python/apache/aurora/client/BUILD
+++ b/src/test/python/apache/aurora/client/BUILD
@@ -2,9 +2,9 @@ python_test_suite(name = 'all',
dependencies = [
pants(':binding_helper'),
pants(':config'),
- pants('src/test/python/twitter/aurora/client/api:all'),
- pants('src/test/python/twitter/aurora/client/commands:all'),
- pants('src/test/python/twitter/aurora/client/hooks:all'),
+ pants('src/test/python/apache/aurora/client/api:all'),
+ pants('src/test/python/apache/aurora/client/commands:all'),
+ pants('src/test/python/apache/aurora/client/hooks:all'),
],
)
@@ -12,18 +12,18 @@ python_tests(
name = 'binding_helper',
sources = ['test_binding_helper.py'],
dependencies = [
- pants('src/main/python/twitter/aurora/BUILD.thirdparty:pystachio'),
+ pants('src/main/python/apache/aurora/BUILD.thirdparty:pystachio'),
pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
- pants('src/main/python/twitter/aurora/client:binding_helper'),
- pants('src/main/python/twitter/aurora/config'),
+ pants('src/main/python/apache/aurora/client:binding_helper'),
+ pants('src/main/python/apache/aurora/config'),
],
)
python_tests(name = 'config',
sources = ['test_config.py'],
dependencies = [
- pants('src/main/python/twitter/aurora/BUILD.thirdparty:mox'),
- pants('src/main/python/twitter/aurora/client:config'),
+ pants('src/main/python/apache/aurora/BUILD.thirdparty:mox'),
+ pants('src/main/python/apache/aurora/client:config'),
],
)
@@ -31,6 +31,6 @@ python_library(
name = 'fake_scheduler_proxy',
sources = ['fake_scheduler_proxy.py'],
dependencies = [
- pants('src/main/python/twitter/aurora/client/api:scheduler_client'),
+ pants('src/main/python/apache/aurora/client/api:scheduler_client'),
]
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/api/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/api/BUILD b/src/test/python/apache/aurora/client/api/BUILD
index 2850ece..c532675 100644
--- a/src/test/python/apache/aurora/client/api/BUILD
+++ b/src/test/python/apache/aurora/client/api/BUILD
@@ -13,58 +13,58 @@ python_tests(
name = 'disambiguator',
sources = ['test_disambiguator.py'],
dependencies = [
- pants('src/main/python/twitter/aurora/BUILD.thirdparty:mox'),
+ pants('src/main/python/apache/aurora/BUILD.thirdparty:mox'),
pants('aurora/twitterdeps/src/python/twitter/common/app'),
- pants('src/main/python/twitter/aurora/client/api:disambiguator'),
+ pants('src/main/python/apache/aurora/client/api:disambiguator'),
],
)
python_tests(name = 'job_monitor',
sources = ['test_job_monitor.py'],
dependencies = [
- pants('src/main/python/twitter/aurora/BUILD.thirdparty:mox'),
- pants('src/main/python/twitter/aurora/client/api:api'),
- pants('src/main/python/twitter/aurora/client/api:job_monitor'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
- pants('src/test/python/twitter/aurora/client:fake_scheduler_proxy'),
+ pants('src/main/python/apache/aurora/BUILD.thirdparty:mox'),
+ pants('src/main/python/apache/aurora/client/api:api'),
+ pants('src/main/python/apache/aurora/client/api:job_monitor'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
+ pants('src/test/python/apache/aurora/client:fake_scheduler_proxy'),
],
)
python_tests(name = 'restarter',
sources = ['test_restarter.py'],
dependencies = [
- pants('src/main/python/twitter/aurora/BUILD.thirdparty:mox'),
- pants('src/main/python/twitter/aurora/client/api:restarter'),
- pants('src/main/python/twitter/aurora/common:aurora_job_key'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
- pants('src/test/python/twitter/aurora/client:fake_scheduler_proxy'),
+ pants('src/main/python/apache/aurora/BUILD.thirdparty:mox'),
+ pants('src/main/python/apache/aurora/client/api:restarter'),
+ pants('src/main/python/apache/aurora/common:aurora_job_key'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
+ pants('src/test/python/apache/aurora/client:fake_scheduler_proxy'),
],
)
python_tests(name = 'scheduler_client',
sources = ['test_scheduler_client.py'],
dependencies = [
- pants('src/main/python/twitter/aurora/BUILD.thirdparty:mox'),
- pants('src/main/python/twitter/aurora/client/api:scheduler_client'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+ pants('src/main/python/apache/aurora/BUILD.thirdparty:mox'),
+ pants('src/main/python/apache/aurora/client/api:scheduler_client'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
]
)
python_tests(name = 'instance_watcher',
sources = ['test_instance_watcher.py', 'test_health_check.py'],
dependencies = [
- pants('src/main/python/twitter/aurora/BUILD.thirdparty:mox'),
- pants('src/main/python/twitter/aurora/client/api:instance_watcher'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+ pants('src/main/python/apache/aurora/BUILD.thirdparty:mox'),
+ pants('src/main/python/apache/aurora/client/api:instance_watcher'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
]
)
python_tests(name = 'updater',
sources = ['test_updater.py'],
dependencies = [
- pants('src/main/python/twitter/aurora/BUILD.thirdparty:mox'),
- pants('src/main/python/twitter/aurora/client/api:updater'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
- pants('src/test/python/twitter/aurora/client:fake_scheduler_proxy'),
+ pants('src/main/python/apache/aurora/BUILD.thirdparty:mox'),
+ pants('src/main/python/apache/aurora/client/api:updater'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
+ pants('src/test/python/apache/aurora/client:fake_scheduler_proxy'),
]
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/api/test_disambiguator.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/api/test_disambiguator.py b/src/test/python/apache/aurora/client/api/test_disambiguator.py
index fc70519..a93a8ee 100644
--- a/src/test/python/apache/aurora/client/api/test_disambiguator.py
+++ b/src/test/python/apache/aurora/client/api/test_disambiguator.py
@@ -1,12 +1,12 @@
import functools
-from twitter.aurora.client.api import AuroraClientAPI
-from twitter.aurora.client.api.disambiguator import LiveJobDisambiguator
-from twitter.aurora.common.aurora_job_key import AuroraJobKey
-from twitter.aurora.common.cluster import Cluster
+from apache.aurora.client.api import AuroraClientAPI
+from apache.aurora.client.api.disambiguator import LiveJobDisambiguator
+from apache.aurora.common.aurora_job_key import AuroraJobKey
+from apache.aurora.common.cluster import Cluster
-from gen.twitter.aurora.constants import ResponseCode
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.constants import ResponseCode
+from gen.apache.aurora.ttypes import (
Response,
Result,
GetJobsResult,
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/api/test_health_check.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/api/test_health_check.py b/src/test/python/apache/aurora/client/api/test_health_check.py
index fb577c6..a160462 100644
--- a/src/test/python/apache/aurora/client/api/test_health_check.py
+++ b/src/test/python/apache/aurora/client/api/test_health_check.py
@@ -1,7 +1,7 @@
import unittest
-from twitter.aurora.common.http_signaler import HttpSignaler
-from twitter.aurora.client.api.health_check import (
+from apache.aurora.common.http_signaler import HttpSignaler
+from apache.aurora.client.api.health_check import (
ChainedHealthCheck,
HealthCheck,
HealthStatus,
@@ -12,7 +12,7 @@ from twitter.aurora.client.api.health_check import (
StatusHealthCheck
)
-from gen.twitter.aurora.ttypes import *
+from gen.apache.aurora.ttypes import *
import mox
import pytest
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/api/test_instance_watcher.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/api/test_instance_watcher.py b/src/test/python/apache/aurora/client/api/test_instance_watcher.py
index 274d23b..1184d0b 100644
--- a/src/test/python/apache/aurora/client/api/test_instance_watcher.py
+++ b/src/test/python/apache/aurora/client/api/test_instance_watcher.py
@@ -1,11 +1,11 @@
from math import ceil
import unittest
-from twitter.aurora.client.api.health_check import HealthCheck
-from twitter.aurora.client.api.instance_watcher import InstanceWatcher
+from apache.aurora.client.api.health_check import HealthCheck
+from apache.aurora.client.api.instance_watcher import InstanceWatcher
-from gen.twitter.aurora.ttypes import *
-from gen.twitter.aurora.AuroraSchedulerManager import Client as scheduler_client
+from gen.apache.aurora.ttypes import *
+from gen.apache.aurora.AuroraSchedulerManager import Client as scheduler_client
import mox
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/api/test_job_monitor.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/api/test_job_monitor.py b/src/test/python/apache/aurora/client/api/test_job_monitor.py
index 30fca95..9327b32 100644
--- a/src/test/python/apache/aurora/client/api/test_job_monitor.py
+++ b/src/test/python/apache/aurora/client/api/test_job_monitor.py
@@ -1,7 +1,7 @@
-from gen.twitter.aurora.AuroraSchedulerManager import Client
-from gen.twitter.aurora.ttypes import Response, ResponseCode, Result, ScheduleStatusResult, Identity, TaskQuery
-from twitter.aurora.client.api import AuroraClientAPI
-from twitter.aurora.client.api.job_monitor import JobMonitor
+from gen.apache.aurora.AuroraSchedulerManager import Client
+from gen.apache.aurora.ttypes import Response, ResponseCode, Result, ScheduleStatusResult, Identity, TaskQuery
+from apache.aurora.client.api import AuroraClientAPI
+from apache.aurora.client.api.job_monitor import JobMonitor
from mox import MoxTestBase
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/api/test_restarter.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/api/test_restarter.py b/src/test/python/apache/aurora/client/api/test_restarter.py
index 0f74922..8d505eb 100644
--- a/src/test/python/apache/aurora/client/api/test_restarter.py
+++ b/src/test/python/apache/aurora/client/api/test_restarter.py
@@ -1,15 +1,15 @@
-from twitter.aurora.client.api.restarter import Restarter
-from twitter.aurora.client.api.instance_watcher import InstanceWatcher
-from twitter.aurora.client.api.updater_util import UpdaterConfig
-from twitter.aurora.common.aurora_job_key import AuroraJobKey
+from apache.aurora.client.api.restarter import Restarter
+from apache.aurora.client.api.instance_watcher import InstanceWatcher
+from apache.aurora.client.api.updater_util import UpdaterConfig
+from apache.aurora.common.aurora_job_key import AuroraJobKey
-from gen.twitter.aurora.AuroraSchedulerManager import Client as scheduler_client
-from gen.twitter.aurora.ttypes import *
+from gen.apache.aurora.AuroraSchedulerManager import Client as scheduler_client
+from gen.apache.aurora.ttypes import *
from mox import IgnoreArg, MoxTestBase
# test space
-from twitter.aurora.client.fake_scheduler_proxy import FakeSchedulerProxy
+from apache.aurora.client.fake_scheduler_proxy import FakeSchedulerProxy
SESSION_KEY = 'test_session'
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/api/test_scheduler_client.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/api/test_scheduler_client.py b/src/test/python/apache/aurora/client/api/test_scheduler_client.py
index fe62cd2..339ad9f 100644
--- a/src/test/python/apache/aurora/client/api/test_scheduler_client.py
+++ b/src/test/python/apache/aurora/client/api/test_scheduler_client.py
@@ -1,12 +1,12 @@
import inspect
import unittest
-import twitter.aurora.client.api.scheduler_client as scheduler_client
+import apache.aurora.client.api.scheduler_client as scheduler_client
-import gen.twitter.aurora.AuroraAdmin as AuroraAdmin
-import gen.twitter.aurora.AuroraSchedulerManager as AuroraSchedulerManager
-from gen.twitter.aurora.constants import DEFAULT_ENVIRONMENT, CURRENT_API_VERSION
-from gen.twitter.aurora.ttypes import *
+import gen.apache.aurora.AuroraAdmin as AuroraAdmin
+import gen.apache.aurora.AuroraSchedulerManager as AuroraSchedulerManager
+from gen.apache.aurora.constants import DEFAULT_ENVIRONMENT, CURRENT_API_VERSION
+from gen.apache.aurora.ttypes import *
from mox import IgnoreArg, IsA, Mox
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/api/test_updater.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/api/test_updater.py b/src/test/python/apache/aurora/client/api/test_updater.py
index ae4de2b..5843bb4 100644
--- a/src/test/python/apache/aurora/client/api/test_updater.py
+++ b/src/test/python/apache/aurora/client/api/test_updater.py
@@ -2,13 +2,13 @@ from copy import deepcopy
from os import environ
from unittest import TestCase
-from twitter.aurora.client.api.instance_watcher import InstanceWatcher
-from twitter.aurora.client.api.updater import Updater
-from twitter.aurora.client.fake_scheduler_proxy import FakeSchedulerProxy
+from apache.aurora.client.api.instance_watcher import InstanceWatcher
+from apache.aurora.client.api.updater import Updater
+from apache.aurora.client.fake_scheduler_proxy import FakeSchedulerProxy
-from gen.twitter.aurora.AuroraSchedulerManager import Client as scheduler_client
-from gen.twitter.aurora.constants import ACTIVE_STATES
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.AuroraSchedulerManager import Client as scheduler_client
+from gen.apache.aurora.constants import ACTIVE_STATES
+from gen.apache.aurora.ttypes import (
AddInstancesConfig,
AcquireLockResult,
AssignedTask,
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/cli/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/BUILD b/src/test/python/apache/aurora/client/cli/BUILD
index 89184b6..9528eed 100644
--- a/src/test/python/apache/aurora/client/cli/BUILD
+++ b/src/test/python/apache/aurora/client/cli/BUILD
@@ -7,8 +7,8 @@ python_library(
name = 'util',
sources = [ 'util.py' ],
dependencies = [
- pants('src/main/python/twitter/aurora/BUILD.thirdparty:mock'),
- pants('src/main/python/twitter/aurora/client/cli'),
+ pants('src/main/python/apache/aurora/BUILD.thirdparty:mock'),
+ pants('src/main/python/apache/aurora/client/cli'),
]
)
@@ -17,10 +17,10 @@ python_tests(
sources = [ 'test_create.py', 'test_kill.py' ],
dependencies = [
pants(':util'),
- pants('src/main/python/twitter/aurora/BUILD.thirdparty:mock'),
+ pants('src/main/python/apache/aurora/BUILD.thirdparty:mock'),
pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
- pants('src/main/python/twitter/aurora/client/cli'),
- pants('src/main/python/twitter/aurora/client/cli'),
- pants('src/test/python/twitter/aurora/client/commands:util')
+ pants('src/main/python/apache/aurora/client/cli'),
+ pants('src/main/python/apache/aurora/client/cli'),
+ pants('src/test/python/apache/aurora/client/commands:util')
]
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/cli/test_create.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/test_create.py b/src/test/python/apache/aurora/client/cli/test_create.py
index da2828f..df2386d 100644
--- a/src/test/python/apache/aurora/client/cli/test_create.py
+++ b/src/test/python/apache/aurora/client/cli/test_create.py
@@ -1,16 +1,16 @@
import contextlib
-from twitter.aurora.client.cli import (
+from apache.aurora.client.cli import (
AuroraCommandLine,
EXIT_INVALID_CONFIGURATION,
EXIT_NETWORK_ERROR
)
-from twitter.aurora.client.cli.util import AuroraClientCommandTest, FakeAuroraCommandContext
-from twitter.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
-from twitter.aurora.config import AuroraConfig
+from apache.aurora.client.cli.util import AuroraClientCommandTest, FakeAuroraCommandContext
+from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
+from apache.aurora.config import AuroraConfig
from twitter.common.contextutil import temporary_file
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
AssignedTask,
Identity,
ScheduledTask,
@@ -104,7 +104,7 @@ class TestClientCreateCommand(AuroraClientCommandTest):
# We'll patch out create_context, which will give us a fake context
# object, and everything can be stubbed through that.
mock_context = FakeAuroraCommandContext()
- with patch('twitter.aurora.client.cli.jobs.Job.create_context', return_value=mock_context):
+ with patch('apache.aurora.client.cli.jobs.Job.create_context', return_value=mock_context):
# After making the client, create sets up a job monitor.
# The monitor uses TaskQuery to get the tasks. It's called at least twice:once before
# the job is created, and once after. So we need to set up mocks for the query results.
@@ -136,7 +136,7 @@ class TestClientCreateCommand(AuroraClientCommandTest):
mock_context = FakeAuroraCommandContext()
with contextlib.nested(
patch('time.sleep'),
- patch('twitter.aurora.client.cli.jobs.Job.create_context', return_value=mock_context)):
+ patch('apache.aurora.client.cli.jobs.Job.create_context', return_value=mock_context)):
mock_query = self.create_mock_query()
for result in [ScheduleStatus.INIT, ScheduleStatus.PENDING, ScheduleStatus.PENDING,
ScheduleStatus.RUNNING, ScheduleStatus.FINISHED]:
@@ -159,7 +159,7 @@ class TestClientCreateCommand(AuroraClientCommandTest):
this time, make the monitor check status several times before successful completion.
"""
mock_context = FakeAuroraCommandContext()
- with patch('twitter.aurora.client.cli.jobs.Job.create_context', return_value=mock_context):
+ with patch('apache.aurora.client.cli.jobs.Job.create_context', return_value=mock_context):
mock_context.add_expected_status_query_result(
self.create_mock_status_query_result(ScheduleStatus.INIT))
api = mock_context.get_api('west')
@@ -184,7 +184,7 @@ class TestClientCreateCommand(AuroraClientCommandTest):
"""Run a test of the "create" command against a mocked-out API, with a configuration
containing a syntax error"""
mock_context = FakeAuroraCommandContext()
- with patch('twitter.aurora.client.cli.jobs.Job.create_context', return_value=mock_context):
+ with patch('apache.aurora.client.cli.jobs.Job.create_context', return_value=mock_context):
with temporary_file() as fp:
fp.write(self.get_invalid_config('invalid_clause=oops'))
fp.flush()
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/cli/test_kill.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/test_kill.py b/src/test/python/apache/aurora/client/cli/test_kill.py
index 8f8095c..75fb6b6 100644
--- a/src/test/python/apache/aurora/client/cli/test_kill.py
+++ b/src/test/python/apache/aurora/client/cli/test_kill.py
@@ -1,14 +1,14 @@
import contextlib
import unittest
-from twitter.aurora.client.cli import AuroraCommandLine
-from twitter.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
-from twitter.aurora.common.aurora_job_key import AuroraJobKey
+from apache.aurora.client.cli import AuroraCommandLine
+from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
+from apache.aurora.common.aurora_job_key import AuroraJobKey
from twitter.common.contextutil import temporary_file
-from twitter.aurora.client.cli.jobs import parse_instances
-from twitter.aurora.client.cli.util import AuroraClientCommandTest, FakeAuroraCommandContext
+from apache.aurora.client.cli.jobs import parse_instances
+from apache.aurora.client.cli.util import AuroraClientCommandTest, FakeAuroraCommandContext
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
Identity,
TaskQuery,
)
@@ -55,8 +55,8 @@ class TestClientKillCommand(AuroraClientCommandTest):
mock_context = FakeAuroraCommandContext()
mock_scheduler = Mock()
with contextlib.nested(
- patch('twitter.aurora.client.cli.jobs.Job.create_context', return_value=mock_context),
- patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS)):
+ patch('apache.aurora.client.cli.jobs.Job.create_context', return_value=mock_context),
+ patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS)):
api = mock_context.get_api('west')
api.kill_job.return_value = self.get_kill_job_response()
@@ -75,8 +75,8 @@ class TestClientKillCommand(AuroraClientCommandTest):
"""Test kill client-side API logic."""
mock_context = FakeAuroraCommandContext()
with contextlib.nested(
- patch('twitter.aurora.client.cli.jobs.Job.create_context', return_value=mock_context),
- patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS)):
+ patch('apache.aurora.client.cli.jobs.Job.create_context', return_value=mock_context),
+ patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS)):
api = mock_context.get_api('west')
api.kill_job.return_value = self.get_kill_job_response()
with temporary_file() as fp:
@@ -96,8 +96,8 @@ class TestClientKillCommand(AuroraClientCommandTest):
mock_context = FakeAuroraCommandContext()
(mock_api, mock_scheduler) = self.setup_mock_api()
with contextlib.nested(
- patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
- patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS)):
+ patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
+ patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS)):
mock_scheduler.killTasks.return_value = self.get_kill_job_response()
with temporary_file() as fp:
fp.write(self.get_valid_config())
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/cli/util.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/util.py b/src/test/python/apache/aurora/client/cli/util.py
index 46883ec..c6d3830 100644
--- a/src/test/python/apache/aurora/client/cli/util.py
+++ b/src/test/python/apache/aurora/client/cli/util.py
@@ -1,11 +1,11 @@
import unittest
-from twitter.aurora.client.cli.context import AuroraCommandContext
-from twitter.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
-from twitter.aurora.common.cluster import Cluster
-from twitter.aurora.common.clusters import Clusters
+from apache.aurora.client.cli.context import AuroraCommandContext
+from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
+from apache.aurora.common.cluster import Cluster
+from apache.aurora.common.clusters import Clusters
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
Response,
ResponseCode,
Result,
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/commands/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/BUILD b/src/test/python/apache/aurora/client/commands/BUILD
index 6d1f9b0..3c3de5f 100644
--- a/src/test/python/apache/aurora/client/commands/BUILD
+++ b/src/test/python/apache/aurora/client/commands/BUILD
@@ -16,11 +16,11 @@ python_tests(
'test_update.py'
],
dependencies = [
- pants('src/main/python/twitter/aurora/BUILD.thirdparty:mock'),
+ pants('src/main/python/apache/aurora/BUILD.thirdparty:mock'),
pants(':util'),
pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
- pants('src/main/python/twitter/aurora/client/commands:core'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+ pants('src/main/python/apache/aurora/client/commands:core'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
])
python_tests(
@@ -29,11 +29,11 @@ python_tests(
'test_ssh.py',
],
dependencies = [
- pants('src/main/python/twitter/aurora/BUILD.thirdparty:mock'),
+ pants('src/main/python/apache/aurora/BUILD.thirdparty:mock'),
pants(':util'),
pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
- pants('src/main/python/twitter/aurora/client/commands:ssh'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+ pants('src/main/python/apache/aurora/client/commands:ssh'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
])
python_tests(
@@ -42,19 +42,19 @@ python_tests(
'test_run.py',
],
dependencies = [
- pants('src/main/python/twitter/aurora/BUILD.thirdparty:mock'),
+ pants('src/main/python/apache/aurora/BUILD.thirdparty:mock'),
pants(':util'),
pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
- pants('src/main/python/twitter/aurora/client/commands:run'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+ pants('src/main/python/apache/aurora/client/commands:run'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
])
python_library(
name='util',
sources = [ 'util.py' ],
dependencies = [
- pants('src/main/python/twitter/aurora/BUILD.thirdparty:mock'),
- pants('src/main/python/twitter/aurora/client/commands:core'),
- pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+ pants('src/main/python/apache/aurora/BUILD.thirdparty:mock'),
+ pants('src/main/python/apache/aurora/client/commands:core'),
+ pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
]
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/commands/test_cancel_update.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_cancel_update.py b/src/test/python/apache/aurora/client/commands/test_cancel_update.py
index 52aacab..b1d63cc 100644
--- a/src/test/python/apache/aurora/client/commands/test_cancel_update.py
+++ b/src/test/python/apache/aurora/client/commands/test_cancel_update.py
@@ -1,15 +1,15 @@
import contextlib
import unittest
-from twitter.aurora.common.cluster import Cluster
-from twitter.aurora.common.clusters import Clusters
-from twitter.aurora.client.commands.core import cancel_update
-from twitter.aurora.client.commands.util import AuroraClientCommandTest
-from twitter.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
-from twitter.aurora.common.aurora_job_key import AuroraJobKey
+from apache.aurora.common.cluster import Cluster
+from apache.aurora.common.clusters import Clusters
+from apache.aurora.client.commands.core import cancel_update
+from apache.aurora.client.commands.util import AuroraClientCommandTest
+from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
+from apache.aurora.common.aurora_job_key import AuroraJobKey
from twitter.common.contextutil import temporary_file
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
Identity,
JobKey,
ScheduleStatus,
@@ -81,10 +81,10 @@ class TestClientCancelUpdateCommand(AuroraClientCommandTest):
mock_config = Mock()
mock_api_factory = self.setup_mock_api_factory()
with contextlib.nested(
- patch('twitter.aurora.client.commands.core.make_client_factory',
+ patch('apache.aurora.client.commands.core.make_client_factory',
return_value=mock_api_factory),
patch('twitter.common.app.get_options', return_value=mock_options),
- patch('twitter.aurora.client.commands.core.get_job_config', return_value=mock_config)) as (
+ patch('apache.aurora.client.commands.core.get_job_config', return_value=mock_config)) as (
mock_make_client_factory, options, mock_get_job_config):
mock_api = mock_api_factory.return_value
@@ -127,10 +127,10 @@ class TestClientCancelUpdateCommand(AuroraClientCommandTest):
(mock_api, mock_scheduler) = self.setup_mock_api()
mock_scheduler.releaseLock.return_value = self.get_release_lock_response()
with contextlib.nested(
- patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
- patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
+ patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
+ patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
patch('twitter.common.app.get_options', return_value=mock_options),
- patch('twitter.aurora.client.commands.core.get_job_config', return_value=mock_config)) as (
+ patch('apache.aurora.client.commands.core.get_job_config', return_value=mock_config)) as (
mock_scheduler_proxy_class, mock_clusters, options, mock_get_job_config):
with temporary_file() as fp:
fp.write(self.get_valid_config())
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/commands/test_create.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_create.py b/src/test/python/apache/aurora/client/commands/test_create.py
index bd8c6f7..57a6dc8 100644
--- a/src/test/python/apache/aurora/client/commands/test_create.py
+++ b/src/test/python/apache/aurora/client/commands/test_create.py
@@ -2,14 +2,14 @@ import contextlib
import unittest
-from twitter.aurora.client.commands.core import create
-from twitter.aurora.client.commands.util import AuroraClientCommandTest
-from twitter.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
-from twitter.aurora.config import AuroraConfig
+from apache.aurora.client.commands.core import create
+from apache.aurora.client.commands.util import AuroraClientCommandTest
+from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
+from apache.aurora.config import AuroraConfig
from twitter.common import app
from twitter.common.contextutil import temporary_file
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
AssignedTask,
Identity,
Response,
@@ -111,7 +111,7 @@ class TestClientCreateCommand(AuroraClientCommandTest):
# Next, create gets an API object via make_client. We need to replace that with a mock API.
(mock_api, mock_scheduler) = self.setup_mock_api()
with contextlib.nested(
- patch('twitter.aurora.client.commands.core.make_client', return_value=mock_api),
+ patch('apache.aurora.client.commands.core.make_client', return_value=mock_api),
patch('twitter.common.app.get_options', return_value=mock_options)) as (make_client,
options):
@@ -154,7 +154,7 @@ class TestClientCreateCommand(AuroraClientCommandTest):
(mock_api, mock_scheduler) = self.setup_mock_api()
with contextlib.nested(
patch('time.sleep'),
- patch('twitter.aurora.client.commands.core.make_client', return_value=mock_api),
+ patch('apache.aurora.client.commands.core.make_client', return_value=mock_api),
patch('twitter.common.app.get_options', return_value=mock_options)) as (sleep, make_client,
options):
mock_query = self.create_mock_query()
@@ -187,7 +187,7 @@ class TestClientCreateCommand(AuroraClientCommandTest):
mock_options = self.setup_mock_options()
(mock_api, mock_scheduler) = self.setup_mock_api()
with contextlib.nested(
- patch('twitter.aurora.client.commands.core.make_client', return_value=mock_api),
+ patch('apache.aurora.client.commands.core.make_client', return_value=mock_api),
patch('twitter.common.app.get_options', return_value=mock_options)) as (make_client,
options):
mock_query = self.create_mock_query()
@@ -222,7 +222,7 @@ class TestClientCreateCommand(AuroraClientCommandTest):
(mock_api, mock_scheduler) = self.setup_mock_api()
with contextlib.nested(
patch('time.sleep'),
- patch('twitter.aurora.client.commands.core.make_client', return_value=mock_api),
+ patch('apache.aurora.client.commands.core.make_client', return_value=mock_api),
patch('twitter.common.app.get_options', return_value=mock_options)) as (sleep, make_client,
options):
mock_query = self.create_mock_query()
@@ -253,7 +253,7 @@ class TestClientCreateCommand(AuroraClientCommandTest):
mock_options = self.setup_mock_options()
(mock_api, mock_scheduler) = self.setup_mock_api()
with contextlib.nested(
- patch('twitter.aurora.client.commands.core.make_client', return_value=mock_api),
+ patch('apache.aurora.client.commands.core.make_client', return_value=mock_api),
patch('twitter.common.app.get_options', return_value=mock_options)) as (make_client,
options):
with temporary_file() as fp:
@@ -279,7 +279,7 @@ class TestClientCreateCommand(AuroraClientCommandTest):
mock_options = self.setup_mock_options()
(mock_api, mock_scheduler) = self.setup_mock_api()
with contextlib.nested(
- patch('twitter.aurora.client.commands.core.make_client', return_value=mock_api),
+ patch('apache.aurora.client.commands.core.make_client', return_value=mock_api),
patch('twitter.common.app.get_options', return_value=mock_options)) as (make_client,
options):
with temporary_file() as fp:
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/commands/test_diff.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_diff.py b/src/test/python/apache/aurora/client/commands/test_diff.py
index 74a30cf..82c3cc6 100644
--- a/src/test/python/apache/aurora/client/commands/test_diff.py
+++ b/src/test/python/apache/aurora/client/commands/test_diff.py
@@ -1,10 +1,10 @@
import contextlib
-from twitter.aurora.client.commands.core import diff
-from twitter.aurora.client.commands.util import AuroraClientCommandTest
+from apache.aurora.client.commands.core import diff
+from apache.aurora.client.commands.util import AuroraClientCommandTest
from twitter.common.contextutil import temporary_file
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
AssignedTask,
ExecutorConfig,
Identity,
@@ -94,8 +94,8 @@ class TestDiffCommand(AuroraClientCommandTest):
mock_scheduler.getTasksStatus.return_value = self.create_status_response()
self.setup_populate_job_config(mock_scheduler)
with contextlib.nested(
- patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
- patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
+ patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
+ patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
patch('twitter.common.app.get_options', return_value=mock_options),
patch('subprocess.call', return_value=0),
patch('json.loads', return_value=Mock())) as (
@@ -131,8 +131,8 @@ class TestDiffCommand(AuroraClientCommandTest):
mock_scheduler.getTasksStatus.return_value = self.create_status_response()
self.setup_populate_job_config(mock_scheduler)
with contextlib.nested(
- patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
- patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
+ patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
+ patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
patch('twitter.common.app.get_options', return_value=mock_options),
patch('subprocess.call', return_value=0),
patch('json.loads', return_value=Mock())) as (
@@ -157,8 +157,8 @@ class TestDiffCommand(AuroraClientCommandTest):
mock_scheduler.getTasksStatus.return_value = self.create_failed_status_response()
self.setup_populate_job_config(mock_scheduler)
with contextlib.nested(
- patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
- patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
+ patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
+ patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
patch('twitter.common.app.get_options', return_value=mock_options),
patch('subprocess.call', return_value=0),
patch('json.loads', return_value=Mock())) as (
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/commands/test_kill.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_kill.py b/src/test/python/apache/aurora/client/commands/test_kill.py
index a0cc716..edca5dc 100644
--- a/src/test/python/apache/aurora/client/commands/test_kill.py
+++ b/src/test/python/apache/aurora/client/commands/test_kill.py
@@ -1,15 +1,15 @@
import contextlib
import unittest
-from twitter.aurora.common.cluster import Cluster
-from twitter.aurora.common.clusters import Clusters
-from twitter.aurora.client.commands.core import kill
-from twitter.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
-from twitter.aurora.common.aurora_job_key import AuroraJobKey
+from apache.aurora.common.cluster import Cluster
+from apache.aurora.common.clusters import Clusters
+from apache.aurora.client.commands.core import kill
+from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
+from apache.aurora.common.aurora_job_key import AuroraJobKey
from twitter.common.contextutil import temporary_file
-from twitter.aurora.client.commands.util import AuroraClientCommandTest
+from apache.aurora.client.commands.util import AuroraClientCommandTest
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
Identity,
ScheduleStatus,
ScheduleStatusResult,
@@ -77,10 +77,10 @@ class TestClientKillCommand(AuroraClientCommandTest):
mock_config = Mock()
mock_api_factory = self.setup_mock_api_factory()
with contextlib.nested(
- patch('twitter.aurora.client.commands.core.make_client_factory',
+ patch('apache.aurora.client.commands.core.make_client_factory',
return_value=mock_api_factory),
patch('twitter.common.app.get_options', return_value=mock_options),
- patch('twitter.aurora.client.commands.core.get_job_config', return_value=mock_config)) as (
+ patch('apache.aurora.client.commands.core.get_job_config', return_value=mock_config)) as (
mock_make_client_factory,
options, mock_get_job_config):
mock_api = mock_api_factory.return_value
@@ -129,11 +129,11 @@ class TestClientKillCommand(AuroraClientCommandTest):
mock_api_factory = Mock(return_value=mock_api)
mock_scheduler.killTasks.return_value = self.get_kill_job_response()
with contextlib.nested(
- patch('twitter.aurora.client.factory.make_client_factory', return_value=mock_api_factory),
- patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
- patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
+ patch('apache.aurora.client.factory.make_client_factory', return_value=mock_api_factory),
+ patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
+ patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
patch('twitter.common.app.get_options', return_value=mock_options),
- patch('twitter.aurora.client.commands.core.get_job_config', return_value=mock_config)) as (
+ patch('apache.aurora.client.commands.core.get_job_config', return_value=mock_config)) as (
mock_api_factory_patch,
mock_scheduler_proxy_class,
mock_clusters,
@@ -159,11 +159,11 @@ class TestClientKillCommand(AuroraClientCommandTest):
mock_api_factory = Mock(return_value=mock_api)
mock_scheduler.killTasks.return_value = self.get_kill_job_response()
with contextlib.nested(
- patch('twitter.aurora.client.factory.make_client_factory', return_value=mock_api_factory),
- patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
- patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
+ patch('apache.aurora.client.factory.make_client_factory', return_value=mock_api_factory),
+ patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
+ patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
patch('twitter.common.app.get_options', return_value=mock_options),
- patch('twitter.aurora.client.commands.core.get_job_config', return_value=mock_config)) as (
+ patch('apache.aurora.client.commands.core.get_job_config', return_value=mock_config)) as (
mock_api_factory_patch,
mock_scheduler_proxy_class,
mock_clusters,
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/commands/test_listjobs.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_listjobs.py b/src/test/python/apache/aurora/client/commands/test_listjobs.py
index 845ab54..16973d4 100644
--- a/src/test/python/apache/aurora/client/commands/test_listjobs.py
+++ b/src/test/python/apache/aurora/client/commands/test_listjobs.py
@@ -1,12 +1,12 @@
import contextlib
import unittest
-from twitter.aurora.common.cluster import Cluster
-from twitter.aurora.common.clusters import Clusters
-from twitter.aurora.client.commands.core import list_jobs
-from twitter.aurora.client.commands.util import AuroraClientCommandTest
+from apache.aurora.common.cluster import Cluster
+from apache.aurora.common.clusters import Clusters
+from apache.aurora.client.commands.core import list_jobs
+from apache.aurora.client.commands.util import AuroraClientCommandTest
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
GetJobsResult,
JobKey,
)
@@ -46,8 +46,8 @@ class TestListJobs(AuroraClientCommandTest):
(mock_api, mock_scheduler) = self.create_mock_api()
mock_scheduler.getJobs.return_value = self.create_listjobs_response()
with contextlib.nested(
- patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
- patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
+ patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
+ patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
patch('twitter.common.app.get_options', return_value=mock_options)) as (
mock_scheduler_proxy_class,
mock_clusters,
@@ -62,8 +62,8 @@ class TestListJobs(AuroraClientCommandTest):
(mock_api, mock_scheduler) = self.create_mock_api()
mock_scheduler.getJobs.return_value = self.create_listjobs_response()
with contextlib.nested(
- patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
- patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
+ patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
+ patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
patch('twitter.common.app.get_options', return_value=mock_options)) as (
mock_scheduler_proxy_class,
mock_clusters,
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/commands/test_restart.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_restart.py b/src/test/python/apache/aurora/client/commands/test_restart.py
index 7b4c5ae..77a24e8 100644
--- a/src/test/python/apache/aurora/client/commands/test_restart.py
+++ b/src/test/python/apache/aurora/client/commands/test_restart.py
@@ -1,12 +1,12 @@
import contextlib
import functools
-from twitter.aurora.client.commands.core import restart
-from twitter.aurora.client.commands.util import AuroraClientCommandTest
-from twitter.aurora.client.api.health_check import InstanceWatcherHealthCheck, Retriable
+from apache.aurora.client.commands.core import restart
+from apache.aurora.client.commands.util import AuroraClientCommandTest
+from apache.aurora.client.api.health_check import InstanceWatcherHealthCheck, Retriable
from twitter.common.contextutil import temporary_file
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
AssignedTask,
JobKey,
PopulateJobResult,
@@ -90,9 +90,9 @@ class TestRestartCommand(AuroraClientCommandTest):
self.setup_mock_scheduler_for_simple_restart(mock_api)
with contextlib.nested(
patch('twitter.common.app.get_options', return_value=mock_options),
- patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
- patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
- patch('twitter.aurora.client.api.instance_watcher.InstanceWatcherHealthCheck',
+ patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
+ patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
+ patch('apache.aurora.client.api.instance_watcher.InstanceWatcherHealthCheck',
return_value=mock_health_check),
patch('time.time', side_effect=functools.partial(self.fake_time, self)),
patch('time.sleep', return_value=None)
@@ -124,9 +124,9 @@ class TestRestartCommand(AuroraClientCommandTest):
mock_scheduler.getTasksStatus.return_value = self.create_error_response()
with contextlib.nested(
patch('twitter.common.app.get_options', return_value=mock_options),
- patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
- patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
- patch('twitter.aurora.client.api.instance_watcher.InstanceWatcherHealthCheck',
+ patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
+ patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
+ patch('apache.aurora.client.api.instance_watcher.InstanceWatcherHealthCheck',
return_value=mock_health_check),
patch('time.time', side_effect=functools.partial(self.fake_time, self)),
patch('time.sleep', return_value=None)
@@ -150,9 +150,9 @@ class TestRestartCommand(AuroraClientCommandTest):
mock_scheduler.restartShards.return_value = self.create_error_response()
with contextlib.nested(
patch('twitter.common.app.get_options', return_value=mock_options),
- patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
- patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
- patch('twitter.aurora.client.api.instance_watcher.InstanceWatcherHealthCheck',
+ patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
+ patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
+ patch('apache.aurora.client.api.instance_watcher.InstanceWatcherHealthCheck',
return_value=mock_health_check),
patch('time.time', side_effect=functools.partial(self.fake_time, self)),
patch('time.sleep', return_value=None)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/commands/test_run.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_run.py b/src/test/python/apache/aurora/client/commands/test_run.py
index fd47b47..0a6aaf8 100644
--- a/src/test/python/apache/aurora/client/commands/test_run.py
+++ b/src/test/python/apache/aurora/client/commands/test_run.py
@@ -1,9 +1,9 @@
import contextlib
-from twitter.aurora.client.commands.run import run
-from twitter.aurora.client.commands.util import AuroraClientCommandTest
+from apache.aurora.client.commands.run import run
+from apache.aurora.client.commands.util import AuroraClientCommandTest
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
AssignedTask,
Identity,
JobKey,
@@ -86,11 +86,11 @@ class TestRunCommand(AuroraClientCommandTest):
mock_scheduler.getTasksStatus.return_value = self.create_status_response()
sandbox_args = {'slave_root': '/slaveroot', 'slave_run_directory': 'slaverun'}
with contextlib.nested(
- patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
- patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
- patch('twitter.aurora.client.commands.run.CLUSTERS', new=self.TEST_CLUSTERS),
+ patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
+ patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
+ patch('apache.aurora.client.commands.run.CLUSTERS', new=self.TEST_CLUSTERS),
patch('twitter.common.app.get_options', return_value=mock_options),
- patch('twitter.aurora.client.api.command_runner.DistributedCommandRunner.sandbox_args',
+ patch('apache.aurora.client.api.command_runner.DistributedCommandRunner.sandbox_args',
return_value=sandbox_args),
patch('subprocess.Popen', return_value=self.create_mock_process())) as (
mock_scheduler_proxy_class,