From 8cce195c630705516b92bfab659f04b85617f6e5 Mon Sep 17 00:00:00 2001 From: Martin Traverso Date: Tue, 24 Jul 2012 22:24:46 -0700 Subject: [PATCH] move to io.airlift (step 2) --- README.txt | 2 +- airship-agent/README.txt | 2 +- airship-agent/pom.xml | 16 +-- .../java/io/airlift/airship/agent/Agent.java | 14 +- .../io/airlift/airship/agent/AgentConfig.java | 2 +- .../io/airlift/airship/agent/AgentMain.java | 2 +- .../airship/agent/AgentMainModule.java | 4 +- .../airlift/airship/agent/AgentResource.java | 10 +- .../airship/agent/AssignmentResource.java | 24 ++-- .../io/airlift/airship/agent/Deployment.java | 4 +- .../airship/agent/DeploymentManager.java | 4 +- .../agent/DeploymentManagerFactory.java | 4 +- .../agent/DeploymentRepresentation.java | 4 +- .../airlift/airship/agent/DeploymentSlot.java | 16 +-- .../agent/DirectoryDeploymentManager.java | 26 ++-- .../DirectoryDeploymentManagerFactory.java | 12 +- .../agent/LauncherLifecycleManager.java | 16 +-- .../airship/agent/LifecycleManager.java | 4 +- .../airship/agent/LifecycleResource.java | 18 +-- .../airship/agent/LockTimeoutException.java | 2 +- .../agent/ServiceInventoryResource.java | 2 +- .../java/io/airlift/airship/agent/Slot.java | 6 +- .../airlift/airship/agent/SlotResource.java | 38 ++--- .../agent/AbstractDeploymentManagerTest.java | 4 +- .../agent/AbstractLifecycleManagerTest.java | 6 +- .../airship/agent/MockDeploymentManager.java | 4 +- .../agent/MockDeploymentManagerFactory.java | 4 +- .../airship/agent/MockLifecycleManager.java | 4 +- .../airlift/airship/agent/ResourcesUtil.java | 2 +- .../io/airlift/airship/agent/TestAgent.java | 4 +- .../airship/agent/TestAgentConfig.java | 2 +- .../airship/agent/TestAgentResource.java | 8 +- .../airship/agent/TestAssignmentResource.java | 30 ++-- .../io/airlift/airship/agent/TestCommand.java | 8 +- .../airlift/airship/agent/TestDeployment.java | 6 +- .../agent/TestDeploymentRepresentation.java | 6 +- .../agent/TestDirectoryDeploymentManager.java | 6 +- .../airship/agent/TestInstallation.java | 8 +- .../agent/TestInstallationRepresentation.java | 8 +- .../agent/TestLauncherLifecycleManager.java | 16 +-- .../airship/agent/TestLifecycleResource.java | 28 ++-- .../agent/TestMockDeploymentManager.java | 4 +- .../agent/TestMockLifecycleManager.java | 6 +- .../io/airlift/airship/agent/TestServer.java | 28 ++-- .../io/airlift/airship/agent/TestSlot.java | 18 +-- .../airship/agent/TestSlotResource.java | 44 +++--- airship-cli/README.txt | 2 +- airship-cli/pom.xml | 34 ++--- .../io/airlift/airship/cli/AgentFilter.java | 12 +- .../io/airlift/airship/cli/AgentRecord.java | 8 +- .../airship/cli/{Galaxy.java => Airship.java} | 132 +++++++++--------- .../java/io/airlift/airship/cli/Ansi.java | 2 +- .../java/io/airlift/airship/cli/Column.java | 2 +- .../io/airlift/airship/cli/Commander.java | 16 +-- .../airlift/airship/cli/CommanderFactory.java | 58 ++++---- .../airship/cli/CommanderResponse.java | 2 +- .../java/io/airlift/airship/cli/Config.java | 2 +- .../airship/cli/CoordinatorFilter.java | 8 +- .../airship/cli/CoordinatorRecord.java | 8 +- .../java/io/airlift/airship/cli/Exec.java | 6 +- .../io/airlift/airship/cli/GlobalOptions.java | 4 +- .../io/airlift/airship/cli/HttpCommander.java | 48 +++---- .../airlift/airship/cli/InteractiveUser.java | 2 +- .../airlift/airship/cli/LocalCommander.java | 44 +++--- .../io/airlift/airship/cli/OutputFormat.java | 8 +- .../io/airlift/airship/cli/POSIXFactory.java | 2 +- .../airship/cli/RealInteractiveUser.java | 2 +- .../java/io/airlift/airship/cli/Record.java | 2 +- .../io/airlift/airship/cli/SimpleRecord.java | 4 +- .../io/airlift/airship/cli/SlotFilter.java | 8 +- .../io/airlift/airship/cli/SlotRecord.java | 10 +- .../airship/cli/TableOutputFormat.java | 34 ++--- .../io/airlift/airship/cli/TablePrinter.java | 2 +- .../io/airlift/airship/cli/WaitUtils.java | 2 +- ...GalaxyTestRun.java => AirshipTestRun.java} | 12 +- .../cli/{TestGalaxy.java => TestAirship.java} | 41 +++--- airship-config-bundler/pom.xml | 14 +- .../configbundler/AddComponentCommand.java | 2 +- .../airlift/airship/configbundler/Bundle.java | 2 +- .../airship/configbundler/ConfigBundler.java | 2 +- .../airship/configbundler/Generator.java | 2 +- .../airship/configbundler/GitUtils.java | 2 +- .../configbundler/IgnoreHiddenFilter.java | 2 +- .../airship/configbundler/InitCommand.java | 2 +- .../airlift/airship/configbundler/Maven.java | 2 +- .../airship/configbundler/Metadata.java | 2 +- .../airlift/airship/configbundler/Model.java | 8 +- .../airship/configbundler/ReleaseCommand.java | 2 +- .../configbundler/SnapshotCommand.java | 2 +- .../airship/configbundler/ZipGenerator.java | 2 +- .../airship/configbundler/ZipPackager.java | 2 +- airship-coordinator/README.txt | 2 +- airship-coordinator/etc/aws-config.properties | 6 +- airship-coordinator/etc/config.properties | 6 +- airship-coordinator/pom.xml | 16 +-- .../airship/coordinator/AdminResource.java | 22 +-- .../coordinator/AgentFilterBuilder.java | 30 ++-- .../AgentProvisioningRepresentation.java | 2 +- .../AmbiguousUpgradeException.java | 4 +- .../airship/coordinator/AwsProvisioner.java | 102 +++++++------- .../coordinator/AwsProvisionerConfig.java | 2 +- .../coordinator/AwsProvisionerModule.java | 6 +- .../airship/coordinator/BinaryResource.java | 6 +- .../coordinator/ConditionalModule.java | 2 +- .../airship/coordinator/Coordinator.java | 40 +++--- .../CoordinatorAssignmentResource.java | 18 +-- .../coordinator/CoordinatorConfig.java | 14 +- .../coordinator/CoordinatorFilterBuilder.java | 8 +- .../CoordinatorLifecycleResource.java | 20 +-- .../airship/coordinator/CoordinatorMain.java | 4 +- .../coordinator/CoordinatorMainModule.java | 22 +-- ...CoordinatorProvisioningRepresentation.java | 2 +- .../coordinator/CoordinatorSlotResource.java | 36 ++--- .../coordinator/ExpectedStateResource.java | 18 +-- .../airship/coordinator/FileStateManager.java | 6 +- .../airship/coordinator/GlobPredicate.java | 2 +- .../airlift/airship/coordinator/Global.java | 2 +- .../airship/coordinator/HttpRemoteAgent.java | 28 ++-- .../coordinator/HttpRemoteAgentFactory.java | 14 +- .../airship/coordinator/HttpRemoteSlot.java | 38 ++--- .../airship/coordinator/HttpRepository.java | 10 +- .../coordinator/HttpServiceInventory.java | 18 +-- .../coordinator/InMemoryStateManager.java | 4 +- .../InputSupplierStreamingOutput.java | 2 +- .../airlift/airship/coordinator/Instance.java | 2 +- .../InvalidSlotFilterException.java | 2 +- .../InvalidSlotFilterExceptionMapper.java | 2 +- .../coordinator/LocalProvisionerConfig.java | 2 +- .../coordinator/LocalProvisionerModule.java | 6 +- .../airship/coordinator/MavenMetadata.java | 2 +- .../airship/coordinator/MavenRepository.java | 16 +-- .../airship/coordinator/Provisioner.java | 2 +- .../airship/coordinator/RegexPredicate.java | 2 +- .../airship/coordinator/RemoteAgent.java | 8 +- .../coordinator/RemoteAgentFactory.java | 4 +- .../airship/coordinator/RemoteSlot.java | 6 +- .../airship/coordinator/ServiceInventory.java | 4 +- .../coordinator/ServiceInventoryResource.java | 2 +- .../coordinator/SimpleDbStateManager.java | 10 +- .../coordinator/SlotFilterBuilder.java | 12 +- .../airship/coordinator/StateManager.java | 4 +- .../coordinator/StaticProvisioner.java | 4 +- .../airship/coordinator/StringFunctions.java | 2 +- .../airship/coordinator/UriHostPredicate.java | 2 +- .../airship/coordinator/auth/AuthConfig.java | 2 +- .../airship/coordinator/auth/AuthFilter.java | 6 +- .../coordinator/auth/AuthorizedKey.java | 2 +- .../coordinator/auth/AuthorizedKeyStore.java | 2 +- .../coordinator/auth/DsaPublicKey.java | 10 +- .../auth/FileAuthorizedKeyStore.java | 6 +- .../airship/coordinator/auth/Fingerprint.java | 2 +- .../auth/InMemoryAuthorizedKeyStore.java | 2 +- .../airship/coordinator/auth/PublicKey.java | 2 +- .../coordinator/auth/RequestWrapper.java | 2 +- .../coordinator/auth/RsaPublicKey.java | 4 +- .../auth/S3AuthorizedKeyStore.java | 4 +- .../ServletInputStreamFromInputStream.java | 2 +- .../coordinator/auth/SignatureVerifier.java | 2 +- .../coordinator/auth/ssh/DerReader.java | 2 +- .../airship/coordinator/auth/ssh/DerType.java | 2 +- .../coordinator/auth/ssh/DerWriter.java | 2 +- .../coordinator/auth/ssh/PemDecoder.java | 2 +- .../auth/ssh/PemDsaPrivateKey.java | 2 +- .../auth/ssh/PemRsaPrivateKey.java | 2 +- .../coordinator/auth/ssh/SshDsaPublicKey.java | 2 +- .../coordinator/auth/ssh/SshKeyReader.java | 2 +- .../coordinator/auth/ssh/SshRsaPublicKey.java | 2 +- .../airship/coordinator/MockProvisioner.java | 8 +- .../airship/coordinator/MockRemoteAgent.java | 18 +-- .../coordinator/MockRemoteAgentFactory.java | 6 +- .../airship/coordinator/MockRemoteSlot.java | 12 +- .../coordinator/MockServiceInventory.java | 4 +- .../coordinator/TestAdminResource.java | 20 +-- .../coordinator/TestAgentFilterBuilder.java | 34 ++--- .../TestAssignmentRepresentation.java | 6 +- .../coordinator/TestAwsProvisionerConfig.java | 2 +- .../airship/coordinator/TestCoordinator.java | 22 +-- .../TestCoordinatorAssignmentResource.java | 32 ++--- .../coordinator/TestCoordinatorConfig.java | 10 +- .../TestCoordinatorFilterBuilder.java | 18 +-- .../TestCoordinatorLifecycleResource.java | 40 +++--- .../coordinator/TestCoordinatorServer.java | 50 +++---- .../TestCoordinatorSlotResource.java | 30 ++-- .../coordinator/TestGlobPredicate.java | 2 +- .../coordinator/TestHttpRepository.java | 2 +- .../TestLocalProvisionerConfig.java | 2 +- .../coordinator/TestMavenMetadata.java | 4 +- .../coordinator/TestMavenRepository.java | 2 +- .../coordinator/TestProvisionAgent.java | 6 +- .../coordinator/TestRegexPredicate.java | 2 +- .../coordinator/TestSlotFilterBuilder.java | 26 ++-- .../coordinator/TestingHttpRepository.java | 12 +- .../coordinator/TestingMavenRepository.java | 26 ++-- .../coordinator/auth/TestPublicKey.java | 14 +- airship-ec2/galaxy-install-prep.sh | 10 +- airship-ec2/galaxy-install.sh | 50 +++---- airship-ec2/pom.xml | 18 +-- airship-integration-tests/pom.xml | 34 ++--- .../integration/MockLocalProvisioner.java | 18 +-- .../integration/TestCliIntegration.java | 59 ++++---- .../airship/integration/TestRemoteSlot.java | 48 +++---- .../integration/TestServerIntegration.java | 70 +++++----- airship-shared/pom.xml | 10 +- .../airship/shared/AgentLifecycleState.java | 2 +- .../airlift/airship/shared/AgentStatus.java | 4 +- .../shared/AgentStatusRepresentation.java | 14 +- .../io/airlift/airship/shared/Assignment.java | 2 +- .../shared/AssignmentRepresentation.java | 2 +- .../io/airlift/airship/shared/Command.java | 2 +- .../shared/CommandFailedException.java | 2 +- .../shared/CommandTimeoutException.java | 2 +- .../airlift/airship/shared/ConfigUtils.java | 2 +- .../shared/CoordinatorLifecycleState.java | 2 +- .../airship/shared/CoordinatorStatus.java | 2 +- .../CoordinatorStatusRepresentation.java | 14 +- .../airlift/airship/shared/DigestUtils.java | 2 +- .../airship/shared/ExpectedSlotStatus.java | 2 +- .../io/airlift/airship/shared/FileUtils.java | 2 +- .../airship/shared/HttpUriBuilder.java | 2 +- .../airlift/airship/shared/Installation.java | 2 +- .../shared/InstallationRepresentation.java | 2 +- .../airship/shared/InstallationUtils.java | 6 +- .../airlift/airship/shared/LocationUtils.java | 2 +- .../airship/shared/MavenCoordinates.java | 2 +- .../io/airlift/airship/shared/Repository.java | 2 +- .../airlift/airship/shared/RepositorySet.java | 2 +- .../airship/shared/SlotLifecycleState.java | 2 +- .../io/airlift/airship/shared/SlotStatus.java | 6 +- .../shared/SlotStatusRepresentation.java | 14 +- .../io/airlift/airship/shared/Strings.java | 2 +- .../airship/shared/UpgradeVersions.java | 2 +- .../shared/VersionConflictException.java | 2 +- .../VersionConflictExceptionMapper.java | 2 +- .../airlift/airship/shared/VersionsUtil.java | 18 +-- .../airlift/airship/shared/ArchiveHelper.java | 6 +- .../airship/shared/AssignmentHelper.java | 2 +- .../airship/shared/ExtraAssertions.java | 2 +- .../airship/shared/InstallationHelper.java | 12 +- .../airlift/airship/shared/MockUriInfo.java | 6 +- .../shared/TestAgentStatusRepresentation.java | 10 +- .../airship/shared/TestBinarySpec.java | 6 +- .../airship/shared/TestConfigSpec.java | 6 +- .../airship/shared/TestDeploymentUtils.java | 8 +- .../airship/shared/TestHttpUriBuilder.java | 6 +- .../airship/shared/TestMavenCoordinates.java | 2 +- .../airship/shared/TestSlotStatus.java | 16 +-- .../shared/TestSlotStatusRepresentation.java | 4 +- .../airlift/airship/shared/TestStrings.java | 8 +- .../airship/shared/TestUpgradeVersion.java | 2 +- pom.xml | 30 ++-- 250 files changed, 1350 insertions(+), 1350 deletions(-) rename airship-cli/src/main/java/io/airlift/airship/cli/{Galaxy.java => Airship.java} (93%) rename airship-cli/src/test/java/io/airlift/airship/cli/{GalaxyTestRun.java => AirshipTestRun.java} (88%) rename airship-cli/src/test/java/io/airlift/airship/cli/{TestGalaxy.java => TestAirship.java} (92%) diff --git a/README.txt b/README.txt index 40112124..2c904ae1 100644 --- a/README.txt +++ b/README.txt @@ -1 +1 @@ -galaxy +airship diff --git a/airship-agent/README.txt b/airship-agent/README.txt index 3e79e6d1..a1cf3141 100644 --- a/airship-agent/README.txt +++ b/airship-agent/README.txt @@ -1 +1 @@ -galaxy-agent +airship-agent diff --git a/airship-agent/pom.xml b/airship-agent/pom.xml index d506ae7b..d7c289b0 100644 --- a/airship-agent/pom.xml +++ b/airship-agent/pom.xml @@ -8,13 +8,13 @@ - com.proofpoint.galaxy.agent.AgentMain + io.airlift.airship.agent.AgentMain - com.proofpoint.galaxy - galaxy-agent + io.airlift.airship + airship-agent 0.9-SNAPSHOT - galaxy-agent + airship-agent @@ -31,8 +31,8 @@ - com.proofpoint.galaxy - galaxy-shared + io.airlift.airship + airship-shared 0.9-SNAPSHOT @@ -171,8 +171,8 @@ - com.proofpoint.galaxy - galaxy-shared + io.airlift.airship + airship-shared 0.9-SNAPSHOT test-jar test diff --git a/airship-agent/src/main/java/io/airlift/airship/agent/Agent.java b/airship-agent/src/main/java/io/airlift/airship/agent/Agent.java index a84dfa63..5dc13efc 100644 --- a/airship-agent/src/main/java/io/airlift/airship/agent/Agent.java +++ b/airship-agent/src/main/java/io/airlift/airship/agent/Agent.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; @@ -19,9 +19,9 @@ import com.google.common.collect.ImmutableMap; import com.google.common.io.Closeables; import com.google.inject.Inject; -import com.proofpoint.galaxy.shared.AgentStatus; -import com.proofpoint.galaxy.shared.Installation; -import com.proofpoint.galaxy.shared.SlotStatus; +import io.airlift.airship.shared.AgentStatus; +import io.airlift.airship.shared.Installation; +import io.airlift.airship.shared.SlotStatus; import com.proofpoint.http.server.HttpServerInfo; import com.proofpoint.node.NodeInfo; import com.proofpoint.units.Duration; @@ -38,9 +38,9 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import static com.proofpoint.galaxy.shared.AgentLifecycleState.ONLINE; -import static com.proofpoint.galaxy.shared.HttpUriBuilder.uriBuilderFrom; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.TERMINATED; +import static io.airlift.airship.shared.AgentLifecycleState.ONLINE; +import static io.airlift.airship.shared.HttpUriBuilder.uriBuilderFrom; +import static io.airlift.airship.shared.SlotLifecycleState.TERMINATED; import static java.lang.String.format; public class Agent diff --git a/airship-agent/src/main/java/io/airlift/airship/agent/AgentConfig.java b/airship-agent/src/main/java/io/airlift/airship/agent/AgentConfig.java index 27a77d25..6bcabd88 100644 --- a/airship-agent/src/main/java/io/airlift/airship/agent/AgentConfig.java +++ b/airship-agent/src/main/java/io/airlift/airship/agent/AgentConfig.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.google.common.base.Preconditions; import com.proofpoint.configuration.Config; diff --git a/airship-agent/src/main/java/io/airlift/airship/agent/AgentMain.java b/airship-agent/src/main/java/io/airlift/airship/agent/AgentMain.java index 07890cdb..2691833d 100644 --- a/airship-agent/src/main/java/io/airlift/airship/agent/AgentMain.java +++ b/airship-agent/src/main/java/io/airlift/airship/agent/AgentMain.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.proofpoint.bootstrap.Bootstrap; import com.proofpoint.discovery.client.DiscoveryModule; diff --git a/airship-agent/src/main/java/io/airlift/airship/agent/AgentMainModule.java b/airship-agent/src/main/java/io/airlift/airship/agent/AgentMainModule.java index aa4e620f..cc359577 100644 --- a/airship-agent/src/main/java/io/airlift/airship/agent/AgentMainModule.java +++ b/airship-agent/src/main/java/io/airlift/airship/agent/AgentMainModule.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.google.inject.Binder; import com.google.inject.Module; import com.google.inject.Scopes; import com.proofpoint.configuration.ConfigurationModule; -import com.proofpoint.galaxy.shared.VersionConflictExceptionMapper; +import io.airlift.airship.shared.VersionConflictExceptionMapper; import org.weakref.jmx.guice.MBeanModule; public class AgentMainModule diff --git a/airship-agent/src/main/java/io/airlift/airship/agent/AgentResource.java b/airship-agent/src/main/java/io/airlift/airship/agent/AgentResource.java index 281c6d27..9dcbca4d 100644 --- a/airship-agent/src/main/java/io/airlift/airship/agent/AgentResource.java +++ b/airship-agent/src/main/java/io/airlift/airship/agent/AgentResource.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.google.common.base.Preconditions; import com.google.inject.Inject; -import com.proofpoint.galaxy.shared.AgentStatus; -import com.proofpoint.galaxy.shared.AgentStatusRepresentation; +import io.airlift.airship.shared.AgentStatus; +import io.airlift.airship.shared.AgentStatusRepresentation; import javax.ws.rs.GET; import javax.ws.rs.Path; @@ -24,7 +24,7 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import static com.proofpoint.galaxy.shared.VersionsUtil.GALAXY_AGENT_VERSION_HEADER; +import static io.airlift.airship.shared.VersionsUtil.AIRSHIP_AGENT_VERSION_HEADER; @Path("/v1/agent/") public class AgentResource @@ -46,7 +46,7 @@ public Response getAllSlotsStatus() AgentStatus agentStatus = agent.getAgentStatus(); AgentStatusRepresentation agentStatusRepresentation = AgentStatusRepresentation.from(agentStatus); return Response.ok(agentStatusRepresentation) - .header(GALAXY_AGENT_VERSION_HEADER, agentStatus.getVersion()) + .header(AIRSHIP_AGENT_VERSION_HEADER, agentStatus.getVersion()) .build(); } } diff --git a/airship-agent/src/main/java/io/airlift/airship/agent/AssignmentResource.java b/airship-agent/src/main/java/io/airlift/airship/agent/AssignmentResource.java index 491de71b..b6625619 100644 --- a/airship-agent/src/main/java/io/airlift/airship/agent/AssignmentResource.java +++ b/airship-agent/src/main/java/io/airlift/airship/agent/AssignmentResource.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.google.common.base.Preconditions; import com.google.inject.Inject; -import com.proofpoint.galaxy.shared.InstallationRepresentation; -import com.proofpoint.galaxy.shared.SlotStatus; -import com.proofpoint.galaxy.shared.SlotStatusRepresentation; +import io.airlift.airship.shared.InstallationRepresentation; +import io.airlift.airship.shared.SlotStatus; +import io.airlift.airship.shared.SlotStatusRepresentation; import javax.ws.rs.Consumes; import javax.ws.rs.HeaderParam; @@ -30,10 +30,10 @@ import java.util.UUID; -import static com.proofpoint.galaxy.shared.VersionsUtil.checkAgentVersion; -import static com.proofpoint.galaxy.shared.VersionsUtil.checkSlotVersion; -import static com.proofpoint.galaxy.shared.VersionsUtil.GALAXY_AGENT_VERSION_HEADER; -import static com.proofpoint.galaxy.shared.VersionsUtil.GALAXY_SLOT_VERSION_HEADER; +import static io.airlift.airship.shared.VersionsUtil.checkAgentVersion; +import static io.airlift.airship.shared.VersionsUtil.checkSlotVersion; +import static io.airlift.airship.shared.VersionsUtil.AIRSHIP_AGENT_VERSION_HEADER; +import static io.airlift.airship.shared.VersionsUtil.AIRSHIP_SLOT_VERSION_HEADER; @Path("/v1/agent/slot/{slotId}/assignment") public class AssignmentResource @@ -51,8 +51,8 @@ public AssignmentResource(Agent agent) @PUT @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) - public Response assign(@HeaderParam(GALAXY_AGENT_VERSION_HEADER) String agentVersion, - @HeaderParam(GALAXY_SLOT_VERSION_HEADER) String slotVersion, + public Response assign(@HeaderParam(AIRSHIP_AGENT_VERSION_HEADER) String agentVersion, + @HeaderParam(AIRSHIP_SLOT_VERSION_HEADER) String slotVersion, @PathParam("slotId") UUID slotId, InstallationRepresentation installation) { @@ -69,8 +69,8 @@ public Response assign(@HeaderParam(GALAXY_AGENT_VERSION_HEADER) String agentVer SlotStatus status = slot.assign(installation.toInstallation()); return Response.ok(SlotStatusRepresentation.from(status)) - .header(GALAXY_AGENT_VERSION_HEADER, agent.getAgentStatus().getVersion()) - .header(GALAXY_SLOT_VERSION_HEADER, status.getVersion()) + .header(AIRSHIP_AGENT_VERSION_HEADER, agent.getAgentStatus().getVersion()) + .header(AIRSHIP_SLOT_VERSION_HEADER, status.getVersion()) .build(); } } diff --git a/airship-agent/src/main/java/io/airlift/airship/agent/Deployment.java b/airship-agent/src/main/java/io/airlift/airship/agent/Deployment.java index 56de206b..e99c7a15 100644 --- a/airship-agent/src/main/java/io/airlift/airship/agent/Deployment.java +++ b/airship-agent/src/main/java/io/airlift/airship/agent/Deployment.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; -import com.proofpoint.galaxy.shared.Assignment; +import io.airlift.airship.shared.Assignment; import javax.annotation.concurrent.Immutable; import java.io.File; diff --git a/airship-agent/src/main/java/io/airlift/airship/agent/DeploymentManager.java b/airship-agent/src/main/java/io/airlift/airship/agent/DeploymentManager.java index d1461bd9..7d4ebd07 100644 --- a/airship-agent/src/main/java/io/airlift/airship/agent/DeploymentManager.java +++ b/airship-agent/src/main/java/io/airlift/airship/agent/DeploymentManager.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; -import com.proofpoint.galaxy.shared.Installation; +import io.airlift.airship.shared.Installation; import java.util.UUID; diff --git a/airship-agent/src/main/java/io/airlift/airship/agent/DeploymentManagerFactory.java b/airship-agent/src/main/java/io/airlift/airship/agent/DeploymentManagerFactory.java index a9d16364..383f7425 100644 --- a/airship-agent/src/main/java/io/airlift/airship/agent/DeploymentManagerFactory.java +++ b/airship-agent/src/main/java/io/airlift/airship/agent/DeploymentManagerFactory.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; -import com.proofpoint.galaxy.shared.Installation; +import io.airlift.airship.shared.Installation; import java.util.List; diff --git a/airship-agent/src/main/java/io/airlift/airship/agent/DeploymentRepresentation.java b/airship-agent/src/main/java/io/airlift/airship/agent/DeploymentRepresentation.java index 117a3f46..aac1ed3e 100644 --- a/airship-agent/src/main/java/io/airlift/airship/agent/DeploymentRepresentation.java +++ b/airship-agent/src/main/java/io/airlift/airship/agent/DeploymentRepresentation.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; -import com.proofpoint.galaxy.shared.AssignmentRepresentation; +import io.airlift.airship.shared.AssignmentRepresentation; import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; diff --git a/airship-agent/src/main/java/io/airlift/airship/agent/DeploymentSlot.java b/airship-agent/src/main/java/io/airlift/airship/agent/DeploymentSlot.java index da3555e0..738a46bc 100644 --- a/airship-agent/src/main/java/io/airlift/airship/agent/DeploymentSlot.java +++ b/airship-agent/src/main/java/io/airlift/airship/agent/DeploymentSlot.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.proofpoint.galaxy.shared.SlotLifecycleState; -import com.proofpoint.galaxy.shared.SlotStatus; -import com.proofpoint.galaxy.shared.Installation; +import io.airlift.airship.shared.SlotLifecycleState; +import io.airlift.airship.shared.SlotStatus; +import io.airlift.airship.shared.Installation; import com.proofpoint.log.Logger; import com.proofpoint.units.Duration; @@ -30,10 +30,10 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.ReentrantLock; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.STOPPED; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.TERMINATED; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.UNKNOWN; -import static com.proofpoint.galaxy.shared.SlotStatus.createSlotStatus; +import static io.airlift.airship.shared.SlotLifecycleState.STOPPED; +import static io.airlift.airship.shared.SlotLifecycleState.TERMINATED; +import static io.airlift.airship.shared.SlotLifecycleState.UNKNOWN; +import static io.airlift.airship.shared.SlotStatus.createSlotStatus; public class DeploymentSlot implements Slot { diff --git a/airship-agent/src/main/java/io/airlift/airship/agent/DirectoryDeploymentManager.java b/airship-agent/src/main/java/io/airlift/airship/agent/DirectoryDeploymentManager.java index 94891d3e..2ac6514a 100644 --- a/airship-agent/src/main/java/io/airlift/airship/agent/DirectoryDeploymentManager.java +++ b/airship-agent/src/main/java/io/airlift/airship/agent/DirectoryDeploymentManager.java @@ -1,13 +1,13 @@ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.google.common.base.Preconditions; import com.google.common.io.Files; import com.google.common.io.Resources; -import com.proofpoint.galaxy.shared.ConfigUtils; +import io.airlift.airship.shared.ConfigUtils; import com.proofpoint.json.JsonCodec; -import com.proofpoint.galaxy.shared.Assignment; -import com.proofpoint.galaxy.shared.CommandFailedException; -import com.proofpoint.galaxy.shared.Installation; +import io.airlift.airship.shared.Assignment; +import io.airlift.airship.shared.CommandFailedException; +import io.airlift.airship.shared.Installation; import com.proofpoint.log.Logger; import com.proofpoint.units.Duration; @@ -19,10 +19,10 @@ import static com.google.common.base.Charsets.UTF_8; import static com.proofpoint.json.JsonCodec.jsonCodec; -import static com.proofpoint.galaxy.shared.FileUtils.createTempDir; -import static com.proofpoint.galaxy.shared.FileUtils.deleteRecursively; -import static com.proofpoint.galaxy.shared.FileUtils.extractTar; -import static com.proofpoint.galaxy.shared.FileUtils.listFiles; +import static io.airlift.airship.shared.FileUtils.createTempDir; +import static io.airlift.airship.shared.FileUtils.deleteRecursively; +import static io.airlift.airship.shared.FileUtils.extractTar; +import static io.airlift.airship.shared.FileUtils.listFiles; public class DirectoryDeploymentManager implements DeploymentManager { @@ -50,7 +50,7 @@ public DirectoryDeploymentManager(File baseDir, String location, Duration tarTim this.baseDir = baseDir; // verify deployment file is readable and writable - deploymentFile = new File(baseDir, "galaxy-deployment.json"); + deploymentFile = new File(baseDir, "airship-deployment.json"); if (deploymentFile.exists()) { Preconditions.checkArgument(deploymentFile.canRead(), "Can not read slot-id file %s", deploymentFile.getAbsolutePath()); Preconditions.checkArgument(deploymentFile.canWrite(), "Can not write slot-id file %s", deploymentFile.getAbsolutePath()); @@ -69,7 +69,7 @@ public DirectoryDeploymentManager(File baseDir, String location, Duration tarTim } // load slot-id - File slotIdFile = new File(baseDir, "galaxy-slot-id.txt"); + File slotIdFile = new File(baseDir, "airship-slot-id.txt"); UUID uuid = null; if (slotIdFile.exists()) { Preconditions.checkArgument(slotIdFile.canRead(), "can not read " + slotIdFile.getAbsolutePath()); @@ -82,7 +82,7 @@ public DirectoryDeploymentManager(File baseDir, String location, Duration tarTim } if (uuid == null) { - log.warn("Invalid slot id [" + slotIdString + "]: attempting to delete galaxy-slot-id.txt file and recreating a new one"); + log.warn("Invalid slot id [" + slotIdString + "]: attempting to delete airship-slot-id.txt file and recreating a new one"); slotIdFile.delete(); } } @@ -130,7 +130,7 @@ public Deployment install(Installation installation) File tempDir = createTempDir(baseDir, "tmp-install"); try { // download the binary - File binary = new File(tempDir, "galaxy-binary.tar.gz"); + File binary = new File(tempDir, "airship-binary.tar.gz"); try { Files.copy(Resources.newInputStreamSupplier(installation.getBinaryFile().toURL()), binary); } diff --git a/airship-agent/src/main/java/io/airlift/airship/agent/DirectoryDeploymentManagerFactory.java b/airship-agent/src/main/java/io/airlift/airship/agent/DirectoryDeploymentManagerFactory.java index e4c4239e..2613acce 100644 --- a/airship-agent/src/main/java/io/airlift/airship/agent/DirectoryDeploymentManagerFactory.java +++ b/airship-agent/src/main/java/io/airlift/airship/agent/DirectoryDeploymentManagerFactory.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.google.common.base.Function; import com.google.common.base.Preconditions; @@ -6,9 +6,9 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.inject.Inject; -import com.proofpoint.galaxy.shared.FileUtils; -import com.proofpoint.galaxy.shared.Installation; -import com.proofpoint.galaxy.shared.MavenCoordinates; +import io.airlift.airship.shared.FileUtils; +import io.airlift.airship.shared.Installation; +import io.airlift.airship.shared.MavenCoordinates; import com.proofpoint.node.NodeInfo; import com.proofpoint.units.Duration; @@ -17,7 +17,7 @@ import java.util.List; import java.util.Set; -import static com.proofpoint.galaxy.shared.FileUtils.listFiles; +import static io.airlift.airship.shared.FileUtils.listFiles; public class DirectoryDeploymentManagerFactory implements DeploymentManagerFactory { @@ -53,7 +53,7 @@ public List loadSlots() { ImmutableList.Builder builder = ImmutableList.builder(); for (File dir : listFiles(slotDir)) { - if (dir.isDirectory() && new File(dir, "galaxy-slot-id.txt").canRead()) { + if (dir.isDirectory() && new File(dir, "airship-slot-id.txt").canRead()) { DirectoryDeploymentManager deploymentManager = new DirectoryDeploymentManager(dir, location + "/" + dir.getName(), tarTimeout); builder.add(deploymentManager); } diff --git a/airship-agent/src/main/java/io/airlift/airship/agent/LauncherLifecycleManager.java b/airship-agent/src/main/java/io/airlift/airship/agent/LauncherLifecycleManager.java index 40b1d8e6..9c8b9a4a 100644 --- a/airship-agent/src/main/java/io/airlift/airship/agent/LauncherLifecycleManager.java +++ b/airship-agent/src/main/java/io/airlift/airship/agent/LauncherLifecycleManager.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.google.common.base.Charsets; import com.google.common.base.Joiner; @@ -7,9 +7,9 @@ import com.google.common.net.InetAddresses; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.google.inject.Inject; -import com.proofpoint.galaxy.shared.Command; -import com.proofpoint.galaxy.shared.CommandFailedException; -import com.proofpoint.galaxy.shared.SlotLifecycleState; +import io.airlift.airship.shared.Command; +import io.airlift.airship.shared.CommandFailedException; +import io.airlift.airship.shared.SlotLifecycleState; import com.proofpoint.http.server.HttpServerInfo; import com.proofpoint.log.Logger; import com.proofpoint.node.NodeInfo; @@ -22,10 +22,10 @@ import java.util.concurrent.Executor; import java.util.concurrent.Executors; -import static com.proofpoint.galaxy.shared.HttpUriBuilder.uriBuilderFrom; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.RUNNING; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.STOPPED; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.UNKNOWN; +import static io.airlift.airship.shared.HttpUriBuilder.uriBuilderFrom; +import static io.airlift.airship.shared.SlotLifecycleState.RUNNING; +import static io.airlift.airship.shared.SlotLifecycleState.STOPPED; +import static io.airlift.airship.shared.SlotLifecycleState.UNKNOWN; public class LauncherLifecycleManager implements LifecycleManager { diff --git a/airship-agent/src/main/java/io/airlift/airship/agent/LifecycleManager.java b/airship-agent/src/main/java/io/airlift/airship/agent/LifecycleManager.java index 8f4f4d97..5a7aa578 100644 --- a/airship-agent/src/main/java/io/airlift/airship/agent/LifecycleManager.java +++ b/airship-agent/src/main/java/io/airlift/airship/agent/LifecycleManager.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; -import com.proofpoint.galaxy.shared.SlotLifecycleState; +import io.airlift.airship.shared.SlotLifecycleState; public interface LifecycleManager { diff --git a/airship-agent/src/main/java/io/airlift/airship/agent/LifecycleResource.java b/airship-agent/src/main/java/io/airlift/airship/agent/LifecycleResource.java index 80a1a988..49abb210 100644 --- a/airship-agent/src/main/java/io/airlift/airship/agent/LifecycleResource.java +++ b/airship-agent/src/main/java/io/airlift/airship/agent/LifecycleResource.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.google.common.base.Preconditions; import com.google.inject.Inject; -import com.proofpoint.galaxy.shared.SlotStatus; -import com.proofpoint.galaxy.shared.SlotStatusRepresentation; +import io.airlift.airship.shared.SlotStatus; +import io.airlift.airship.shared.SlotStatusRepresentation; import javax.ws.rs.HeaderParam; import javax.ws.rs.PUT; @@ -28,9 +28,9 @@ import java.util.UUID; -import static com.proofpoint.galaxy.shared.VersionsUtil.checkSlotVersion; -import static com.proofpoint.galaxy.shared.VersionsUtil.GALAXY_AGENT_VERSION_HEADER; -import static com.proofpoint.galaxy.shared.VersionsUtil.GALAXY_SLOT_VERSION_HEADER; +import static io.airlift.airship.shared.VersionsUtil.checkSlotVersion; +import static io.airlift.airship.shared.VersionsUtil.AIRSHIP_AGENT_VERSION_HEADER; +import static io.airlift.airship.shared.VersionsUtil.AIRSHIP_SLOT_VERSION_HEADER; @Path("/v1/agent/slot/{slotId}/lifecycle") public class LifecycleResource @@ -47,7 +47,7 @@ public LifecycleResource(Agent agent) @PUT @Produces(MediaType.APPLICATION_JSON) - public Response setState(@HeaderParam(GALAXY_SLOT_VERSION_HEADER) String slotVersion, + public Response setState(@HeaderParam(AIRSHIP_SLOT_VERSION_HEADER) String slotVersion, @PathParam("slotId") UUID slotId, String newState) { @@ -75,8 +75,8 @@ else if ("stopped".equals(newState)) { return Response.status(Response.Status.BAD_REQUEST).build(); } return Response.ok(SlotStatusRepresentation.from(status)) - .header(GALAXY_AGENT_VERSION_HEADER, agent.getAgentStatus().getVersion()) - .header(GALAXY_SLOT_VERSION_HEADER, status.getVersion()) + .header(AIRSHIP_AGENT_VERSION_HEADER, agent.getAgentStatus().getVersion()) + .header(AIRSHIP_SLOT_VERSION_HEADER, status.getVersion()) .build(); } } diff --git a/airship-agent/src/main/java/io/airlift/airship/agent/LockTimeoutException.java b/airship-agent/src/main/java/io/airlift/airship/agent/LockTimeoutException.java index 30a91b10..c366d89b 100644 --- a/airship-agent/src/main/java/io/airlift/airship/agent/LockTimeoutException.java +++ b/airship-agent/src/main/java/io/airlift/airship/agent/LockTimeoutException.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.google.common.base.Joiner; import com.proofpoint.units.Duration; diff --git a/airship-agent/src/main/java/io/airlift/airship/agent/ServiceInventoryResource.java b/airship-agent/src/main/java/io/airlift/airship/agent/ServiceInventoryResource.java index cc4326b0..3231d25b 100644 --- a/airship-agent/src/main/java/io/airlift/airship/agent/ServiceInventoryResource.java +++ b/airship-agent/src/main/java/io/airlift/airship/agent/ServiceInventoryResource.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.google.common.collect.ImmutableList; import com.proofpoint.discovery.client.DiscoveryException; diff --git a/airship-agent/src/main/java/io/airlift/airship/agent/Slot.java b/airship-agent/src/main/java/io/airlift/airship/agent/Slot.java index db4255f6..b409e365 100644 --- a/airship-agent/src/main/java/io/airlift/airship/agent/Slot.java +++ b/airship-agent/src/main/java/io/airlift/airship/agent/Slot.java @@ -1,7 +1,7 @@ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; -import com.proofpoint.galaxy.shared.SlotStatus; -import com.proofpoint.galaxy.shared.Installation; +import io.airlift.airship.shared.SlotStatus; +import io.airlift.airship.shared.Installation; import java.net.URI; import java.util.UUID; diff --git a/airship-agent/src/main/java/io/airlift/airship/agent/SlotResource.java b/airship-agent/src/main/java/io/airlift/airship/agent/SlotResource.java index 3808d390..cb8935f4 100644 --- a/airship-agent/src/main/java/io/airlift/airship/agent/SlotResource.java +++ b/airship-agent/src/main/java/io/airlift/airship/agent/SlotResource.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.inject.Inject; -import com.proofpoint.galaxy.shared.InstallationRepresentation; -import com.proofpoint.galaxy.shared.SlotStatus; -import com.proofpoint.galaxy.shared.SlotStatusRepresentation; +import io.airlift.airship.shared.InstallationRepresentation; +import io.airlift.airship.shared.SlotStatus; +import io.airlift.airship.shared.SlotStatusRepresentation; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; @@ -36,11 +36,11 @@ import java.util.List; import java.util.UUID; -import static com.proofpoint.galaxy.shared.HttpUriBuilder.uriBuilderFrom; -import static com.proofpoint.galaxy.shared.VersionsUtil.checkAgentVersion; -import static com.proofpoint.galaxy.shared.VersionsUtil.checkSlotVersion; -import static com.proofpoint.galaxy.shared.VersionsUtil.GALAXY_AGENT_VERSION_HEADER; -import static com.proofpoint.galaxy.shared.VersionsUtil.GALAXY_SLOT_VERSION_HEADER; +import static io.airlift.airship.shared.HttpUriBuilder.uriBuilderFrom; +import static io.airlift.airship.shared.VersionsUtil.checkAgentVersion; +import static io.airlift.airship.shared.VersionsUtil.checkSlotVersion; +import static io.airlift.airship.shared.VersionsUtil.AIRSHIP_AGENT_VERSION_HEADER; +import static io.airlift.airship.shared.VersionsUtil.AIRSHIP_SLOT_VERSION_HEADER; @Path("/v1/agent/slot") public class SlotResource @@ -58,7 +58,7 @@ public SlotResource(Agent agent) @POST @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) - public Response installSlot(@HeaderParam(GALAXY_AGENT_VERSION_HEADER) String agentVersion, InstallationRepresentation installation, @Context UriInfo uriInfo) + public Response installSlot(@HeaderParam(AIRSHIP_AGENT_VERSION_HEADER) String agentVersion, InstallationRepresentation installation, @Context UriInfo uriInfo) { Preconditions.checkNotNull(installation, "installation must not be null"); @@ -69,15 +69,15 @@ public Response installSlot(@HeaderParam(GALAXY_AGENT_VERSION_HEADER) String age return Response .created(getSelfUri(slotStatus.getId(), uriInfo.getBaseUri())) .entity(SlotStatusRepresentation.from(slotStatus)) - .header(GALAXY_AGENT_VERSION_HEADER, agent.getAgentStatus().getVersion()) - .header(GALAXY_SLOT_VERSION_HEADER, slotStatus.getVersion()) + .header(AIRSHIP_AGENT_VERSION_HEADER, agent.getAgentStatus().getVersion()) + .header(AIRSHIP_SLOT_VERSION_HEADER, slotStatus.getVersion()) .build(); } @Path("{slotId}") @DELETE - public Response terminateSlot(@HeaderParam(GALAXY_AGENT_VERSION_HEADER) String agentVersion, - @HeaderParam(GALAXY_SLOT_VERSION_HEADER) String slotVersion, + public Response terminateSlot(@HeaderParam(AIRSHIP_AGENT_VERSION_HEADER) String agentVersion, + @HeaderParam(AIRSHIP_SLOT_VERSION_HEADER) String slotVersion, @PathParam("slotId") UUID slotId) { Preconditions.checkNotNull(slotId, "slotId must not be null"); @@ -96,8 +96,8 @@ public Response terminateSlot(@HeaderParam(GALAXY_AGENT_VERSION_HEADER) String a } return Response.ok(SlotStatusRepresentation.from(slotStatus)) - .header(GALAXY_AGENT_VERSION_HEADER, agent.getAgentStatus().getVersion()) - .header(GALAXY_SLOT_VERSION_HEADER, slotStatus.getVersion()) + .header(AIRSHIP_AGENT_VERSION_HEADER, agent.getAgentStatus().getVersion()) + .header(AIRSHIP_SLOT_VERSION_HEADER, slotStatus.getVersion()) .build(); } @@ -115,8 +115,8 @@ public Response getSlotStatus(@PathParam("slotId") UUID slotId, @Context UriInfo SlotStatus slotStatus = slot.status(); return Response.ok(SlotStatusRepresentation.from(slotStatus)) - .header(GALAXY_AGENT_VERSION_HEADER, agent.getAgentStatus().getVersion()) - .header(GALAXY_SLOT_VERSION_HEADER, slotStatus.getVersion()) + .header(AIRSHIP_AGENT_VERSION_HEADER, agent.getAgentStatus().getVersion()) + .header(AIRSHIP_SLOT_VERSION_HEADER, slotStatus.getVersion()) .build(); } @@ -130,7 +130,7 @@ public Response getAllSlotsStatus(@Context UriInfo uriInfo) representations.add(SlotStatusRepresentation.from(slotStatus)); } return Response.ok(representations) - .header(GALAXY_AGENT_VERSION_HEADER, agent.getAgentStatus().getVersion()) + .header(AIRSHIP_AGENT_VERSION_HEADER, agent.getAgentStatus().getVersion()) .build(); } diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/AbstractDeploymentManagerTest.java b/airship-agent/src/test/java/io/airlift/airship/agent/AbstractDeploymentManagerTest.java index 087cf3a8..d9b1c1c1 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/AbstractDeploymentManagerTest.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/AbstractDeploymentManagerTest.java @@ -1,6 +1,6 @@ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; -import com.proofpoint.galaxy.shared.Installation; +import io.airlift.airship.shared.Installation; import org.testng.annotations.Test; import static org.testng.Assert.assertEquals; diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/AbstractLifecycleManagerTest.java b/airship-agent/src/test/java/io/airlift/airship/agent/AbstractLifecycleManagerTest.java index 2795d55f..1d5c7326 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/AbstractLifecycleManagerTest.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/AbstractLifecycleManagerTest.java @@ -1,9 +1,9 @@ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import org.testng.annotations.Test; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.RUNNING; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.STOPPED; +import static io.airlift.airship.shared.SlotLifecycleState.RUNNING; +import static io.airlift.airship.shared.SlotLifecycleState.STOPPED; import static org.testng.Assert.assertEquals; public abstract class AbstractLifecycleManagerTest diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/MockDeploymentManager.java b/airship-agent/src/test/java/io/airlift/airship/agent/MockDeploymentManager.java index c322fafe..8c9215a8 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/MockDeploymentManager.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/MockDeploymentManager.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.google.common.base.Preconditions; -import com.proofpoint.galaxy.shared.Installation; +import io.airlift.airship.shared.Installation; import java.io.File; import java.util.UUID; diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/MockDeploymentManagerFactory.java b/airship-agent/src/test/java/io/airlift/airship/agent/MockDeploymentManagerFactory.java index c3408424..2eb5edb2 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/MockDeploymentManagerFactory.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/MockDeploymentManagerFactory.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.google.common.collect.ImmutableList; -import com.proofpoint.galaxy.shared.Installation; +import io.airlift.airship.shared.Installation; import java.util.List; diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/MockLifecycleManager.java b/airship-agent/src/test/java/io/airlift/airship/agent/MockLifecycleManager.java index 834dad69..2c1681f2 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/MockLifecycleManager.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/MockLifecycleManager.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.google.common.collect.Sets; -import com.proofpoint.galaxy.shared.SlotLifecycleState; +import io.airlift.airship.shared.SlotLifecycleState; import java.util.Map; import java.util.Set; diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/ResourcesUtil.java b/airship-agent/src/test/java/io/airlift/airship/agent/ResourcesUtil.java index 4c1f8b42..c9bf036d 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/ResourcesUtil.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/ResourcesUtil.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.google.common.collect.ImmutableMap; diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/TestAgent.java b/airship-agent/src/test/java/io/airlift/airship/agent/TestAgent.java index 6227074e..d19ce0e6 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/TestAgent.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/TestAgent.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.proofpoint.http.server.HttpServerConfig; import com.proofpoint.http.server.HttpServerInfo; @@ -9,7 +9,7 @@ import java.io.File; import java.net.InetAddress; -import static com.proofpoint.galaxy.agent.ResourcesUtil.TEST_RESOURCES; +import static io.airlift.airship.agent.ResourcesUtil.TEST_RESOURCES; import static org.testng.Assert.assertEquals; public class TestAgent diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/TestAgentConfig.java b/airship-agent/src/test/java/io/airlift/airship/agent/TestAgentConfig.java index 27c631a7..d1f230be 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/TestAgentConfig.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/TestAgentConfig.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.google.common.collect.ImmutableMap; import com.proofpoint.configuration.testing.ConfigAssertions; diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/TestAgentResource.java b/airship-agent/src/test/java/io/airlift/airship/agent/TestAgentResource.java index 9ed5f1e4..82e657db 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/TestAgentResource.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/TestAgentResource.java @@ -1,6 +1,6 @@ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; -import com.proofpoint.galaxy.shared.AgentStatusRepresentation; +import io.airlift.airship.shared.AgentStatusRepresentation; import com.proofpoint.http.server.HttpServerConfig; import com.proofpoint.http.server.HttpServerInfo; import com.proofpoint.node.NodeInfo; @@ -10,8 +10,8 @@ import javax.ws.rs.core.Response; import java.io.File; -import static com.proofpoint.galaxy.agent.ResourcesUtil.TEST_RESOURCES; -import static com.proofpoint.galaxy.shared.AgentLifecycleState.ONLINE; +import static io.airlift.airship.agent.ResourcesUtil.TEST_RESOURCES; +import static io.airlift.airship.shared.AgentLifecycleState.ONLINE; import static org.testng.Assert.assertEquals; public class TestAgentResource diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/TestAssignmentResource.java b/airship-agent/src/test/java/io/airlift/airship/agent/TestAssignmentResource.java index 31c48b68..b0e6e7ba 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/TestAssignmentResource.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/TestAssignmentResource.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.google.common.collect.ImmutableMap; -import com.proofpoint.galaxy.shared.Assignment; -import com.proofpoint.galaxy.shared.AssignmentRepresentation; -import com.proofpoint.galaxy.shared.InstallationRepresentation; -import com.proofpoint.galaxy.shared.SlotStatus; -import com.proofpoint.galaxy.shared.SlotStatusRepresentation; -import com.proofpoint.galaxy.shared.VersionConflictException; +import io.airlift.airship.shared.Assignment; +import io.airlift.airship.shared.AssignmentRepresentation; +import io.airlift.airship.shared.InstallationRepresentation; +import io.airlift.airship.shared.SlotStatus; +import io.airlift.airship.shared.SlotStatusRepresentation; +import io.airlift.airship.shared.VersionConflictException; import com.proofpoint.http.server.HttpServerConfig; import com.proofpoint.http.server.HttpServerInfo; import com.proofpoint.node.NodeInfo; @@ -31,10 +31,10 @@ import java.io.File; import java.util.UUID; -import static com.proofpoint.galaxy.shared.VersionsUtil.GALAXY_AGENT_VERSION_HEADER; -import static com.proofpoint.galaxy.shared.InstallationHelper.APPLE_INSTALLATION; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.STOPPED; -import static com.proofpoint.galaxy.shared.VersionsUtil.GALAXY_SLOT_VERSION_HEADER; +import static io.airlift.airship.shared.VersionsUtil.AIRSHIP_AGENT_VERSION_HEADER; +import static io.airlift.airship.shared.InstallationHelper.APPLE_INSTALLATION; +import static io.airlift.airship.shared.SlotLifecycleState.STOPPED; +import static io.airlift.airship.shared.VersionsUtil.AIRSHIP_SLOT_VERSION_HEADER; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; import static org.testng.Assert.fail; @@ -101,7 +101,7 @@ public void testAssignInvalidVersion() fail("Expected VersionConflictException"); } catch (VersionConflictException e) { - assertEquals(e.getName(), GALAXY_AGENT_VERSION_HEADER); + assertEquals(e.getName(), AIRSHIP_AGENT_VERSION_HEADER); assertEquals(e.getVersion(), agent.getAgentStatus().getVersion()); } try { @@ -109,7 +109,7 @@ public void testAssignInvalidVersion() fail("Expected VersionConflictException"); } catch (VersionConflictException e) { - assertEquals(e.getName(), GALAXY_SLOT_VERSION_HEADER); + assertEquals(e.getName(), AIRSHIP_SLOT_VERSION_HEADER); assertEquals(e.getVersion(), slotStatus.getVersion()); } } @@ -151,8 +151,8 @@ private void assertUpgrade(SlotStatus slotStatus, String agentVersion, String sl SlotStatus expectedStatus = slotStatus.changeAssignment(STOPPED, APPLE_V2, slotStatus.getResources()); assertEquals(actualStatus, SlotStatusRepresentation.from(expectedStatus)); assertEquals(actualStatus.toSlotStatus(null), expectedStatus); - assertEquals(response.getMetadata().get(GALAXY_AGENT_VERSION_HEADER).get(0), agent.getAgentStatus().getVersion()); - assertEquals(response.getMetadata().get(GALAXY_SLOT_VERSION_HEADER).get(0), expectedStatus.getVersion()); + assertEquals(response.getMetadata().get(AIRSHIP_AGENT_VERSION_HEADER).get(0), agent.getAgentStatus().getVersion()); + assertEquals(response.getMetadata().get(AIRSHIP_SLOT_VERSION_HEADER).get(0), expectedStatus.getVersion()); assertNull(response.getMetadata().get("Content-Type")); // content type is set by jersey based on @Produces } } diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/TestCommand.java b/airship-agent/src/test/java/io/airlift/airship/agent/TestCommand.java index 04d02f8f..5081fc65 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/TestCommand.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/TestCommand.java @@ -1,11 +1,11 @@ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import com.proofpoint.galaxy.shared.Command; -import com.proofpoint.galaxy.shared.CommandFailedException; -import com.proofpoint.galaxy.shared.CommandTimeoutException; +import io.airlift.airship.shared.Command; +import io.airlift.airship.shared.CommandFailedException; +import io.airlift.airship.shared.CommandTimeoutException; import com.proofpoint.testing.EquivalenceTester; import com.proofpoint.units.Duration; import org.testng.annotations.AfterClass; diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/TestDeployment.java b/airship-agent/src/test/java/io/airlift/airship/agent/TestDeployment.java index 5c6ab38c..4144215c 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/TestDeployment.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/TestDeployment.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.google.common.collect.ImmutableMap; import com.proofpoint.testing.EquivalenceTester; @@ -20,8 +20,8 @@ import java.io.File; import java.util.UUID; -import static com.proofpoint.galaxy.shared.AssignmentHelper.APPLE_ASSIGNMENT; -import static com.proofpoint.galaxy.shared.AssignmentHelper.BANANA_ASSIGNMENT; +import static io.airlift.airship.shared.AssignmentHelper.APPLE_ASSIGNMENT; +import static io.airlift.airship.shared.AssignmentHelper.BANANA_ASSIGNMENT; import static java.util.Arrays.asList; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/TestDeploymentRepresentation.java b/airship-agent/src/test/java/io/airlift/airship/agent/TestDeploymentRepresentation.java index 4725827a..aaa9f024 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/TestDeploymentRepresentation.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/TestDeploymentRepresentation.java @@ -11,19 +11,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.google.common.base.Charsets; import com.google.common.collect.ImmutableMap; import com.google.common.io.Resources; import com.proofpoint.json.JsonCodec; -import com.proofpoint.galaxy.shared.AssignmentRepresentation; +import io.airlift.airship.shared.AssignmentRepresentation; import org.testng.annotations.Test; import java.util.UUID; import static com.proofpoint.json.JsonCodec.jsonCodec; -import static com.proofpoint.galaxy.shared.AssignmentHelper.APPLE_ASSIGNMENT; +import static io.airlift.airship.shared.AssignmentHelper.APPLE_ASSIGNMENT; import static org.testng.Assert.assertEquals; public class TestDeploymentRepresentation diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/TestDirectoryDeploymentManager.java b/airship-agent/src/test/java/io/airlift/airship/agent/TestDirectoryDeploymentManager.java index 004c3dad..9d90a792 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/TestDirectoryDeploymentManager.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/TestDirectoryDeploymentManager.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.google.common.io.Files; -import com.proofpoint.galaxy.shared.InstallationHelper; +import io.airlift.airship.shared.InstallationHelper; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import java.io.File; -import static com.proofpoint.galaxy.shared.FileUtils.deleteRecursively; +import static io.airlift.airship.shared.FileUtils.deleteRecursively; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; import static org.testng.Assert.fail; diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/TestInstallation.java b/airship-agent/src/test/java/io/airlift/airship/agent/TestInstallation.java index c12813fd..ad8b7793 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/TestInstallation.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/TestInstallation.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.google.common.collect.ImmutableMap; -import com.proofpoint.galaxy.shared.Installation; +import io.airlift.airship.shared.Installation; import com.proofpoint.testing.EquivalenceTester; import org.testng.annotations.Test; import java.net.URI; -import static com.proofpoint.galaxy.shared.AssignmentHelper.APPLE_ASSIGNMENT; -import static com.proofpoint.galaxy.shared.AssignmentHelper.BANANA_ASSIGNMENT; +import static io.airlift.airship.shared.AssignmentHelper.APPLE_ASSIGNMENT; +import static io.airlift.airship.shared.AssignmentHelper.BANANA_ASSIGNMENT; import static java.util.Arrays.asList; import static org.testng.Assert.assertEquals; diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/TestInstallationRepresentation.java b/airship-agent/src/test/java/io/airlift/airship/agent/TestInstallationRepresentation.java index 93610ae9..76b70d11 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/TestInstallationRepresentation.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/TestInstallationRepresentation.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.google.common.base.Charsets; import com.google.common.collect.ImmutableMap; import com.google.common.io.Resources; import com.proofpoint.json.JsonCodec; -import com.proofpoint.galaxy.shared.AssignmentRepresentation; -import com.proofpoint.galaxy.shared.InstallationRepresentation; +import io.airlift.airship.shared.AssignmentRepresentation; +import io.airlift.airship.shared.InstallationRepresentation; import org.testng.annotations.Test; import static com.proofpoint.json.JsonCodec.jsonCodec; -import static com.proofpoint.galaxy.shared.AssignmentHelper.APPLE_ASSIGNMENT; +import static io.airlift.airship.shared.AssignmentHelper.APPLE_ASSIGNMENT; import static org.testng.Assert.assertEquals; public class TestInstallationRepresentation diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/TestLauncherLifecycleManager.java b/airship-agent/src/test/java/io/airlift/airship/agent/TestLauncherLifecycleManager.java index 7ad317f8..e19ed5d0 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/TestLauncherLifecycleManager.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/TestLauncherLifecycleManager.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.google.common.base.Charsets; import com.google.common.collect.ImmutableMap; import com.google.common.io.Files; -import com.proofpoint.galaxy.shared.ArchiveHelper; -import com.proofpoint.galaxy.shared.Assignment; +import io.airlift.airship.shared.ArchiveHelper; +import io.airlift.airship.shared.Assignment; import com.proofpoint.http.server.HttpServerConfig; import com.proofpoint.http.server.HttpServerInfo; import com.proofpoint.node.NodeInfo; @@ -35,11 +35,11 @@ import static com.google.common.io.Resources.getResource; import static com.google.common.io.Resources.newInputStreamSupplier; -import static com.proofpoint.galaxy.shared.AssignmentHelper.APPLE_ASSIGNMENT; -import static com.proofpoint.galaxy.shared.AssignmentHelper.BANANA_ASSIGNMENT; -import static com.proofpoint.galaxy.shared.FileUtils.deleteRecursively; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.RUNNING; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.STOPPED; +import static io.airlift.airship.shared.AssignmentHelper.APPLE_ASSIGNMENT; +import static io.airlift.airship.shared.AssignmentHelper.BANANA_ASSIGNMENT; +import static io.airlift.airship.shared.FileUtils.deleteRecursively; +import static io.airlift.airship.shared.SlotLifecycleState.RUNNING; +import static io.airlift.airship.shared.SlotLifecycleState.STOPPED; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/TestLifecycleResource.java b/airship-agent/src/test/java/io/airlift/airship/agent/TestLifecycleResource.java index 9cdaeba4..891dc292 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/TestLifecycleResource.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/TestLifecycleResource.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; -import com.proofpoint.galaxy.shared.SlotLifecycleState; -import com.proofpoint.galaxy.shared.SlotStatus; -import com.proofpoint.galaxy.shared.SlotStatusRepresentation; -import com.proofpoint.galaxy.shared.VersionConflictException; +import io.airlift.airship.shared.SlotLifecycleState; +import io.airlift.airship.shared.SlotStatus; +import io.airlift.airship.shared.SlotStatusRepresentation; +import io.airlift.airship.shared.VersionConflictException; import com.proofpoint.http.server.HttpServerConfig; import com.proofpoint.http.server.HttpServerInfo; import com.proofpoint.node.NodeInfo; @@ -27,12 +27,12 @@ import java.io.File; import java.util.UUID; -import static com.proofpoint.galaxy.shared.VersionsUtil.GALAXY_AGENT_VERSION_HEADER; -import static com.proofpoint.galaxy.shared.AssignmentHelper.APPLE_ASSIGNMENT; -import static com.proofpoint.galaxy.shared.InstallationHelper.APPLE_INSTALLATION; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.RUNNING; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.STOPPED; -import static com.proofpoint.galaxy.shared.VersionsUtil.GALAXY_SLOT_VERSION_HEADER; +import static io.airlift.airship.shared.VersionsUtil.AIRSHIP_AGENT_VERSION_HEADER; +import static io.airlift.airship.shared.AssignmentHelper.APPLE_ASSIGNMENT; +import static io.airlift.airship.shared.InstallationHelper.APPLE_INSTALLATION; +import static io.airlift.airship.shared.SlotLifecycleState.RUNNING; +import static io.airlift.airship.shared.SlotLifecycleState.STOPPED; +import static io.airlift.airship.shared.VersionsUtil.AIRSHIP_SLOT_VERSION_HEADER; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; import static org.testng.Assert.fail; @@ -160,7 +160,7 @@ public void testInvalidVersion() fail("Expected VersionConflictException"); } catch (VersionConflictException e) { - assertEquals(e.getName(), GALAXY_SLOT_VERSION_HEADER); + assertEquals(e.getName(), AIRSHIP_SLOT_VERSION_HEADER); assertEquals(e.getVersion(), slot.status().getVersion()); } } @@ -171,8 +171,8 @@ private void assertOkResponse(Response response, SlotLifecycleState state) SlotStatusRepresentation expectedStatus = SlotStatusRepresentation.from(slot.status().changeState(state)); assertEquals(response.getEntity(), expectedStatus); assertEquals(slot.status().getAssignment(), APPLE_ASSIGNMENT); - assertEquals(response.getMetadata().get(GALAXY_AGENT_VERSION_HEADER).get(0), agent.getAgentStatus().getVersion()); - assertEquals(response.getMetadata().get(GALAXY_SLOT_VERSION_HEADER).get(0), expectedStatus.getVersion()); + assertEquals(response.getMetadata().get(AIRSHIP_AGENT_VERSION_HEADER).get(0), agent.getAgentStatus().getVersion()); + assertEquals(response.getMetadata().get(AIRSHIP_SLOT_VERSION_HEADER).get(0), expectedStatus.getVersion()); assertNull(response.getMetadata().get("Content-Type")); // content type is set by jersey based on @Produces } } diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/TestMockDeploymentManager.java b/airship-agent/src/test/java/io/airlift/airship/agent/TestMockDeploymentManager.java index 6521caa0..fd86369d 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/TestMockDeploymentManager.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/TestMockDeploymentManager.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; -import com.proofpoint.galaxy.shared.InstallationHelper; +import io.airlift.airship.shared.InstallationHelper; import org.testng.annotations.BeforeMethod; public class TestMockDeploymentManager extends AbstractDeploymentManagerTest diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/TestMockLifecycleManager.java b/airship-agent/src/test/java/io/airlift/airship/agent/TestMockLifecycleManager.java index 8693aea6..6ef6e045 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/TestMockLifecycleManager.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/TestMockLifecycleManager.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.google.common.collect.ImmutableMap; import org.testng.annotations.BeforeMethod; @@ -19,8 +19,8 @@ import java.io.File; import java.util.UUID; -import static com.proofpoint.galaxy.shared.AssignmentHelper.APPLE_ASSIGNMENT; -import static com.proofpoint.galaxy.shared.AssignmentHelper.BANANA_ASSIGNMENT; +import static io.airlift.airship.shared.AssignmentHelper.APPLE_ASSIGNMENT; +import static io.airlift.airship.shared.AssignmentHelper.BANANA_ASSIGNMENT; public class TestMockLifecycleManager extends AbstractLifecycleManagerTest { diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/TestServer.java b/airship-agent/src/test/java/io/airlift/airship/agent/TestServer.java index 8004d978..16a207ff 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/TestServer.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/TestServer.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.google.common.collect.ImmutableMap; import com.google.common.io.Resources; @@ -21,12 +21,12 @@ import com.proofpoint.configuration.ConfigurationModule; import com.proofpoint.discovery.client.testing.TestingDiscoveryModule; import com.proofpoint.event.client.NullEventModule; -import com.proofpoint.galaxy.shared.HttpUriBuilder; -import com.proofpoint.galaxy.shared.Installation; -import com.proofpoint.galaxy.shared.InstallationHelper; -import com.proofpoint.galaxy.shared.InstallationRepresentation; -import com.proofpoint.galaxy.shared.SlotStatus; -import com.proofpoint.galaxy.shared.VersionsUtil; +import io.airlift.airship.shared.HttpUriBuilder; +import io.airlift.airship.shared.Installation; +import io.airlift.airship.shared.InstallationHelper; +import io.airlift.airship.shared.InstallationRepresentation; +import io.airlift.airship.shared.SlotStatus; +import io.airlift.airship.shared.VersionsUtil; import com.proofpoint.http.client.ApacheHttpClient; import com.proofpoint.http.client.FullJsonResponseHandler.JsonResponse; import com.proofpoint.http.client.HttpClient; @@ -56,13 +56,13 @@ import static com.google.common.base.Charsets.UTF_8; import static com.google.common.net.HttpHeaders.CONTENT_TYPE; -import static com.proofpoint.galaxy.shared.ExtraAssertions.assertEqualsNoOrder; -import static com.proofpoint.galaxy.shared.FileUtils.createTempDir; -import static com.proofpoint.galaxy.shared.FileUtils.deleteRecursively; -import static com.proofpoint.galaxy.shared.HttpUriBuilder.uriBuilderFrom; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.RUNNING; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.STOPPED; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.TERMINATED; +import static io.airlift.airship.shared.ExtraAssertions.assertEqualsNoOrder; +import static io.airlift.airship.shared.FileUtils.createTempDir; +import static io.airlift.airship.shared.FileUtils.deleteRecursively; +import static io.airlift.airship.shared.HttpUriBuilder.uriBuilderFrom; +import static io.airlift.airship.shared.SlotLifecycleState.RUNNING; +import static io.airlift.airship.shared.SlotLifecycleState.STOPPED; +import static io.airlift.airship.shared.SlotLifecycleState.TERMINATED; import static com.proofpoint.http.client.FullJsonResponseHandler.createFullJsonResponseHandler; import static com.proofpoint.http.client.JsonResponseHandler.createJsonResponseHandler; import static com.proofpoint.http.client.StaticBodyGenerator.createStaticBodyGenerator; diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/TestSlot.java b/airship-agent/src/test/java/io/airlift/airship/agent/TestSlot.java index 5f3a83af..41843370 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/TestSlot.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/TestSlot.java @@ -11,21 +11,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; -import com.proofpoint.galaxy.shared.SlotStatus; +import io.airlift.airship.shared.SlotStatus; import com.proofpoint.units.Duration; import org.testng.annotations.Test; import java.net.URI; -import static com.proofpoint.galaxy.shared.AssignmentHelper.APPLE_ASSIGNMENT; -import static com.proofpoint.galaxy.shared.InstallationHelper.APPLE_INSTALLATION; -import static com.proofpoint.galaxy.shared.AssignmentHelper.BANANA_ASSIGNMENT; -import static com.proofpoint.galaxy.shared.InstallationHelper.BANANA_INSTALLATION; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.RUNNING; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.STOPPED; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.TERMINATED; +import static io.airlift.airship.shared.AssignmentHelper.APPLE_ASSIGNMENT; +import static io.airlift.airship.shared.InstallationHelper.APPLE_INSTALLATION; +import static io.airlift.airship.shared.AssignmentHelper.BANANA_ASSIGNMENT; +import static io.airlift.airship.shared.InstallationHelper.BANANA_INSTALLATION; +import static io.airlift.airship.shared.SlotLifecycleState.RUNNING; +import static io.airlift.airship.shared.SlotLifecycleState.STOPPED; +import static io.airlift.airship.shared.SlotLifecycleState.TERMINATED; import static java.util.concurrent.TimeUnit.SECONDS; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; diff --git a/airship-agent/src/test/java/io/airlift/airship/agent/TestSlotResource.java b/airship-agent/src/test/java/io/airlift/airship/agent/TestSlotResource.java index 34908656..0465d23c 100644 --- a/airship-agent/src/test/java/io/airlift/airship/agent/TestSlotResource.java +++ b/airship-agent/src/test/java/io/airlift/airship/agent/TestSlotResource.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.agent; +package io.airlift.airship.agent; import com.google.common.collect.ImmutableMultiset; -import com.proofpoint.galaxy.shared.InstallationRepresentation; -import com.proofpoint.galaxy.shared.MockUriInfo; -import com.proofpoint.galaxy.shared.SlotStatus; -import com.proofpoint.galaxy.shared.SlotStatusRepresentation; -import com.proofpoint.galaxy.shared.VersionConflictException; +import io.airlift.airship.shared.InstallationRepresentation; +import io.airlift.airship.shared.MockUriInfo; +import io.airlift.airship.shared.SlotStatus; +import io.airlift.airship.shared.SlotStatusRepresentation; +import io.airlift.airship.shared.VersionConflictException; import com.proofpoint.http.server.HttpServerConfig; import com.proofpoint.http.server.HttpServerInfo; import com.proofpoint.node.NodeInfo; @@ -35,13 +35,13 @@ import java.util.UUID; import static com.google.common.collect.Lists.newArrayList; -import static com.proofpoint.galaxy.shared.VersionsUtil.GALAXY_AGENT_VERSION_HEADER; -import static com.proofpoint.galaxy.shared.AssignmentHelper.APPLE_ASSIGNMENT; -import static com.proofpoint.galaxy.shared.ExtraAssertions.assertEqualsNoOrder; -import static com.proofpoint.galaxy.shared.InstallationHelper.APPLE_INSTALLATION; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.STOPPED; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.TERMINATED; -import static com.proofpoint.galaxy.shared.VersionsUtil.GALAXY_SLOT_VERSION_HEADER; +import static io.airlift.airship.shared.VersionsUtil.AIRSHIP_AGENT_VERSION_HEADER; +import static io.airlift.airship.shared.AssignmentHelper.APPLE_ASSIGNMENT; +import static io.airlift.airship.shared.ExtraAssertions.assertEqualsNoOrder; +import static io.airlift.airship.shared.InstallationHelper.APPLE_INSTALLATION; +import static io.airlift.airship.shared.SlotLifecycleState.STOPPED; +import static io.airlift.airship.shared.SlotLifecycleState.TERMINATED; +import static io.airlift.airship.shared.VersionsUtil.AIRSHIP_SLOT_VERSION_HEADER; import static com.proofpoint.testing.Assertions.assertInstanceOf; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; @@ -79,8 +79,8 @@ public void testGetSlotStatus() Response response = resource.getSlotStatus(slotStatus.getId(), MockUriInfo.from(requestUri)); assertEquals(response.getStatus(), Response.Status.OK.getStatusCode()); assertEquals(response.getEntity(), SlotStatusRepresentation.from(slotStatus)); - assertEquals(response.getMetadata().get(GALAXY_AGENT_VERSION_HEADER).get(0), agent.getAgentStatus().getVersion()); - assertEquals(response.getMetadata().get(GALAXY_SLOT_VERSION_HEADER).get(0), slotStatus.getVersion()); + assertEquals(response.getMetadata().get(AIRSHIP_AGENT_VERSION_HEADER).get(0), agent.getAgentStatus().getVersion()); + assertEquals(response.getMetadata().get(AIRSHIP_SLOT_VERSION_HEADER).get(0), slotStatus.getVersion()); assertNull(response.getMetadata().get("Content-Type")); // content type is set by jersey based on @Produces } @@ -104,7 +104,7 @@ public void testGetAllSlotStatusEmpty() assertEquals(response.getStatus(), Response.Status.OK.getStatusCode()); assertInstanceOf(response.getEntity(), Collection.class); assertEquals((Collection) response.getEntity(), newArrayList()); - assertEquals(response.getMetadata().get(GALAXY_AGENT_VERSION_HEADER).get(0), agent.getAgentStatus().getVersion()); + assertEquals(response.getMetadata().get(AIRSHIP_AGENT_VERSION_HEADER).get(0), agent.getAgentStatus().getVersion()); } @Test @@ -120,7 +120,7 @@ public void testGetAllSlotStatus() SlotStatusRepresentation.from(slotStatus1), SlotStatusRepresentation.from(slotStatus2) )); - assertEquals(response.getMetadata().get(GALAXY_AGENT_VERSION_HEADER).get(0), agent.getAgentStatus().getVersion()); + assertEquals(response.getMetadata().get(AIRSHIP_AGENT_VERSION_HEADER).get(0), agent.getAgentStatus().getVersion()); } @Test @@ -148,8 +148,8 @@ public void assertInstallSlot(String agentVersion) SlotStatus status = slot.status(); SlotStatus expectedStatus = status.changeAssignment(STOPPED, APPLE_ASSIGNMENT, status.getResources()); assertEquals(response.getEntity(), SlotStatusRepresentation.from(expectedStatus)); - assertEquals(response.getMetadata().get(GALAXY_AGENT_VERSION_HEADER).get(0), agent.getAgentStatus().getVersion()); - assertEquals(response.getMetadata().get(GALAXY_SLOT_VERSION_HEADER).get(0), expectedStatus.getVersion()); + assertEquals(response.getMetadata().get(AIRSHIP_AGENT_VERSION_HEADER).get(0), agent.getAgentStatus().getVersion()); + assertEquals(response.getMetadata().get(AIRSHIP_SLOT_VERSION_HEADER).get(0), expectedStatus.getVersion()); assertNull(response.getMetadata().get("Content-Type")); // content type is set by jersey based on @Produces } @@ -161,7 +161,7 @@ public void testInstallInvalidVersion() fail("Expected WebApplicationException"); } catch (VersionConflictException e) { - assertEquals(e.getName(), GALAXY_AGENT_VERSION_HEADER); + assertEquals(e.getName(), AIRSHIP_AGENT_VERSION_HEADER); assertEquals(e.getVersion(), agent.getAgentStatus().getVersion()); } } @@ -182,8 +182,8 @@ public void testTerminateSlot() SlotStatus expectedStatus = slotStatus.changeState(TERMINATED); assertEquals(response.getEntity(), SlotStatusRepresentation.from(expectedStatus)); - assertEquals(response.getMetadata().get(GALAXY_AGENT_VERSION_HEADER).get(0), agent.getAgentStatus().getVersion()); - assertEquals(response.getMetadata().get(GALAXY_SLOT_VERSION_HEADER).get(0), expectedStatus.getVersion()); + assertEquals(response.getMetadata().get(AIRSHIP_AGENT_VERSION_HEADER).get(0), agent.getAgentStatus().getVersion()); + assertEquals(response.getMetadata().get(AIRSHIP_SLOT_VERSION_HEADER).get(0), expectedStatus.getVersion()); assertNull(response.getMetadata().get("Content-Type")); // content type is set by jersey based on @Produces assertNull(agent.getSlot(slotStatus.getId())); diff --git a/airship-cli/README.txt b/airship-cli/README.txt index 7486e32c..ebc96df8 100644 --- a/airship-cli/README.txt +++ b/airship-cli/README.txt @@ -1 +1 @@ -New galaxy cli +New airship cli diff --git a/airship-cli/pom.xml b/airship-cli/pom.xml index 2d03e93e..b6713754 100644 --- a/airship-cli/pom.xml +++ b/airship-cli/pom.xml @@ -3,16 +3,16 @@ 4.0.0 - com.proofpoint.galaxy - galaxy-root + io.airlift.airship + airship-root 0.9-SNAPSHOT ../pom.xml - com.proofpoint.galaxy - galaxy-cli + io.airlift.airship + airship-cli 0.9-SNAPSHOT - galaxy-cli + airship-cli UTF-8 @@ -64,14 +64,14 @@ - com.proofpoint.galaxy - galaxy-agent + io.airlift.airship + airship-agent 0.9-SNAPSHOT - com.proofpoint.galaxy - galaxy-coordinator + io.airlift.airship + airship-coordinator 0.9-SNAPSHOT @@ -91,24 +91,24 @@ - com.proofpoint.galaxy - galaxy-shared + io.airlift.airship + airship-shared 0.9-SNAPSHOT test-jar test - com.proofpoint.galaxy - galaxy-coordinator + io.airlift.airship + airship-coordinator 0.9-SNAPSHOT test-jar test - com.proofpoint.galaxy - galaxy-agent + io.airlift.airship + airship-agent 0.9-SNAPSHOT test-jar test @@ -123,7 +123,7 @@ - com.proofpoint.galaxy.cli.Galaxy + io.airlift.airship.cli.Airship ${project.version} @@ -146,7 +146,7 @@ - com.proofpoint.galaxy.cli.Galaxy + io.airlift.airship.cli.Airship .SF diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/AgentFilter.java b/airship-cli/src/main/java/io/airlift/airship/cli/AgentFilter.java index 6acbd655..1a75f2d6 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/AgentFilter.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/AgentFilter.java @@ -1,12 +1,12 @@ -package com.proofpoint.galaxy.cli; +package io.airlift.airship.cli; import com.google.common.base.Predicate; import com.google.common.collect.Lists; -import com.proofpoint.galaxy.coordinator.AgentFilterBuilder; -import com.proofpoint.galaxy.shared.AgentStatus; -import com.proofpoint.galaxy.shared.Assignment; -import com.proofpoint.galaxy.shared.HttpUriBuilder; -import com.proofpoint.galaxy.shared.Repository; +import io.airlift.airship.coordinator.AgentFilterBuilder; +import io.airlift.airship.shared.AgentStatus; +import io.airlift.airship.shared.Assignment; +import io.airlift.airship.shared.HttpUriBuilder; +import io.airlift.airship.shared.Repository; import org.iq80.cli.Option; import java.net.URI; diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/AgentRecord.java b/airship-cli/src/main/java/io/airlift/airship/cli/AgentRecord.java index e292260c..49f8d8da 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/AgentRecord.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/AgentRecord.java @@ -1,16 +1,16 @@ -package com.proofpoint.galaxy.cli; +package io.airlift.airship.cli; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import com.proofpoint.galaxy.shared.AgentLifecycleState; -import com.proofpoint.galaxy.shared.AgentStatusRepresentation; +import io.airlift.airship.shared.AgentLifecycleState; +import io.airlift.airship.shared.AgentStatusRepresentation; import org.fusesource.jansi.Ansi.Color; import java.util.List; -import static com.proofpoint.galaxy.cli.Ansi.colorize; +import static io.airlift.airship.cli.Ansi.colorize; public class AgentRecord implements Record { diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/Galaxy.java b/airship-cli/src/main/java/io/airlift/airship/cli/Airship.java similarity index 93% rename from airship-cli/src/main/java/io/airlift/airship/cli/Galaxy.java rename to airship-cli/src/main/java/io/airlift/airship/cli/Airship.java index 41197041..5dc7007c 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/Galaxy.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/Airship.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.cli; +package io.airlift.airship.cli; import com.amazonaws.AmazonClientException; import com.amazonaws.auth.AWSCredentials; @@ -23,20 +23,20 @@ import com.google.common.io.NullOutputStream; import com.google.common.io.Resources; import com.proofpoint.configuration.ConfigurationFactory; -import com.proofpoint.galaxy.coordinator.AwsProvisioner; -import com.proofpoint.galaxy.coordinator.AwsProvisionerConfig; -import com.proofpoint.galaxy.coordinator.CoordinatorConfig; -import com.proofpoint.galaxy.coordinator.HttpRepository; -import com.proofpoint.galaxy.coordinator.Instance; -import com.proofpoint.galaxy.coordinator.MavenRepository; -import com.proofpoint.galaxy.shared.AgentStatusRepresentation; -import com.proofpoint.galaxy.shared.Assignment; -import com.proofpoint.galaxy.shared.CoordinatorStatusRepresentation; -import com.proofpoint.galaxy.shared.Repository; -import com.proofpoint.galaxy.shared.RepositorySet; -import com.proofpoint.galaxy.shared.SlotStatusRepresentation; -import com.proofpoint.galaxy.shared.UpgradeVersions; -import com.proofpoint.galaxy.cli.CommanderFactory.ToUriFunction; +import io.airlift.airship.coordinator.AwsProvisioner; +import io.airlift.airship.coordinator.AwsProvisionerConfig; +import io.airlift.airship.coordinator.CoordinatorConfig; +import io.airlift.airship.coordinator.HttpRepository; +import io.airlift.airship.coordinator.Instance; +import io.airlift.airship.coordinator.MavenRepository; +import io.airlift.airship.shared.AgentStatusRepresentation; +import io.airlift.airship.shared.Assignment; +import io.airlift.airship.shared.CoordinatorStatusRepresentation; +import io.airlift.airship.shared.Repository; +import io.airlift.airship.shared.RepositorySet; +import io.airlift.airship.shared.SlotStatusRepresentation; +import io.airlift.airship.shared.UpgradeVersions; +import io.airlift.airship.cli.CommanderFactory.ToUriFunction; import com.proofpoint.http.server.HttpServerConfig; import com.proofpoint.http.server.HttpServerInfo; import com.proofpoint.json.JsonCodec; @@ -66,24 +66,24 @@ import static com.google.common.base.Objects.firstNonNull; import static com.google.common.collect.Lists.newArrayList; -import static com.proofpoint.galaxy.coordinator.AwsProvisioner.toInstance; -import static com.proofpoint.galaxy.shared.ConfigUtils.createConfigurationFactory; -import static com.proofpoint.galaxy.shared.HttpUriBuilder.uriBuilder; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.RESTARTING; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.RUNNING; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.STOPPED; +import static io.airlift.airship.coordinator.AwsProvisioner.toInstance; +import static io.airlift.airship.shared.ConfigUtils.createConfigurationFactory; +import static io.airlift.airship.shared.HttpUriBuilder.uriBuilder; +import static io.airlift.airship.shared.SlotLifecycleState.RESTARTING; +import static io.airlift.airship.shared.SlotLifecycleState.RUNNING; +import static io.airlift.airship.shared.SlotLifecycleState.STOPPED; import static java.lang.String.format; import static java.util.UUID.randomUUID; import static org.iq80.cli.Cli.buildCli; -public class Galaxy +public class Airship { - private static final File CONFIG_FILE = new File(System.getProperty("user.home", "."), ".galaxyconfig"); + private static final File CONFIG_FILE = new File(System.getProperty("user.home", "."), ".airshipconfig"); - public static final Cli GALAXY_PARSER; + public static final Cli AIRSHIP_PARSER; static { - CliBuilder builder = buildCli("galaxy", GalaxyCommand.class) + CliBuilder builder = buildCli("airship", AirshipCommand.class) .withDescription("cloud management system") .withDefaultCommand(HelpCommand.class) .withCommands(HelpCommand.class, @@ -131,21 +131,22 @@ public class Galaxy ConfigAdd.class, ConfigUnset.class); - GALAXY_PARSER = builder.build(); + AIRSHIP_PARSER = builder.build(); } public static void main(String[] args) throws Exception { try { - GALAXY_PARSER.parse(args).call(); + AIRSHIP_PARSER.parse(args).call(); } catch (ParseException e) { System.out.println(firstNonNull(e.getMessage(), "Unknown command line parser error")); } } - public static abstract class GalaxyCommand implements Callable + public static abstract class AirshipCommand + implements Callable { @Inject public GlobalOptions globalOptions = new GlobalOptions(); @@ -179,7 +180,8 @@ public final Void call() public abstract void execute() throws Exception; } - public static abstract class GalaxyCommanderCommand extends GalaxyCommand + public static abstract class AirshipCommanderCommand + extends AirshipCommand { protected String environmentRef; protected OutputFormat outputFormat; @@ -218,7 +220,7 @@ public void execute(String environmentRef, OutputFormat outputFormat, Interactiv } String coordinator = config.get("environment." + environmentRef + ".coordinator"); if (coordinator == null) { - throw new RuntimeException("Environment " + environmentRef + " does not have a coordinator url. You can add a coordinator url with galaxy coordinator add "); + throw new RuntimeException("Environment " + environmentRef + " does not have a coordinator url. You can add a coordinator url with airship coordinator add "); } URI coordinatorUri = new URI(coordinator); @@ -326,8 +328,8 @@ protected interface SlotExecution { } - @Command(name = "help", description = "Display help information about galaxy") - public static class HelpCommand extends GalaxyCommand + @Command(name = "help", description = "Display help information about airship") + public static class HelpCommand extends AirshipCommand { @Inject public Help help; @@ -351,7 +353,7 @@ public String toString() } @Command(name = "show", description = "Show state of all slots") - public static class ShowCommand extends GalaxyCommanderCommand + public static class ShowCommand extends AirshipCommanderCommand { @Inject public final SlotFilter slotFilter = new SlotFilter(); @@ -376,7 +378,7 @@ public String toString() } @Command(name = "install", description = "Install software in a new slot") - public static class InstallCommand extends GalaxyCommanderCommand + public static class InstallCommand extends AirshipCommanderCommand { @Option(name = {"--count"}, description = "Number of instances to install") public int count = 1; @@ -466,7 +468,7 @@ public String toString() } @Command(name = "upgrade", description = "Upgrade software in a slot") - public static class UpgradeCommand extends GalaxyCommanderCommand + public static class UpgradeCommand extends AirshipCommanderCommand { @Inject public final SlotFilter slotFilter = new SlotFilter(); @@ -523,7 +525,7 @@ public String toString() } @Command(name = "terminate", description = "Terminate (remove) a slot") - public static class TerminateCommand extends GalaxyCommanderCommand + public static class TerminateCommand extends AirshipCommanderCommand { @Inject public final SlotFilter slotFilter = new SlotFilter(); @@ -554,7 +556,7 @@ public String toString() } @Command(name = "start", description = "Start a server") - public static class StartCommand extends GalaxyCommanderCommand + public static class StartCommand extends AirshipCommanderCommand { @Inject public final SlotFilter slotFilter = new SlotFilter(); @@ -574,7 +576,7 @@ public void execute(Commander commander, SlotFilter slotFilter, String expectedV } @Command(name = "stop", description = "Stop a server") - public static class StopCommand extends GalaxyCommanderCommand + public static class StopCommand extends AirshipCommanderCommand { @Inject public final SlotFilter slotFilter = new SlotFilter(); @@ -594,7 +596,7 @@ public void execute(Commander commander, SlotFilter slotFilter, String expectedV } @Command(name = "restart", description = "Restart server") - public static class RestartCommand extends GalaxyCommanderCommand + public static class RestartCommand extends AirshipCommanderCommand { @Inject public final SlotFilter slotFilter = new SlotFilter(); @@ -614,7 +616,7 @@ public void execute(Commander commander, SlotFilter slotFilter, String expectedV } @Command(name = "reset-to-actual", description = "Reset slot expected state to actual") - public static class ResetToActualCommand extends GalaxyCommanderCommand + public static class ResetToActualCommand extends AirshipCommanderCommand { @Inject public final SlotFilter slotFilter = new SlotFilter(); @@ -634,7 +636,7 @@ public void execute(Commander commander, SlotFilter slotFilter, String expectedV } @Command(name = "ssh", description = "ssh to slot installation") - public static class SshCommand extends GalaxyCommanderCommand + public static class SshCommand extends AirshipCommanderCommand { @Inject public final SlotFilter slotFilter = new SlotFilter(); @@ -662,7 +664,7 @@ public String toString() } @Command(name = "show", description = "Show coordinator details") - public static class CoordinatorShowCommand extends GalaxyCommanderCommand + public static class CoordinatorShowCommand extends AirshipCommanderCommand { @Inject public final CoordinatorFilter coordinatorFilter = new CoordinatorFilter(); @@ -688,7 +690,7 @@ public String toString() } @Command(name = "provision", description = "Provision a new coordinator") - public static class CoordinatorProvisionCommand extends GalaxyCommanderCommand + public static class CoordinatorProvisionCommand extends AirshipCommanderCommand { @Option(name = "--coordinator-config", description = "Configuration for the coordinator") public String coordinatorConfig; @@ -758,7 +760,7 @@ public String toString() } @Command(name = "ssh", description = "ssh to coordinator host") - public static class CoordinatorSshCommand extends GalaxyCommanderCommand + public static class CoordinatorSshCommand extends AirshipCommanderCommand { @Inject public final CoordinatorFilter coordinatorFilter = new CoordinatorFilter(); @@ -785,7 +787,7 @@ public String toString() } @Command(name = "show", description = "Show agent details") - public static class AgentShowCommand extends GalaxyCommanderCommand + public static class AgentShowCommand extends AirshipCommanderCommand { @Inject public final AgentFilter agentFilter = new AgentFilter(); @@ -811,7 +813,7 @@ public String toString() } @Command(name = "provision", description = "Provision a new agent") - public static class AgentProvisionCommand extends GalaxyCommanderCommand + public static class AgentProvisionCommand extends AirshipCommanderCommand { @Option(name = "--agent-config", description = "Agent for the coordinator") public String agentConfig; @@ -864,7 +866,7 @@ public String toString() } @Command(name = "terminate", description = "Terminate an agent") - public static class AgentTerminateCommand extends GalaxyCommanderCommand + public static class AgentTerminateCommand extends AirshipCommanderCommand { @Arguments(title = "agent-id", description = "Agent to terminate", required = true) public String agentId; @@ -890,7 +892,7 @@ public String toString() } @Command(name = "ssh", description = "ssh to agent host") - public static class AgentSshCommand extends GalaxyCommanderCommand + public static class AgentSshCommand extends AirshipCommanderCommand { @Inject public final AgentFilter agentFilter = new AgentFilter(); @@ -917,7 +919,7 @@ public String toString() } @Command(name = "provision-local", description = "Provision a local environment") - public static class EnvironmentProvisionLocal extends GalaxyCommand + public static class EnvironmentProvisionLocal extends AirshipCommand { @Option(name = "--name", description = "Environment name") public String environment; @@ -1007,7 +1009,7 @@ public void execute() } @Command(name = "provision-aws", description = "Provision an AWS environment") - public static class EnvironmentProvisionAws extends GalaxyCommand + public static class EnvironmentProvisionAws extends AirshipCommand { @Option(name = "--name", description = "Environment name") public String environment; @@ -1060,9 +1062,9 @@ public void execute() Preconditions.checkNotNull(coordinatorConfig, "You must specify the coordinator config"); String accessKey = config.get("aws.access-key"); - Preconditions.checkNotNull(accessKey, "You must set the aws access-key with: galaxy config set aws.access-key "); + Preconditions.checkNotNull(accessKey, "You must set the aws access-key with: airship config set aws.access-key "); String secretKey = config.get("aws.secret-key"); - Preconditions.checkNotNull(secretKey, "You must set the aws secret-key with: galaxy config set aws.secret-key "); + Preconditions.checkNotNull(secretKey, "You must set the aws secret-key with: airship config set aws.secret-key "); // create the repository List repoBases = ImmutableList.copyOf(Lists.transform(repository, new ToUriFunction())); @@ -1183,8 +1185,8 @@ private static AWSCredentials createIamAccessKey(AmazonIdentityManagementClient private static String createIamUserForEnvironment(AmazonIdentityManagementClient iamClient, String environment) { - String username = format("galaxy-%s-%s", environment, randomUUID().toString().replace("-", "")); - String simpleDbName = format("galaxy-%s", environment); + String username = format("airship-%s-%s", environment, randomUUID().toString().replace("-", "")); + String simpleDbName = format("airship-%s", environment); iamClient.createUser(new CreateUserRequest(username)); @@ -1254,7 +1256,7 @@ private static boolean allInstancesStarted(DescribeInstancesResult describeInsta } @Command(name = "show", description = "Show environment details") - public static class EnvironmentShow extends GalaxyCommand + public static class EnvironmentShow extends AirshipCommand { @Arguments(description = "Environment to show") public String ref; @@ -1282,13 +1284,13 @@ public void execute() } } if (!hasEnvironment) { - System.out.println("There are no Galaxy environments."); + System.out.println("There are no Airship environments."); } } else { String realEnvironmentName = config.get("environment." + ref + ".name"); if (realEnvironmentName == null) { - throw new RuntimeException(String.format("'%s' does not appear to be a galaxy environment", ref)); + throw new RuntimeException(String.format("'%s' does not appear to be a airship environment", ref)); } List coordinators = config.getAll("environment." + ref + ".coordinator"); boolean isDefaultRef = ref.equals(defaultRef); @@ -1308,7 +1310,7 @@ public void execute() } @Command(name = "add", description = "Add an environment") - public static class EnvironmentAdd extends GalaxyCommand + public static class EnvironmentAdd extends AirshipCommand { @Option(name = "--name", description = "Environment name") public String environment; @@ -1347,7 +1349,7 @@ public void execute() } @Command(name = "remove", description = "Remove an environment") - public static class EnvironmentRemove extends GalaxyCommand + public static class EnvironmentRemove extends AirshipCommand { @Arguments(description = "Environment to remove") public String ref; @@ -1373,7 +1375,7 @@ public void execute() } @Command(name = "use", description = "Set the default environment") - public static class EnvironmentUse extends GalaxyCommand + public static class EnvironmentUse extends AirshipCommand { @Arguments(description = "Environment to make the default") public String ref; @@ -1396,7 +1398,7 @@ public void execute() } @Command(name = "get", description = "Get a configuration value") - public static class ConfigGet extends GalaxyCommand + public static class ConfigGet extends AirshipCommand { @Arguments(description = "Key to get") public String key; @@ -1416,7 +1418,7 @@ public void execute() } @Command(name = "get-all", description = "Get all values of configuration") - public static class ConfigGetAll extends GalaxyCommand + public static class ConfigGetAll extends AirshipCommand { @Arguments(description = "Key to get") public String key; @@ -1435,7 +1437,7 @@ public void execute() } @Command(name = "set", description = "Set a configuration value") - public static class ConfigSet extends GalaxyCommand + public static class ConfigSet extends AirshipCommand { @Arguments(usage = " ", description = "Key-value pair to set") @@ -1458,7 +1460,7 @@ public void execute() } @Command(name = "add", description = "Add a configuration value") - public static class ConfigAdd extends GalaxyCommand + public static class ConfigAdd extends AirshipCommand { @Arguments(usage = " ", description = "Key-value pair to add") @@ -1481,7 +1483,7 @@ public void execute() } @Command(name = "unset", description = "Unset a configuration value") - public static class ConfigUnset extends GalaxyCommand + public static class ConfigUnset extends AirshipCommand { @Arguments(description = "Key to unset") public String key; diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/Ansi.java b/airship-cli/src/main/java/io/airlift/airship/cli/Ansi.java index d5554790..9d45cb55 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/Ansi.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/Ansi.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.cli; +package io.airlift.airship.cli; import jnr.posix.POSIX; import org.fusesource.jansi.Ansi.Color; diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/Column.java b/airship-cli/src/main/java/io/airlift/airship/cli/Column.java index 062d8d5a..ee16f87b 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/Column.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/Column.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.cli; +package io.airlift.airship.cli; public enum Column { diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/Commander.java b/airship-cli/src/main/java/io/airlift/airship/cli/Commander.java index 1d977a31..7e222cc6 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/Commander.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/Commander.java @@ -1,11 +1,11 @@ -package com.proofpoint.galaxy.cli; - -import com.proofpoint.galaxy.shared.AgentStatusRepresentation; -import com.proofpoint.galaxy.shared.Assignment; -import com.proofpoint.galaxy.shared.CoordinatorStatusRepresentation; -import com.proofpoint.galaxy.shared.SlotLifecycleState; -import com.proofpoint.galaxy.shared.SlotStatusRepresentation; -import com.proofpoint.galaxy.shared.UpgradeVersions; +package io.airlift.airship.cli; + +import io.airlift.airship.shared.AgentStatusRepresentation; +import io.airlift.airship.shared.Assignment; +import io.airlift.airship.shared.CoordinatorStatusRepresentation; +import io.airlift.airship.shared.SlotLifecycleState; +import io.airlift.airship.shared.SlotStatusRepresentation; +import io.airlift.airship.shared.UpgradeVersions; import java.util.List; diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/CommanderFactory.java b/airship-cli/src/main/java/io/airlift/airship/cli/CommanderFactory.java index c3dadf3b..f9e32dac 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/CommanderFactory.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/CommanderFactory.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.cli; +package io.airlift.airship.cli; import com.google.common.base.Function; import com.google.common.base.Joiner; @@ -7,34 +7,34 @@ import com.google.common.collect.ImmutableSet; import com.google.common.net.InetAddresses; import com.proofpoint.discovery.client.ServiceDescriptor; -import com.proofpoint.galaxy.agent.Agent; -import com.proofpoint.galaxy.agent.DeploymentManagerFactory; -import com.proofpoint.galaxy.agent.DirectoryDeploymentManagerFactory; -import com.proofpoint.galaxy.agent.LauncherLifecycleManager; -import com.proofpoint.galaxy.agent.LifecycleManager; -import com.proofpoint.galaxy.agent.Slot; -import com.proofpoint.galaxy.coordinator.Coordinator; -import com.proofpoint.galaxy.coordinator.CoordinatorConfig; -import com.proofpoint.galaxy.coordinator.HttpRepository; -import com.proofpoint.galaxy.coordinator.HttpServiceInventory; -import com.proofpoint.galaxy.coordinator.InMemoryStateManager; -import com.proofpoint.galaxy.coordinator.Instance; -import com.proofpoint.galaxy.coordinator.MavenRepository; -import com.proofpoint.galaxy.coordinator.Provisioner; -import com.proofpoint.galaxy.coordinator.RemoteAgent; -import com.proofpoint.galaxy.coordinator.RemoteAgentFactory; -import com.proofpoint.galaxy.coordinator.RemoteSlot; -import com.proofpoint.galaxy.coordinator.ServiceInventory; -import com.proofpoint.galaxy.coordinator.StateManager; -import com.proofpoint.galaxy.shared.AgentLifecycleState; -import com.proofpoint.galaxy.shared.AgentStatus; -import com.proofpoint.galaxy.shared.CoordinatorLifecycleState; -import com.proofpoint.galaxy.shared.CoordinatorStatus; -import com.proofpoint.galaxy.shared.ExpectedSlotStatus; -import com.proofpoint.galaxy.shared.Installation; -import com.proofpoint.galaxy.shared.Repository; -import com.proofpoint.galaxy.shared.RepositorySet; -import com.proofpoint.galaxy.shared.SlotStatus; +import io.airlift.airship.agent.Agent; +import io.airlift.airship.agent.DeploymentManagerFactory; +import io.airlift.airship.agent.DirectoryDeploymentManagerFactory; +import io.airlift.airship.agent.LauncherLifecycleManager; +import io.airlift.airship.agent.LifecycleManager; +import io.airlift.airship.agent.Slot; +import io.airlift.airship.coordinator.Coordinator; +import io.airlift.airship.coordinator.CoordinatorConfig; +import io.airlift.airship.coordinator.HttpRepository; +import io.airlift.airship.coordinator.HttpServiceInventory; +import io.airlift.airship.coordinator.InMemoryStateManager; +import io.airlift.airship.coordinator.Instance; +import io.airlift.airship.coordinator.MavenRepository; +import io.airlift.airship.coordinator.Provisioner; +import io.airlift.airship.coordinator.RemoteAgent; +import io.airlift.airship.coordinator.RemoteAgentFactory; +import io.airlift.airship.coordinator.RemoteSlot; +import io.airlift.airship.coordinator.ServiceInventory; +import io.airlift.airship.coordinator.StateManager; +import io.airlift.airship.shared.AgentLifecycleState; +import io.airlift.airship.shared.AgentStatus; +import io.airlift.airship.shared.CoordinatorLifecycleState; +import io.airlift.airship.shared.CoordinatorStatus; +import io.airlift.airship.shared.ExpectedSlotStatus; +import io.airlift.airship.shared.Installation; +import io.airlift.airship.shared.Repository; +import io.airlift.airship.shared.RepositorySet; +import io.airlift.airship.shared.SlotStatus; import com.proofpoint.json.JsonCodec; import com.proofpoint.units.Duration; diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/CommanderResponse.java b/airship-cli/src/main/java/io/airlift/airship/cli/CommanderResponse.java index ef26e6ac..711e6a81 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/CommanderResponse.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/CommanderResponse.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.cli; +package io.airlift.airship.cli; public class CommanderResponse { diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/Config.java b/airship-cli/src/main/java/io/airlift/airship/cli/Config.java index f8c90f28..b3a7b2f9 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/Config.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/Config.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.cli; +package io.airlift.airship.cli; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Charsets; diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/CoordinatorFilter.java b/airship-cli/src/main/java/io/airlift/airship/cli/CoordinatorFilter.java index 10b225a8..a960f389 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/CoordinatorFilter.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/CoordinatorFilter.java @@ -1,9 +1,9 @@ -package com.proofpoint.galaxy.cli; +package io.airlift.airship.cli; import com.google.common.base.Predicate; -import com.proofpoint.galaxy.coordinator.CoordinatorFilterBuilder; -import com.proofpoint.galaxy.shared.CoordinatorStatus; -import com.proofpoint.galaxy.shared.HttpUriBuilder; +import io.airlift.airship.coordinator.CoordinatorFilterBuilder; +import io.airlift.airship.shared.CoordinatorStatus; +import io.airlift.airship.shared.HttpUriBuilder; import org.iq80.cli.Option; import java.net.URI; diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/CoordinatorRecord.java b/airship-cli/src/main/java/io/airlift/airship/cli/CoordinatorRecord.java index 72f1896d..996a44c4 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/CoordinatorRecord.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/CoordinatorRecord.java @@ -1,14 +1,14 @@ -package com.proofpoint.galaxy.cli; +package io.airlift.airship.cli; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import com.proofpoint.galaxy.shared.CoordinatorLifecycleState; -import com.proofpoint.galaxy.shared.CoordinatorStatusRepresentation; +import io.airlift.airship.shared.CoordinatorLifecycleState; +import io.airlift.airship.shared.CoordinatorStatusRepresentation; import org.fusesource.jansi.Ansi.Color; -import static com.proofpoint.galaxy.cli.Ansi.colorize; +import static io.airlift.airship.cli.Ansi.colorize; public class CoordinatorRecord implements Record { diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/Exec.java b/airship-cli/src/main/java/io/airlift/airship/cli/Exec.java index f0358b67..73c967b8 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/Exec.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/Exec.java @@ -1,7 +1,7 @@ -package com.proofpoint.galaxy.cli; +package io.airlift.airship.cli; import com.google.common.base.Preconditions; -import com.proofpoint.galaxy.shared.SlotStatusRepresentation; +import io.airlift.airship.shared.SlotStatusRepresentation; import jnr.posix.POSIX; import jnr.posix.util.Platform; @@ -57,7 +57,7 @@ public static void execRemote(String host, String path, String command) public static void execRemote(String host, String command) { POSIX posix = POSIXFactory.getPOSIX(); - String ssh = firstNonNull(getenv("GALAXY_SSH_COMMAND"), firstNonNull(findFileInPath("ssh", null), "/usr/bin/ssh")); + String ssh = firstNonNull(getenv("AIRSHIP_SSH_COMMAND"), firstNonNull(findFileInPath("ssh", null), "/usr/bin/ssh")); String[] args; if (command == null) { diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/GlobalOptions.java b/airship-cli/src/main/java/io/airlift/airship/cli/GlobalOptions.java index b2a2114b..10b63ad5 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/GlobalOptions.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/GlobalOptions.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.cli; +package io.airlift.airship.cli; import org.iq80.cli.Option; import org.iq80.cli.OptionType; @@ -8,7 +8,7 @@ public class GlobalOptions { - @Option(type = GLOBAL, name = {"-e", "--environment"}, description = "Galaxy environment") + @Option(type = GLOBAL, name = {"-e", "--environment"}, description = "Airship environment") public String environment; @Option(type = OptionType.GLOBAL, name = "--batch", description = "Do not prompt") diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/HttpCommander.java b/airship-cli/src/main/java/io/airlift/airship/cli/HttpCommander.java index e5ff3d41..51d9471b 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/HttpCommander.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/HttpCommander.java @@ -1,19 +1,19 @@ -package com.proofpoint.galaxy.cli; +package io.airlift.airship.cli; import com.google.common.base.Charsets; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; -import com.proofpoint.galaxy.coordinator.AgentProvisioningRepresentation; -import com.proofpoint.galaxy.coordinator.CoordinatorProvisioningRepresentation; -import com.proofpoint.galaxy.shared.AgentLifecycleState; -import com.proofpoint.galaxy.shared.AgentStatusRepresentation; -import com.proofpoint.galaxy.shared.Assignment; -import com.proofpoint.galaxy.shared.AssignmentRepresentation; -import com.proofpoint.galaxy.shared.CoordinatorLifecycleState; -import com.proofpoint.galaxy.shared.CoordinatorStatusRepresentation; -import com.proofpoint.galaxy.shared.SlotLifecycleState; -import com.proofpoint.galaxy.shared.SlotStatusRepresentation; -import com.proofpoint.galaxy.shared.UpgradeVersions; +import io.airlift.airship.coordinator.AgentProvisioningRepresentation; +import io.airlift.airship.coordinator.CoordinatorProvisioningRepresentation; +import io.airlift.airship.shared.AgentLifecycleState; +import io.airlift.airship.shared.AgentStatusRepresentation; +import io.airlift.airship.shared.Assignment; +import io.airlift.airship.shared.AssignmentRepresentation; +import io.airlift.airship.shared.CoordinatorLifecycleState; +import io.airlift.airship.shared.CoordinatorStatusRepresentation; +import io.airlift.airship.shared.SlotLifecycleState; +import io.airlift.airship.shared.SlotStatusRepresentation; +import io.airlift.airship.shared.UpgradeVersions; import com.proofpoint.http.client.ApacheHttpClient; import com.proofpoint.http.client.BodyGenerator; import com.proofpoint.http.client.FullJsonResponseHandler.JsonResponse; @@ -31,11 +31,11 @@ import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Maps.newHashMap; -import static com.proofpoint.galaxy.cli.CommanderResponse.createCommanderResponse; -import static com.proofpoint.galaxy.shared.HttpUriBuilder.uriBuilderFrom; -import static com.proofpoint.galaxy.cli.HttpCommander.TextBodyGenerator.textBodyGenerator; -import static com.proofpoint.galaxy.shared.VersionsUtil.GALAXY_AGENTS_VERSION_HEADER; -import static com.proofpoint.galaxy.shared.VersionsUtil.GALAXY_SLOTS_VERSION_HEADER; +import static io.airlift.airship.cli.CommanderResponse.createCommanderResponse; +import static io.airlift.airship.shared.HttpUriBuilder.uriBuilderFrom; +import static io.airlift.airship.cli.HttpCommander.TextBodyGenerator.textBodyGenerator; +import static io.airlift.airship.shared.VersionsUtil.AIRSHIP_AGENTS_VERSION_HEADER; +import static io.airlift.airship.shared.VersionsUtil.AIRSHIP_SLOTS_VERSION_HEADER; import static com.proofpoint.http.client.FullJsonResponseHandler.createFullJsonResponseHandler; import static com.proofpoint.http.client.JsonBodyGenerator.jsonBodyGenerator; import static com.proofpoint.http.client.JsonResponseHandler.createJsonResponseHandler; @@ -75,7 +75,7 @@ public CommanderResponse> show(SlotFilter slotFil .build(); JsonResponse> response = client.execute(request, createFullJsonResponseHandler(SLOTS_CODEC)); - return createCommanderResponse(response.getHeader(GALAXY_SLOTS_VERSION_HEADER), response.getValue()); + return createCommanderResponse(response.getHeader(AIRSHIP_SLOTS_VERSION_HEADER), response.getValue()); } @Override @@ -87,7 +87,7 @@ public List install(AgentFilter agentFilter, int count .setHeader("Content-Type", "application/json") .setBodyGenerator(jsonBodyGenerator(ASSIGNMENT_CODEC, AssignmentRepresentation.from(assignment))); if (expectedVersion != null) { - requestBuilder.setHeader(GALAXY_SLOTS_VERSION_HEADER, expectedVersion); + requestBuilder.setHeader(AIRSHIP_SLOTS_VERSION_HEADER, expectedVersion); } List slots = client.execute(requestBuilder.build(), createJsonResponseHandler(SLOTS_CODEC)); @@ -103,7 +103,7 @@ public List upgrade(SlotFilter slotFilter, UpgradeVers .setHeader("Content-Type", "application/json") .setBodyGenerator(jsonBodyGenerator(UPGRADE_VERSIONS_CODEC, upgradeVersions)); if (expectedVersion != null) { - requestBuilder.setHeader(GALAXY_SLOTS_VERSION_HEADER, expectedVersion); + requestBuilder.setHeader(AIRSHIP_SLOTS_VERSION_HEADER, expectedVersion); } List slots = client.execute(requestBuilder.build(), createJsonResponseHandler(SLOTS_CODEC)); @@ -118,7 +118,7 @@ public List setState(SlotFilter slotFilter, SlotLifecy .setUri(uri) .setBodyGenerator(textBodyGenerator(state.name())); if (expectedVersion != null) { - requestBuilder.setHeader(GALAXY_SLOTS_VERSION_HEADER, expectedVersion); + requestBuilder.setHeader(AIRSHIP_SLOTS_VERSION_HEADER, expectedVersion); } List slots = client.execute(requestBuilder.build(), createJsonResponseHandler(SLOTS_CODEC)); @@ -131,7 +131,7 @@ public List terminate(SlotFilter slotFilter, String ex URI uri = slotFilter.toUri(uriBuilderFrom(coordinatorUri).replacePath("/v1/slot")); RequestBuilder requestBuilder = RequestBuilder.prepareDelete().setUri(uri); if (expectedVersion != null) { - requestBuilder.setHeader(GALAXY_SLOTS_VERSION_HEADER, expectedVersion); + requestBuilder.setHeader(AIRSHIP_SLOTS_VERSION_HEADER, expectedVersion); } List slots = client.execute(requestBuilder.build(), createJsonResponseHandler(SLOTS_CODEC)); @@ -144,7 +144,7 @@ public List resetExpectedState(SlotFilter slotFilter, URI uri = slotFilter.toUri(uriBuilderFrom(coordinatorUri).replacePath("/v1/slot/expected-state")); RequestBuilder requestBuilder = RequestBuilder.prepareDelete().setUri(uri); if (expectedVersion != null) { - requestBuilder.setHeader(GALAXY_SLOTS_VERSION_HEADER, expectedVersion); + requestBuilder.setHeader(AIRSHIP_SLOTS_VERSION_HEADER, expectedVersion); } List slots = client.execute(requestBuilder.build(), createJsonResponseHandler(SLOTS_CODEC)); @@ -282,7 +282,7 @@ public CommanderResponse> showAgents(AgentFilter if (response.getStatusCode() != 200) { throw new RuntimeException(response.getStatusMessage()); } - return CommanderResponse.createCommanderResponse(response.getHeader(GALAXY_AGENTS_VERSION_HEADER), response.getValue()); + return CommanderResponse.createCommanderResponse(response.getHeader(AIRSHIP_AGENTS_VERSION_HEADER), response.getValue()); } @Override diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/InteractiveUser.java b/airship-cli/src/main/java/io/airlift/airship/cli/InteractiveUser.java index 2d3a67b8..6b5fd3f4 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/InteractiveUser.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/InteractiveUser.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.cli; +package io.airlift.airship.cli; public interface InteractiveUser { diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/LocalCommander.java b/airship-cli/src/main/java/io/airlift/airship/cli/LocalCommander.java index 33ec1b0b..44dc442c 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/LocalCommander.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/LocalCommander.java @@ -1,22 +1,22 @@ -package com.proofpoint.galaxy.cli; +package io.airlift.airship.cli; import com.google.common.base.Charsets; import com.google.common.base.Predicate; import com.google.common.io.Files; import com.proofpoint.discovery.client.ServiceDescriptor; import com.proofpoint.discovery.client.ServiceDescriptorsRepresentation; -import com.proofpoint.galaxy.coordinator.Coordinator; -import com.proofpoint.galaxy.coordinator.ServiceInventory; -import com.proofpoint.galaxy.shared.AgentStatus; -import com.proofpoint.galaxy.shared.AgentStatusRepresentation; -import com.proofpoint.galaxy.shared.Assignment; -import com.proofpoint.galaxy.shared.CoordinatorStatus; -import com.proofpoint.galaxy.shared.CoordinatorStatusRepresentation; -import com.proofpoint.galaxy.shared.Repository; -import com.proofpoint.galaxy.shared.SlotLifecycleState; -import com.proofpoint.galaxy.shared.SlotStatus; -import com.proofpoint.galaxy.shared.SlotStatusRepresentation; -import com.proofpoint.galaxy.shared.UpgradeVersions; +import io.airlift.airship.coordinator.Coordinator; +import io.airlift.airship.coordinator.ServiceInventory; +import io.airlift.airship.shared.AgentStatus; +import io.airlift.airship.shared.AgentStatusRepresentation; +import io.airlift.airship.shared.Assignment; +import io.airlift.airship.shared.CoordinatorStatus; +import io.airlift.airship.shared.CoordinatorStatusRepresentation; +import io.airlift.airship.shared.Repository; +import io.airlift.airship.shared.SlotLifecycleState; +import io.airlift.airship.shared.SlotStatus; +import io.airlift.airship.shared.SlotStatusRepresentation; +import io.airlift.airship.shared.UpgradeVersions; import com.proofpoint.json.JsonCodec; import java.io.File; @@ -27,15 +27,15 @@ import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Lists.transform; -import static com.proofpoint.galaxy.cli.CommanderResponse.createCommanderResponse; -import static com.proofpoint.galaxy.shared.AgentStatus.idGetter; -import static com.proofpoint.galaxy.shared.AgentStatusRepresentation.fromAgentStatus; -import static com.proofpoint.galaxy.shared.CoordinatorStatusRepresentation.fromCoordinatorStatus; -import static com.proofpoint.galaxy.shared.SlotStatus.uuidGetter; -import static com.proofpoint.galaxy.shared.SlotStatusRepresentation.fromSlotStatus; -import static com.proofpoint.galaxy.shared.VersionsUtil.checkAgentsVersion; -import static com.proofpoint.galaxy.shared.VersionsUtil.createAgentsVersion; -import static com.proofpoint.galaxy.shared.VersionsUtil.createSlotsVersion; +import static io.airlift.airship.cli.CommanderResponse.createCommanderResponse; +import static io.airlift.airship.shared.AgentStatus.idGetter; +import static io.airlift.airship.shared.AgentStatusRepresentation.fromAgentStatus; +import static io.airlift.airship.shared.CoordinatorStatusRepresentation.fromCoordinatorStatus; +import static io.airlift.airship.shared.SlotStatus.uuidGetter; +import static io.airlift.airship.shared.SlotStatusRepresentation.fromSlotStatus; +import static io.airlift.airship.shared.VersionsUtil.checkAgentsVersion; +import static io.airlift.airship.shared.VersionsUtil.createAgentsVersion; +import static io.airlift.airship.shared.VersionsUtil.createSlotsVersion; public class LocalCommander implements Commander { diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/OutputFormat.java b/airship-cli/src/main/java/io/airlift/airship/cli/OutputFormat.java index eb2b72a5..b2b16003 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/OutputFormat.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/OutputFormat.java @@ -1,8 +1,8 @@ -package com.proofpoint.galaxy.cli; +package io.airlift.airship.cli; -import com.proofpoint.galaxy.shared.AgentStatusRepresentation; -import com.proofpoint.galaxy.shared.CoordinatorStatusRepresentation; -import com.proofpoint.galaxy.shared.SlotStatusRepresentation; +import io.airlift.airship.shared.AgentStatusRepresentation; +import io.airlift.airship.shared.CoordinatorStatusRepresentation; +import io.airlift.airship.shared.SlotStatusRepresentation; public interface OutputFormat { diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/POSIXFactory.java b/airship-cli/src/main/java/io/airlift/airship/cli/POSIXFactory.java index b3782515..12bfbfe6 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/POSIXFactory.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/POSIXFactory.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.cli; +package io.airlift.airship.cli; import com.proofpoint.log.Logger; import jnr.constants.platform.Errno; diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/RealInteractiveUser.java b/airship-cli/src/main/java/io/airlift/airship/cli/RealInteractiveUser.java index e5adbf88..166a8aa5 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/RealInteractiveUser.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/RealInteractiveUser.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.cli; +package io.airlift.airship.cli; import java.io.BufferedReader; import java.io.IOException; diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/Record.java b/airship-cli/src/main/java/io/airlift/airship/cli/Record.java index f5b05b19..361e5ff0 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/Record.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/Record.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.cli; +package io.airlift.airship.cli; public interface Record { diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/SimpleRecord.java b/airship-cli/src/main/java/io/airlift/airship/cli/SimpleRecord.java index 66449418..f88d796d 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/SimpleRecord.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/SimpleRecord.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.cli; +package io.airlift.airship.cli; import com.google.common.collect.ImmutableMap; import org.fusesource.jansi.Ansi.Color; @@ -6,7 +6,7 @@ import java.util.Map; import static com.google.common.collect.Maps.newLinkedHashMap; -import static com.proofpoint.galaxy.cli.Ansi.colorize; +import static io.airlift.airship.cli.Ansi.colorize; public class SimpleRecord implements Record { diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/SlotFilter.java b/airship-cli/src/main/java/io/airlift/airship/cli/SlotFilter.java index db53fafe..9360f19f 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/SlotFilter.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/SlotFilter.java @@ -1,9 +1,9 @@ -package com.proofpoint.galaxy.cli; +package io.airlift.airship.cli; import com.google.common.base.Predicate; -import com.proofpoint.galaxy.coordinator.SlotFilterBuilder; -import com.proofpoint.galaxy.shared.HttpUriBuilder; -import com.proofpoint.galaxy.shared.SlotStatus; +import io.airlift.airship.coordinator.SlotFilterBuilder; +import io.airlift.airship.shared.HttpUriBuilder; +import io.airlift.airship.shared.SlotStatus; import org.iq80.cli.Option; import java.net.URI; diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/SlotRecord.java b/airship-cli/src/main/java/io/airlift/airship/cli/SlotRecord.java index 7442d339..0d968d84 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/SlotRecord.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/SlotRecord.java @@ -1,16 +1,16 @@ -package com.proofpoint.galaxy.cli; +package io.airlift.airship.cli; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import com.proofpoint.galaxy.shared.SlotLifecycleState; -import com.proofpoint.galaxy.shared.SlotStatus; -import com.proofpoint.galaxy.shared.SlotStatusRepresentation; +import io.airlift.airship.shared.SlotLifecycleState; +import io.airlift.airship.shared.SlotStatus; +import io.airlift.airship.shared.SlotStatusRepresentation; import org.fusesource.jansi.Ansi.Color; import java.util.List; -import static com.proofpoint.galaxy.cli.Ansi.colorize; +import static io.airlift.airship.cli.Ansi.colorize; public class SlotRecord implements Record { diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/TableOutputFormat.java b/airship-cli/src/main/java/io/airlift/airship/cli/TableOutputFormat.java index a1130c7a..c154dee9 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/TableOutputFormat.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/TableOutputFormat.java @@ -1,23 +1,23 @@ -package com.proofpoint.galaxy.cli; +package io.airlift.airship.cli; import com.google.common.collect.Iterables; -import com.proofpoint.galaxy.shared.AgentStatusRepresentation; -import com.proofpoint.galaxy.shared.CoordinatorStatusRepresentation; -import com.proofpoint.galaxy.shared.SlotStatusRepresentation; +import io.airlift.airship.shared.AgentStatusRepresentation; +import io.airlift.airship.shared.CoordinatorStatusRepresentation; +import io.airlift.airship.shared.SlotStatusRepresentation; -import static com.proofpoint.galaxy.cli.AgentRecord.toAgentRecords; -import static com.proofpoint.galaxy.cli.Column.externalHost; -import static com.proofpoint.galaxy.cli.Column.instanceType; -import static com.proofpoint.galaxy.cli.Column.internalHost; -import static com.proofpoint.galaxy.cli.Column.machine; -import static com.proofpoint.galaxy.cli.Column.shortBinary; -import static com.proofpoint.galaxy.cli.Column.shortConfig; -import static com.proofpoint.galaxy.cli.Column.shortId; -import static com.proofpoint.galaxy.cli.Column.shortLocation; -import static com.proofpoint.galaxy.cli.Column.status; -import static com.proofpoint.galaxy.cli.Column.statusMessage; -import static com.proofpoint.galaxy.cli.CoordinatorRecord.toCoordinatorRecords; -import static com.proofpoint.galaxy.cli.SlotRecord.toSlotRecords; +import static io.airlift.airship.cli.AgentRecord.toAgentRecords; +import static io.airlift.airship.cli.Column.externalHost; +import static io.airlift.airship.cli.Column.instanceType; +import static io.airlift.airship.cli.Column.internalHost; +import static io.airlift.airship.cli.Column.machine; +import static io.airlift.airship.cli.Column.shortBinary; +import static io.airlift.airship.cli.Column.shortConfig; +import static io.airlift.airship.cli.Column.shortId; +import static io.airlift.airship.cli.Column.shortLocation; +import static io.airlift.airship.cli.Column.status; +import static io.airlift.airship.cli.Column.statusMessage; +import static io.airlift.airship.cli.CoordinatorRecord.toCoordinatorRecords; +import static io.airlift.airship.cli.SlotRecord.toSlotRecords; public class TableOutputFormat implements OutputFormat { diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/TablePrinter.java b/airship-cli/src/main/java/io/airlift/airship/cli/TablePrinter.java index 6b370a7a..e6e321fd 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/TablePrinter.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/TablePrinter.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.cli; +package io.airlift.airship.cli; import com.google.common.base.Function; import com.google.common.base.Joiner; diff --git a/airship-cli/src/main/java/io/airlift/airship/cli/WaitUtils.java b/airship-cli/src/main/java/io/airlift/airship/cli/WaitUtils.java index b03ccffd..19b7c36f 100644 --- a/airship-cli/src/main/java/io/airlift/airship/cli/WaitUtils.java +++ b/airship-cli/src/main/java/io/airlift/airship/cli/WaitUtils.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.cli; +package io.airlift.airship.cli; public final class WaitUtils { diff --git a/airship-cli/src/test/java/io/airlift/airship/cli/GalaxyTestRun.java b/airship-cli/src/test/java/io/airlift/airship/cli/AirshipTestRun.java similarity index 88% rename from airship-cli/src/test/java/io/airlift/airship/cli/GalaxyTestRun.java rename to airship-cli/src/test/java/io/airlift/airship/cli/AirshipTestRun.java index 4a33a446..28b92914 100644 --- a/airship-cli/src/test/java/io/airlift/airship/cli/GalaxyTestRun.java +++ b/airship-cli/src/test/java/io/airlift/airship/cli/AirshipTestRun.java @@ -1,23 +1,23 @@ -package com.proofpoint.galaxy.cli; +package io.airlift.airship.cli; import com.google.common.base.Joiner; -public class GalaxyTestRun +public class AirshipTestRun { public static void main(String[] args) throws Exception { -// galaxy environment provision-aws prod \ +// airship environment provision-aws prod \ // --repository https://oss.sonatype.org/content/repositories/releases/ \ // --repository https://oss.sonatype.org/content/repositories/snapshots/ \ -// --repository https://s3.amazonaws.com/galaxy-cloud-formation/ \ +// --repository https://s3.amazonaws.com/airship-cloud-formation/ \ // --key-pair dain \ // --coordinator-config @coordinator.config // execute("environment", "provision-aws", "prod", // "--repository", "https://oss.sonatype.org/content/repositories/releases/", // "--repository", "https://oss.sonatype.org/content/repositories/snapshots/", -// "--repository", "https://s3.amazonaws.com/galaxy-cloud-formation/", +// "--repository", "https://s3.amazonaws.com/airship-cloud-formation/", // "--maven-default-group-id", "com.proofpoint.platform", // "--key-pair", "dain", // "--coordinator-config", "@coordinator.config" @@ -65,7 +65,7 @@ public static void execute(String... args) throws Exception { System.out.println(Joiner.on(" ").join(args)); - Galaxy.main(args); + Airship.main(args); System.out.println(); System.out.println(); } diff --git a/airship-cli/src/test/java/io/airlift/airship/cli/TestGalaxy.java b/airship-cli/src/test/java/io/airlift/airship/cli/TestAirship.java similarity index 92% rename from airship-cli/src/test/java/io/airlift/airship/cli/TestGalaxy.java rename to airship-cli/src/test/java/io/airlift/airship/cli/TestAirship.java index ec7920d6..5f6a1eb8 100644 --- a/airship-cli/src/test/java/io/airlift/airship/cli/TestGalaxy.java +++ b/airship-cli/src/test/java/io/airlift/airship/cli/TestAirship.java @@ -1,18 +1,17 @@ -package com.proofpoint.galaxy.cli; +package io.airlift.airship.cli; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableList; import com.google.common.collect.ListMultimap; -import com.google.common.collect.Multimap; -import com.proofpoint.galaxy.cli.Galaxy.GalaxyCommand; -import com.proofpoint.galaxy.cli.Galaxy.GalaxyCommanderCommand; -import com.proofpoint.galaxy.coordinator.TestingMavenRepository; -import com.proofpoint.galaxy.shared.AgentStatusRepresentation; -import com.proofpoint.galaxy.shared.Assignment; -import com.proofpoint.galaxy.shared.CoordinatorStatusRepresentation; -import com.proofpoint.galaxy.shared.FileUtils; -import com.proofpoint.galaxy.shared.SlotLifecycleState; -import com.proofpoint.galaxy.shared.SlotStatusRepresentation; +import io.airlift.airship.cli.Airship.AirshipCommand; +import io.airlift.airship.cli.Airship.AirshipCommanderCommand; +import io.airlift.airship.coordinator.TestingMavenRepository; +import io.airlift.airship.shared.AgentStatusRepresentation; +import io.airlift.airship.shared.Assignment; +import io.airlift.airship.shared.CoordinatorStatusRepresentation; +import io.airlift.airship.shared.FileUtils; +import io.airlift.airship.shared.SlotLifecycleState; +import io.airlift.airship.shared.SlotStatusRepresentation; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -21,16 +20,16 @@ import java.util.List; import java.util.UUID; -import static com.proofpoint.galaxy.shared.AssignmentHelper.APPLE_ASSIGNMENT; -import static com.proofpoint.galaxy.shared.AssignmentHelper.APPLE_ASSIGNMENT_2; -import static com.proofpoint.galaxy.shared.AssignmentHelper.BANANA_ASSIGNMENT; -import static com.proofpoint.galaxy.shared.AssignmentHelper.BANANA_ASSIGNMENT_EXACT; +import static io.airlift.airship.shared.AssignmentHelper.APPLE_ASSIGNMENT; +import static io.airlift.airship.shared.AssignmentHelper.APPLE_ASSIGNMENT_2; +import static io.airlift.airship.shared.AssignmentHelper.BANANA_ASSIGNMENT; +import static io.airlift.airship.shared.AssignmentHelper.BANANA_ASSIGNMENT_EXACT; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; -public class TestGalaxy +public class TestAirship { private File tempDir; @@ -43,7 +42,7 @@ public class TestGalaxy public void setUp() throws Exception { - tempDir = FileUtils.createTempDir("galaxy"); + tempDir = FileUtils.createTempDir("airship"); config = new Config(); repo = new TestingMavenRepository(); @@ -378,11 +377,11 @@ private void execute(String... args) { outputFormat.clear(); - GalaxyCommand command = Galaxy.GALAXY_PARSER.parse(ImmutableList.builder().add("--debug").add(args).build()); + AirshipCommand command = Airship.AIRSHIP_PARSER.parse(ImmutableList.builder().add("--debug").add(args).build()); command.config = config; - if (command instanceof GalaxyCommanderCommand) { - GalaxyCommanderCommand galaxyCommanderCommand = (GalaxyCommanderCommand) command; - galaxyCommanderCommand.execute("local", outputFormat, interactiveUser); + if (command instanceof AirshipCommanderCommand) { + Airship.AirshipCommanderCommand airshipCommanderCommand = (Airship.AirshipCommanderCommand) command; + airshipCommanderCommand.execute("local", outputFormat, interactiveUser); } else { command.execute(); diff --git a/airship-config-bundler/pom.xml b/airship-config-bundler/pom.xml index a84e9c1b..03c9e1ea 100644 --- a/airship-config-bundler/pom.xml +++ b/airship-config-bundler/pom.xml @@ -2,14 +2,14 @@ 4.0.0 - com.proofpoint.galaxy - galaxy-config-bundler + io.airlift.airship + airship-config-bundler 0.9-SNAPSHOT - galaxy-config-bundler + airship-config-bundler - com.proofpoint.galaxy - galaxy-root + io.airlift.airship + airship-root 0.9-SNAPSHOT ../pom.xml @@ -132,7 +132,7 @@ - com.proofpoint.galaxy.configbundler.ConfigBundler + io.airlift.airship.configbundler.ConfigBundler ${project.version} @@ -154,7 +154,7 @@ - com.proofpoint.galaxy.configbundler.ConfigBundler + io.airlift.airship.configbundler.ConfigBundler diff --git a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/AddComponentCommand.java b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/AddComponentCommand.java index 1d8147bf..37e1f7a9 100644 --- a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/AddComponentCommand.java +++ b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/AddComponentCommand.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.configbundler; +package io.airlift.airship.configbundler; import com.google.common.base.Preconditions; import org.eclipse.jgit.api.Git; diff --git a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/Bundle.java b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/Bundle.java index 5094e2a7..75446cc3 100644 --- a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/Bundle.java +++ b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/Bundle.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.configbundler; +package io.airlift.airship.configbundler; import com.google.common.base.Preconditions; diff --git a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/ConfigBundler.java b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/ConfigBundler.java index e7a237de..4e646d79 100644 --- a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/ConfigBundler.java +++ b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/ConfigBundler.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.configbundler; +package io.airlift.airship.configbundler; import com.google.common.io.NullOutputStream; import com.proofpoint.log.Logging; diff --git a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/Generator.java b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/Generator.java index 7e19e77b..84dce995 100644 --- a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/Generator.java +++ b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/Generator.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.configbundler; +package io.airlift.airship.configbundler; import java.io.IOException; import java.io.OutputStream; diff --git a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/GitUtils.java b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/GitUtils.java index 8fe65a2d..44b5a26e 100644 --- a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/GitUtils.java +++ b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/GitUtils.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.configbundler; +package io.airlift.airship.configbundler; import com.google.common.base.Function; import com.google.common.base.Preconditions; diff --git a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/IgnoreHiddenFilter.java b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/IgnoreHiddenFilter.java index 0494694f..aff59eff 100644 --- a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/IgnoreHiddenFilter.java +++ b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/IgnoreHiddenFilter.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.configbundler; +package io.airlift.airship.configbundler; import org.eclipse.jgit.treewalk.TreeWalk; import org.eclipse.jgit.treewalk.filter.TreeFilter; diff --git a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/InitCommand.java b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/InitCommand.java index e3a97079..6adf9cbf 100644 --- a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/InitCommand.java +++ b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/InitCommand.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.configbundler; +package io.airlift.airship.configbundler; import com.google.common.base.Preconditions; import org.eclipse.jgit.api.Git; diff --git a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/Maven.java b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/Maven.java index 88734a0b..7073a491 100644 --- a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/Maven.java +++ b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/Maven.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.configbundler; +package io.airlift.airship.configbundler; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; diff --git a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/Metadata.java b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/Metadata.java index 34aa59e6..023e5d4d 100644 --- a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/Metadata.java +++ b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/Metadata.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.configbundler; +package io.airlift.airship.configbundler; import com.google.common.base.Charsets; import com.google.common.base.Preconditions; diff --git a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/Model.java b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/Model.java index 3aeb11aa..7a590eee 100644 --- a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/Model.java +++ b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/Model.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.configbundler; +package io.airlift.airship.configbundler; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; @@ -34,9 +34,9 @@ import static com.google.common.base.Charsets.UTF_8; import static com.google.common.io.CharStreams.newReaderSupplier; -import static com.proofpoint.galaxy.configbundler.GitUtils.getBlob; -import static com.proofpoint.galaxy.configbundler.GitUtils.getBranch; -import static com.proofpoint.galaxy.configbundler.GitUtils.inputStreamSupplierFunction; +import static io.airlift.airship.configbundler.GitUtils.getBlob; +import static io.airlift.airship.configbundler.GitUtils.getBranch; +import static io.airlift.airship.configbundler.GitUtils.inputStreamSupplierFunction; class Model { diff --git a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/ReleaseCommand.java b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/ReleaseCommand.java index 0bf2ec59..d3e362bc 100644 --- a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/ReleaseCommand.java +++ b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/ReleaseCommand.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.configbundler; +package io.airlift.airship.configbundler; import com.google.common.base.Preconditions; import com.google.common.io.InputSupplier; diff --git a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/SnapshotCommand.java b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/SnapshotCommand.java index a08060e0..6780ae0c 100644 --- a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/SnapshotCommand.java +++ b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/SnapshotCommand.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.configbundler; +package io.airlift.airship.configbundler; import com.google.common.base.Preconditions; import com.google.common.io.InputSupplier; diff --git a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/ZipGenerator.java b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/ZipGenerator.java index 24d0f661..1c485a16 100644 --- a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/ZipGenerator.java +++ b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/ZipGenerator.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.configbundler; +package io.airlift.airship.configbundler; import com.google.common.io.InputSupplier; diff --git a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/ZipPackager.java b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/ZipPackager.java index 4c327d74..d024e415 100644 --- a/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/ZipPackager.java +++ b/airship-config-bundler/src/main/java/io/airlift/airship/configbundler/ZipPackager.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.configbundler; +package io.airlift.airship.configbundler; import com.google.common.io.ByteStreams; import com.google.common.io.InputSupplier; diff --git a/airship-coordinator/README.txt b/airship-coordinator/README.txt index 3b801657..7a7bd81b 100644 --- a/airship-coordinator/README.txt +++ b/airship-coordinator/README.txt @@ -1 +1 @@ -galaxy-coordinator +airship-coordinator diff --git a/airship-coordinator/etc/aws-config.properties b/airship-coordinator/etc/aws-config.properties index 6d89e880..30b16c51 100644 --- a/airship-coordinator/etc/aws-config.properties +++ b/airship-coordinator/etc/aws-config.properties @@ -1,11 +1,11 @@ node.environment=dev1 -galaxy.version=0.8-SNAPSHOT +airship.version=0.8-SNAPSHOT http-server.http.port=64000 -coordinator.repository=https://oss.sonatype.org/content/repositories/releases/,https://oss.sonatype.org/content/repositories/snapshots/,https://s3.amazonaws.com/galaxy-cloud-formation/ +coordinator.repository=https://oss.sonatype.org/content/repositories/releases/,https://oss.sonatype.org/content/repositories/snapshots/,https://s3.amazonaws.com/airship-cloud-formation/ coordinator.agent.default-config=@agent.config -#coordinator.agent.default-config=@com.proofpoint.galaxy:galaxy-agent${instanceType}:${galaxyVersion} +#coordinator.agent.default-config=@io.airlift.airship:airship-agent${instanceType}:${airshipVersion} coordinator.provisioner=aws diff --git a/airship-coordinator/etc/config.properties b/airship-coordinator/etc/config.properties index f24df913..971c3a9b 100644 --- a/airship-coordinator/etc/config.properties +++ b/airship-coordinator/etc/config.properties @@ -1,12 +1,12 @@ node.environment=test -galaxy.version=0.8-SNAPSHOT +airship.version=0.8-SNAPSHOT http-server.http.port=64000 coordinator.repository=https://oss.sonatype.org/content/repositories/releases/,https://oss.sonatype.org/content/repositories/snapshots/ -coordinator.default-group-id=com.proofpoint.galaxy,com.proofpoint.platform,com.proofpoint.galaxy.sampleConfig -coordinator.agent.default-config=@com.proofpoint.galaxy.sampleConfig:agent:1-SNAPSHOT +coordinator.default-group-id=io.airlift.airship,com.proofpoint.platform,io.airlift.airship.sampleConfig +coordinator.agent.default-config=@io.airlift.airship.sampleConfig:agent:1-SNAPSHOT coordinator.provisioner=local coordinator.agent-uri=http://localhost:65000 diff --git a/airship-coordinator/pom.xml b/airship-coordinator/pom.xml index d83e6b44..468e20af 100644 --- a/airship-coordinator/pom.xml +++ b/airship-coordinator/pom.xml @@ -8,13 +8,13 @@ - com.proofpoint.galaxy.coordinator.CoordinatorMain + io.airlift.airship.coordinator.CoordinatorMain - com.proofpoint.galaxy - galaxy-coordinator + io.airlift.airship + airship-coordinator 0.9-SNAPSHOT - galaxy-coordinator + airship-coordinator @@ -31,8 +31,8 @@ - com.proofpoint.galaxy - galaxy-shared + io.airlift.airship + airship-shared 0.9-SNAPSHOT @@ -141,8 +141,8 @@ - com.proofpoint.galaxy - galaxy-shared + io.airlift.airship + airship-shared 0.9-SNAPSHOT test-jar test diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/AdminResource.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/AdminResource.java index 615b4c18..6ae6b0c8 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/AdminResource.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/AdminResource.java @@ -1,11 +1,11 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Predicate; import com.google.inject.Inject; -import com.proofpoint.galaxy.shared.AgentStatus; -import com.proofpoint.galaxy.shared.CoordinatorStatus; -import com.proofpoint.galaxy.shared.Repository; -import com.proofpoint.galaxy.shared.SlotStatus; +import io.airlift.airship.shared.AgentStatus; +import io.airlift.airship.shared.CoordinatorStatus; +import io.airlift.airship.shared.Repository; +import io.airlift.airship.shared.SlotStatus; import javax.ws.rs.DELETE; import javax.ws.rs.GET; @@ -20,11 +20,11 @@ import java.util.List; import static com.google.common.collect.Lists.transform; -import static com.proofpoint.galaxy.shared.AgentStatus.idGetter; -import static com.proofpoint.galaxy.shared.AgentStatusRepresentation.fromAgentStatus; -import static com.proofpoint.galaxy.shared.CoordinatorStatusRepresentation.fromCoordinatorStatus; -import static com.proofpoint.galaxy.shared.VersionsUtil.GALAXY_AGENTS_VERSION_HEADER; -import static com.proofpoint.galaxy.shared.VersionsUtil.createAgentsVersion; +import static io.airlift.airship.shared.AgentStatus.idGetter; +import static io.airlift.airship.shared.AgentStatusRepresentation.fromAgentStatus; +import static io.airlift.airship.shared.CoordinatorStatusRepresentation.fromCoordinatorStatus; +import static io.airlift.airship.shared.VersionsUtil.AIRSHIP_AGENTS_VERSION_HEADER; +import static io.airlift.airship.shared.VersionsUtil.createAgentsVersion; @Path("/v1/admin/") public class AdminResource @@ -84,7 +84,7 @@ public Response getAllAgents(@Context UriInfo uriInfo) List agents = coordinator.getAgents(agentPredicate); return Response.ok(transform(agents, fromAgentStatus(coordinator.getAgents(), repository))) - .header(GALAXY_AGENTS_VERSION_HEADER, createAgentsVersion(agents)) + .header(AIRSHIP_AGENTS_VERSION_HEADER, createAgentsVersion(agents)) .build(); } diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/AgentFilterBuilder.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/AgentFilterBuilder.java index 74163408..e5222409 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/AgentFilterBuilder.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/AgentFilterBuilder.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Function; import com.google.common.base.Preconditions; @@ -8,14 +8,14 @@ import com.google.common.collect.Collections2; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import com.proofpoint.galaxy.shared.AgentLifecycleState; -import com.proofpoint.galaxy.shared.AgentStatus; -import com.proofpoint.galaxy.shared.Assignment; -import com.proofpoint.galaxy.shared.HttpUriBuilder; -import com.proofpoint.galaxy.shared.Installation; -import com.proofpoint.galaxy.shared.InstallationUtils; -import com.proofpoint.galaxy.shared.Repository; -import com.proofpoint.galaxy.shared.SlotStatus; +import io.airlift.airship.shared.AgentLifecycleState; +import io.airlift.airship.shared.AgentStatus; +import io.airlift.airship.shared.Assignment; +import io.airlift.airship.shared.HttpUriBuilder; +import io.airlift.airship.shared.Installation; +import io.airlift.airship.shared.InstallationUtils; +import io.airlift.airship.shared.Repository; +import io.airlift.airship.shared.SlotStatus; import javax.annotation.Nullable; import javax.ws.rs.core.UriInfo; @@ -26,12 +26,12 @@ import java.util.Map.Entry; import java.util.UUID; -import static com.proofpoint.galaxy.coordinator.StringFunctions.startsWith; -import static com.proofpoint.galaxy.coordinator.StringFunctions.toLowerCase; -import static com.proofpoint.galaxy.shared.AgentLifecycleState.ONLINE; -import static com.proofpoint.galaxy.shared.InstallationUtils.getAvailableResources; -import static com.proofpoint.galaxy.shared.InstallationUtils.resourcesAreAvailable; -import static com.proofpoint.galaxy.shared.InstallationUtils.toInstallation; +import static io.airlift.airship.coordinator.StringFunctions.startsWith; +import static io.airlift.airship.coordinator.StringFunctions.toLowerCase; +import static io.airlift.airship.shared.AgentLifecycleState.ONLINE; +import static io.airlift.airship.shared.InstallationUtils.getAvailableResources; +import static io.airlift.airship.shared.InstallationUtils.resourcesAreAvailable; +import static io.airlift.airship.shared.InstallationUtils.toInstallation; import static java.lang.String.format; public class AgentFilterBuilder diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/AgentProvisioningRepresentation.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/AgentProvisioningRepresentation.java index 96724b9e..c660a91a 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/AgentProvisioningRepresentation.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/AgentProvisioningRepresentation.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/AmbiguousUpgradeException.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/AmbiguousUpgradeException.java index 9bf90ed0..226bdf03 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/AmbiguousUpgradeException.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/AmbiguousUpgradeException.java @@ -1,8 +1,8 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableSet; -import com.proofpoint.galaxy.shared.Assignment; +import io.airlift.airship.shared.Assignment; import java.util.Set; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/AwsProvisioner.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/AwsProvisioner.java index 174e410f..bb9e431f 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/AwsProvisioner.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/AwsProvisioner.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.amazonaws.AmazonClientException; import com.amazonaws.auth.AWSCredentials; @@ -19,8 +19,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.proofpoint.configuration.ConfigurationFactory; -import com.proofpoint.galaxy.shared.MavenCoordinates; -import com.proofpoint.galaxy.shared.Repository; +import io.airlift.airship.shared.MavenCoordinates; +import io.airlift.airship.shared.Repository; import com.proofpoint.http.server.HttpServerConfig; import com.proofpoint.http.server.HttpServerInfo; import com.proofpoint.log.Logger; @@ -38,8 +38,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.Lists.newArrayList; -import static com.proofpoint.galaxy.shared.ConfigUtils.createConfigurationFactory; -import static com.proofpoint.galaxy.shared.HttpUriBuilder.uriBuilder; +import static io.airlift.airship.shared.ConfigUtils.createConfigurationFactory; +import static io.airlift.airship.shared.HttpUriBuilder.uriBuilder; import static java.lang.String.format; import static java.util.Collections.addAll; @@ -51,7 +51,7 @@ public class AwsProvisioner implements Provisioner private final AmazonEC2 ec2Client; private final String environment; private final URI coordinatorUri; - private final String galaxyVersion; + private final String airshipVersion; private List repositories; private final String agentDefaultConfig; @@ -84,7 +84,7 @@ public AwsProvisioner(AWSCredentials awsCredentials, this.coordinatorUri = httpServerInfo.getHttpUri(); checkNotNull(coordinatorConfig, "coordinatorConfig is null"); - galaxyVersion = coordinatorConfig.getGalaxyVersion(); + airshipVersion = coordinatorConfig.getAirshipVersion(); repositories = coordinatorConfig.getRepositories(); checkNotNull(awsProvisionerConfig, "awsConfig is null"); @@ -113,11 +113,11 @@ public List listCoordinators() continue; } Map tags = toMap(instance.getTags()); - if ("coordinator".equals(tags.get("galaxy:role")) && environment.equals(tags.get("galaxy:environment"))) { - String portTag = tags.get("galaxy:port"); + if ("coordinator".equals(tags.get("airship:role")) && environment.equals(tags.get("airship:environment"))) { + String portTag = tags.get("airship:port"); if (portTag == null) { if (invalidInstances.add(instance.getInstanceId())) { - log.error("Instance %s does not have a galaxy:port tag", instance.getInstanceId()); + log.error("Instance %s does not have a airship:port tag", instance.getInstanceId()); } continue; } @@ -128,7 +128,7 @@ public List listCoordinators() } catch (Exception e) { if (invalidInstances.add(instance.getInstanceId())) { - log.error("Instance %s galaxy:port tag is not a number", instance.getInstanceId()); + log.error("Instance %s airship:port tag is not a number", instance.getInstanceId()); } continue; } @@ -163,11 +163,11 @@ public List listAgents() continue; } Map tags = toMap(instance.getTags()); - if ("agent".equals(tags.get("galaxy:role")) && environment.equals(tags.get("galaxy:environment"))) { - String portTag = tags.get("galaxy:port"); + if ("agent".equals(tags.get("airship:role")) && environment.equals(tags.get("airship:environment"))) { + String portTag = tags.get("airship:port"); if (portTag == null) { if (invalidInstances.add(instance.getInstanceId())) { - log.error("Instance %s does not have a galaxy:port tag", instance.getInstanceId()); + log.error("Instance %s does not have a airship:port tag", instance.getInstanceId()); } continue; } @@ -178,7 +178,7 @@ public List listAgents() } catch (Exception e) { if (invalidInstances.add(instance.getInstanceId())) { - log.error("Instance %s galaxy:port tag is not a number", instance.getInstanceId()); + log.error("Instance %s airship:port tag is not a number", instance.getInstanceId()); } continue; } @@ -314,10 +314,10 @@ public List provisionCoordinator(String coordinatorConfig, } List tags = ImmutableList.builder() - .add(new Tag("Name", format("galaxy-%s-coordinator", environment))) - .add(new Tag("galaxy:role", "coordinator")) - .add(new Tag("galaxy:environment", environment)) - .add(new Tag("galaxy:port", String.valueOf(coordinatorPort))) + .add(new Tag("Name", format("airship-%s-coordinator", environment))) + .add(new Tag("airship:role", "coordinator")) + .add(new Tag("airship:environment", environment)) + .add(new Tag("airship:port", String.valueOf(coordinatorPort))) .build(); createInstanceTagsWithRetry(instanceIds, tags); @@ -380,10 +380,10 @@ public List provisionAgents(String agentConfig, int agentCount, String } List tags = ImmutableList.builder() - .add(new Tag("Name", format("galaxy-%s-agent", environment))) - .add(new Tag("galaxy:role", "agent")) - .add(new Tag("galaxy:environment", environment)) - .add(new Tag("galaxy:port", String.valueOf(httpServerConfig.getHttpPort()))) + .add(new Tag("Name", format("airship-%s-agent", environment))) + .add(new Tag("airship:role", "agent")) + .add(new Tag("airship:environment", environment)) + .add(new Tag("airship:port", String.valueOf(httpServerConfig.getHttpPort()))) .build(); createInstanceTagsWithRetry(instanceIds, tags); @@ -428,10 +428,10 @@ String getRawAgentUserData(String instanceType, String agentConfig, List String contentTypeText = "Content-Type: text/plain; charset=\"us-ascii\""; String attachmentFormat = "Content-Disposition: attachment; filename=\"%s\""; - URI partHandler = getRequiredUri(repository, new MavenCoordinates("com.proofpoint.galaxy", "galaxy-ec2", galaxyVersion, "py", "part-handler", null)); - URI galaxyCli = getRequiredUri(repository, new MavenCoordinates("com.proofpoint.galaxy", "galaxy-cli", galaxyVersion, "jar", "executable", null)); - URI coordinatorInstall = getRequiredUri(repository, new MavenCoordinates("com.proofpoint.galaxy", "galaxy-ec2", galaxyVersion, "sh", "install", null)); - URI coordinatorInstallPrep = getRequiredUri(repository, new MavenCoordinates("com.proofpoint.galaxy", "galaxy-ec2", galaxyVersion, "sh", "install-prep", null)); + URI partHandler = getRequiredUri(repository, new MavenCoordinates("io.airlift.airship", "airship-ec2", airshipVersion, "py", "part-handler", null)); + URI airshipCli = getRequiredUri(repository, new MavenCoordinates("io.airlift.airship", "airship-cli", airshipVersion, "jar", "executable", null)); + URI coordinatorInstall = getRequiredUri(repository, new MavenCoordinates("io.airlift.airship", "airship-ec2", airshipVersion, "sh", "install", null)); + URI coordinatorInstallPrep = getRequiredUri(repository, new MavenCoordinates("io.airlift.airship", "airship-ec2", airshipVersion, "sh", "install-prep", null)); List lines = newArrayList(); addAll(lines, @@ -439,31 +439,31 @@ String getRawAgentUserData(String instanceType, String agentConfig, List "", boundaryLine, - contentExecUrl, mimeVersion, encodingText, format(attachmentFormat, "galaxy-part-handler.py"), "", + contentExecUrl, mimeVersion, encodingText, format(attachmentFormat, "airship-part-handler.py"), "", partHandler.toString(), "", boundaryLine, - contentDownloadUrl, mimeVersion, encodingText, format(attachmentFormat, "galaxy"), "", - galaxyCli.toASCIIString(), + contentDownloadUrl, mimeVersion, encodingText, format(attachmentFormat, "airship"), "", + airshipCli.toASCIIString(), "", boundaryLine, contentTypeText, mimeVersion, encodingText, format(attachmentFormat, "installer.properties"), "", - property("galaxyEnvironment", environment), - property("galaxyInstallBinary", "com.proofpoint.galaxy:galaxy-agent:" + galaxyVersion), - property("galaxyInstallConfig", agentConfig), - property("galaxyRepositoryUris", Joiner.on(',').join(repositories)), - property("galaxyCoordinatorUri", coordinatorUri), + property("airshipEnvironment", environment), + property("airshipInstallBinary", "io.airlift.airship:airship-agent:" + airshipVersion), + property("airshipInstallConfig", agentConfig), + property("airshipRepositoryUris", Joiner.on(',').join(repositories)), + property("airshipCoordinatorUri", coordinatorUri), "", boundaryLine, - contentDownloadUrl, mimeVersion, encodingText, format(attachmentFormat, "galaxy-install.sh"), "", + contentDownloadUrl, mimeVersion, encodingText, format(attachmentFormat, "airship-install.sh"), "", coordinatorInstall.toASCIIString(), "", boundaryLine , - contentExecUrl, mimeVersion, encodingText, format(attachmentFormat, "galaxy-install-prep.sh"), "", + contentExecUrl, mimeVersion, encodingText, format(attachmentFormat, "airship-install-prep.sh"), "", coordinatorInstallPrep.toASCIIString(), "", boundaryLine @@ -489,10 +489,10 @@ String getRawCoordinatorUserData(String instanceType, String coordinatorConfig, String contentTypeText = "Content-Type: text/plain; charset=\"us-ascii\""; String attachmentFormat = "Content-Disposition: attachment; filename=\"%s\""; - URI partHandler = getRequiredUri(repository, new MavenCoordinates("com.proofpoint.galaxy", "galaxy-ec2", galaxyVersion, "py", "part-handler", null)); - URI galaxyCli = getRequiredUri(repository, new MavenCoordinates("com.proofpoint.galaxy", "galaxy-cli", galaxyVersion, "jar", "executable", null)); - URI coordinatorInstall = getRequiredUri(repository, new MavenCoordinates("com.proofpoint.galaxy", "galaxy-ec2", galaxyVersion, "sh", "install", null)); - URI coordinatorInstallPrep = getRequiredUri(repository, new MavenCoordinates("com.proofpoint.galaxy", "galaxy-ec2", galaxyVersion, "sh", "install-prep", null)); + URI partHandler = getRequiredUri(repository, new MavenCoordinates("io.airlift.airship", "airship-ec2", airshipVersion, "py", "part-handler", null)); + URI airshipCli = getRequiredUri(repository, new MavenCoordinates("io.airlift.airship", "airship-cli", airshipVersion, "jar", "executable", null)); + URI coordinatorInstall = getRequiredUri(repository, new MavenCoordinates("io.airlift.airship", "airship-ec2", airshipVersion, "sh", "install", null)); + URI coordinatorInstallPrep = getRequiredUri(repository, new MavenCoordinates("io.airlift.airship", "airship-ec2", airshipVersion, "sh", "install-prep", null)); List lines = newArrayList(); addAll(lines, @@ -500,13 +500,13 @@ String getRawCoordinatorUserData(String instanceType, String coordinatorConfig, "", boundaryLine, - contentExecUrl, mimeVersion, encodingText, format(attachmentFormat, "galaxy-part-handler.py"), "", + contentExecUrl, mimeVersion, encodingText, format(attachmentFormat, "airship-part-handler.py"), "", partHandler.toString(), "", boundaryLine, - contentDownloadUrl, mimeVersion, encodingText, format(attachmentFormat, "galaxy"), "", - galaxyCli.toASCIIString(), + contentDownloadUrl, mimeVersion, encodingText, format(attachmentFormat, "airship"), "", + airshipCli.toASCIIString(), "", boundaryLine, @@ -517,20 +517,20 @@ contentTypeText, mimeVersion, encodingText, format(attachmentFormat, "aws-creden boundaryLine, contentTypeText, mimeVersion, encodingText, format(attachmentFormat, "installer.properties"), "", - property("galaxyEnvironment", environment), - property("galaxyInstallBinary", "com.proofpoint.galaxy:galaxy-coordinator:" + galaxyVersion), - property("galaxyInstallConfig", coordinatorConfig), - property("galaxyRepositoryUris", Joiner.on(',').join(repositories)), - property("galaxyAwsCredentialsFile", awsCredentialsFile), + property("airshipEnvironment", environment), + property("airshipInstallBinary", "io.airlift.airship:airship-coordinator:" + airshipVersion), + property("airshipInstallConfig", coordinatorConfig), + property("airshipRepositoryUris", Joiner.on(',').join(repositories)), + property("airshipAwsCredentialsFile", awsCredentialsFile), "", boundaryLine, - contentDownloadUrl, mimeVersion, encodingText, format(attachmentFormat, "galaxy-install.sh"), "", + contentDownloadUrl, mimeVersion, encodingText, format(attachmentFormat, "airship-install.sh"), "", coordinatorInstall.toASCIIString(), "", boundaryLine , - contentExecUrl, mimeVersion, encodingText, format(attachmentFormat, "galaxy-install-prep.sh"), "", + contentExecUrl, mimeVersion, encodingText, format(attachmentFormat, "airship-install-prep.sh"), "", coordinatorInstallPrep.toASCIIString(), "", boundaryLine diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/AwsProvisionerConfig.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/AwsProvisionerConfig.java index f18a8de7..a33874a6 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/AwsProvisionerConfig.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/AwsProvisionerConfig.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.proofpoint.configuration.Config; import com.proofpoint.configuration.ConfigDescription; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/AwsProvisionerModule.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/AwsProvisionerModule.java index b34119f5..4d9e11c4 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/AwsProvisionerModule.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/AwsProvisionerModule.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.amazonaws.auth.AWSCredentials; import com.amazonaws.auth.BasicAWSCredentials; @@ -27,8 +27,8 @@ import com.google.inject.Provides; import com.google.inject.Scopes; import com.proofpoint.configuration.ConfigurationModule; -import com.proofpoint.galaxy.coordinator.auth.AuthorizedKeyStore; -import com.proofpoint.galaxy.coordinator.auth.S3AuthorizedKeyStore; +import io.airlift.airship.coordinator.auth.AuthorizedKeyStore; +import io.airlift.airship.coordinator.auth.S3AuthorizedKeyStore; import javax.inject.Singleton; import java.io.File; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/BinaryResource.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/BinaryResource.java index 0d68b78e..d98cbc69 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/BinaryResource.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/BinaryResource.java @@ -1,8 +1,8 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.io.Resources; -import com.proofpoint.galaxy.shared.MavenCoordinates; -import com.proofpoint.galaxy.shared.Repository; +import io.airlift.airship.shared.MavenCoordinates; +import io.airlift.airship.shared.Repository; import javax.inject.Inject; import javax.ws.rs.GET; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/ConditionalModule.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/ConditionalModule.java index 4dc6bdc0..8be7a8d9 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/ConditionalModule.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/ConditionalModule.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Preconditions; import com.google.inject.Binder; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/Coordinator.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/Coordinator.java index 039d505c..e1e7c9d8 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/Coordinator.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/Coordinator.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; @@ -15,18 +15,18 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.google.inject.Inject; import com.proofpoint.discovery.client.ServiceDescriptor; -import com.proofpoint.galaxy.shared.AgentLifecycleState; -import com.proofpoint.galaxy.shared.AgentStatus; -import com.proofpoint.galaxy.shared.Assignment; -import com.proofpoint.galaxy.shared.CoordinatorLifecycleState; -import com.proofpoint.galaxy.shared.CoordinatorStatus; -import com.proofpoint.galaxy.shared.ExpectedSlotStatus; -import com.proofpoint.galaxy.shared.Installation; -import com.proofpoint.galaxy.shared.InstallationUtils; -import com.proofpoint.galaxy.shared.Repository; -import com.proofpoint.galaxy.shared.SlotLifecycleState; -import com.proofpoint.galaxy.shared.SlotStatus; -import com.proofpoint.galaxy.shared.UpgradeVersions; +import io.airlift.airship.shared.AgentLifecycleState; +import io.airlift.airship.shared.AgentStatus; +import io.airlift.airship.shared.Assignment; +import io.airlift.airship.shared.CoordinatorLifecycleState; +import io.airlift.airship.shared.CoordinatorStatus; +import io.airlift.airship.shared.ExpectedSlotStatus; +import io.airlift.airship.shared.Installation; +import io.airlift.airship.shared.InstallationUtils; +import io.airlift.airship.shared.Repository; +import io.airlift.airship.shared.SlotLifecycleState; +import io.airlift.airship.shared.SlotStatus; +import io.airlift.airship.shared.UpgradeVersions; import com.proofpoint.http.server.HttpServerInfo; import com.proofpoint.log.Logger; import com.proofpoint.node.NodeInfo; @@ -56,13 +56,13 @@ import static com.google.common.collect.Iterables.transform; import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Sets.newHashSet; -import static com.proofpoint.galaxy.shared.LocationUtils.extractMachineId; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.RESTARTING; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.RUNNING; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.STOPPED; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.TERMINATED; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.UNKNOWN; -import static com.proofpoint.galaxy.shared.VersionsUtil.checkSlotsVersion; +import static io.airlift.airship.shared.LocationUtils.extractMachineId; +import static io.airlift.airship.shared.SlotLifecycleState.RESTARTING; +import static io.airlift.airship.shared.SlotLifecycleState.RUNNING; +import static io.airlift.airship.shared.SlotLifecycleState.STOPPED; +import static io.airlift.airship.shared.SlotLifecycleState.TERMINATED; +import static io.airlift.airship.shared.SlotLifecycleState.UNKNOWN; +import static io.airlift.airship.shared.VersionsUtil.checkSlotsVersion; public class Coordinator { diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorAssignmentResource.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorAssignmentResource.java index 8709f7e6..a049f9a6 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorAssignmentResource.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorAssignmentResource.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.collect.Lists; import com.google.inject.Inject; -import com.proofpoint.galaxy.shared.Repository; -import com.proofpoint.galaxy.shared.SlotStatus; -import com.proofpoint.galaxy.shared.UpgradeVersions; +import io.airlift.airship.shared.Repository; +import io.airlift.airship.shared.SlotStatus; +import io.airlift.airship.shared.UpgradeVersions; import javax.ws.rs.Consumes; import javax.ws.rs.HeaderParam; @@ -34,9 +34,9 @@ import java.util.UUID; import static com.google.common.collect.Collections2.transform; -import static com.proofpoint.galaxy.shared.VersionsUtil.GALAXY_SLOTS_VERSION_HEADER; -import static com.proofpoint.galaxy.shared.SlotStatusRepresentation.fromSlotStatus; -import static com.proofpoint.galaxy.shared.VersionsUtil.createSlotsVersion; +import static io.airlift.airship.shared.VersionsUtil.AIRSHIP_SLOTS_VERSION_HEADER; +import static io.airlift.airship.shared.SlotStatusRepresentation.fromSlotStatus; +import static io.airlift.airship.shared.VersionsUtil.createSlotsVersion; @Path("/v1/slot/assignment") public class CoordinatorAssignmentResource @@ -59,7 +59,7 @@ public CoordinatorAssignmentResource(Coordinator coordinator, Repository reposit @Produces(MediaType.APPLICATION_JSON) public Response upgrade(UpgradeVersions upgradeVersions, @Context UriInfo uriInfo, - @HeaderParam(GALAXY_SLOTS_VERSION_HEADER) String expectedSlotsVersion) + @HeaderParam(AIRSHIP_SLOTS_VERSION_HEADER) String expectedSlotsVersion) { Preconditions.checkNotNull(upgradeVersions, "upgradeRepresentation must not be null"); @@ -72,7 +72,7 @@ public Response upgrade(UpgradeVersions upgradeVersions, // build response return Response.ok(transform(results, fromSlotStatus(coordinator.getAllSlotStatus(), repository))) - .header(GALAXY_SLOTS_VERSION_HEADER, createSlotsVersion(results)) + .header(AIRSHIP_SLOTS_VERSION_HEADER, createSlotsVersion(results)) .build(); } } diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorConfig.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorConfig.java index 59a5952b..5398d633 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorConfig.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorConfig.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; @@ -28,7 +28,7 @@ public class CoordinatorConfig { public static final String DEFAULT_HTTP_SHORT_NAME_PATTERN = "([^\\/]+?)(?:-[0-9][0-9.]*(?:-SNAPSHOT)?)?(?:\\.config)?$"; - private String galaxyVersion; + private String airshipVersion; private Duration statusExpiration = new Duration(30, TimeUnit.SECONDS); private String serviceInventoryCacheDir = "service-inventory-cache"; @@ -45,15 +45,15 @@ public class CoordinatorConfig @NotNull - public String getGalaxyVersion() + public String getAirshipVersion() { - return galaxyVersion; + return airshipVersion; } - @Config("galaxy.version") - public CoordinatorConfig setGalaxyVersion(String galaxyVersion) + @Config("airship.version") + public CoordinatorConfig setAirshipVersion(String airshipVersion) { - this.galaxyVersion = galaxyVersion; + this.airshipVersion = airshipVersion; return this; } diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorFilterBuilder.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorFilterBuilder.java index 9b709445..87c79668 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorFilterBuilder.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorFilterBuilder.java @@ -1,13 +1,13 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Lists; -import com.proofpoint.galaxy.shared.CoordinatorLifecycleState; -import com.proofpoint.galaxy.shared.CoordinatorStatus; -import com.proofpoint.galaxy.shared.HttpUriBuilder; +import io.airlift.airship.shared.CoordinatorLifecycleState; +import io.airlift.airship.shared.CoordinatorStatus; +import io.airlift.airship.shared.HttpUriBuilder; import javax.annotation.Nullable; import javax.ws.rs.core.UriInfo; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorLifecycleResource.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorLifecycleResource.java index eae02496..2e748dd3 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorLifecycleResource.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorLifecycleResource.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.collect.Lists; import com.google.inject.Inject; -import com.proofpoint.galaxy.shared.Repository; -import com.proofpoint.galaxy.shared.SlotLifecycleState; -import com.proofpoint.galaxy.shared.SlotStatus; +import io.airlift.airship.shared.Repository; +import io.airlift.airship.shared.SlotLifecycleState; +import io.airlift.airship.shared.SlotStatus; import javax.ws.rs.HeaderParam; import javax.ws.rs.PUT; @@ -33,10 +33,10 @@ import java.util.UUID; import static com.google.common.collect.Collections2.transform; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.UNKNOWN; -import static com.proofpoint.galaxy.shared.VersionsUtil.GALAXY_SLOTS_VERSION_HEADER; -import static com.proofpoint.galaxy.shared.SlotStatusRepresentation.fromSlotStatus; -import static com.proofpoint.galaxy.shared.VersionsUtil.createSlotsVersion; +import static io.airlift.airship.shared.SlotLifecycleState.UNKNOWN; +import static io.airlift.airship.shared.VersionsUtil.AIRSHIP_SLOTS_VERSION_HEADER; +import static io.airlift.airship.shared.SlotStatusRepresentation.fromSlotStatus; +import static io.airlift.airship.shared.VersionsUtil.createSlotsVersion; @Path("/v1/slot/lifecycle") public class CoordinatorLifecycleResource @@ -58,7 +58,7 @@ public CoordinatorLifecycleResource(Coordinator coordinator, Repository reposito @Produces(MediaType.APPLICATION_JSON) public Response setState(String newState, @Context UriInfo uriInfo, - @HeaderParam(GALAXY_SLOTS_VERSION_HEADER) String expectedSlotsVersion) + @HeaderParam(AIRSHIP_SLOTS_VERSION_HEADER) String expectedSlotsVersion) { Preconditions.checkNotNull(newState, "newState must not be null"); @@ -76,7 +76,7 @@ public Response setState(String newState, // build response return Response.ok(transform(results, fromSlotStatus(coordinator.getAllSlotStatus(), repository))) - .header(GALAXY_SLOTS_VERSION_HEADER, createSlotsVersion(results)) + .header(AIRSHIP_SLOTS_VERSION_HEADER, createSlotsVersion(results)) .build(); } } diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorMain.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorMain.java index 25b14345..4989798b 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorMain.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorMain.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.proofpoint.bootstrap.Bootstrap; import com.proofpoint.discovery.client.DiscoveryModule; @@ -25,7 +25,7 @@ import com.proofpoint.node.NodeModule; import org.weakref.jmx.guice.MBeanModule; -import static com.proofpoint.galaxy.coordinator.ConditionalModule.installIfPropertyEquals; +import static io.airlift.airship.coordinator.ConditionalModule.installIfPropertyEquals; public class CoordinatorMain diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorMainModule.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorMainModule.java index ddd16693..4f449efb 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorMainModule.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorMainModule.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.inject.Binder; import com.google.inject.Module; @@ -19,16 +19,16 @@ import com.google.inject.multibindings.Multibinder; import com.proofpoint.discovery.client.ServiceDescriptor; import com.proofpoint.discovery.client.ServiceDescriptorsRepresentation; -import com.proofpoint.galaxy.coordinator.auth.AuthConfig; -import com.proofpoint.galaxy.coordinator.auth.AuthFilter; -import com.proofpoint.galaxy.coordinator.auth.SignatureVerifier; -import com.proofpoint.galaxy.shared.AgentStatusRepresentation; -import com.proofpoint.galaxy.shared.Repository; -import com.proofpoint.galaxy.shared.ExpectedSlotStatus; -import com.proofpoint.galaxy.shared.InstallationRepresentation; -import com.proofpoint.galaxy.shared.RepositorySet; -import com.proofpoint.galaxy.shared.SlotStatusRepresentation; -import com.proofpoint.galaxy.shared.VersionConflictExceptionMapper; +import io.airlift.airship.coordinator.auth.AuthConfig; +import io.airlift.airship.coordinator.auth.AuthFilter; +import io.airlift.airship.coordinator.auth.SignatureVerifier; +import io.airlift.airship.shared.AgentStatusRepresentation; +import io.airlift.airship.shared.Repository; +import io.airlift.airship.shared.ExpectedSlotStatus; +import io.airlift.airship.shared.InstallationRepresentation; +import io.airlift.airship.shared.RepositorySet; +import io.airlift.airship.shared.SlotStatusRepresentation; +import io.airlift.airship.shared.VersionConflictExceptionMapper; import com.proofpoint.http.server.TheServlet; import com.proofpoint.json.JsonCodecBinder; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorProvisioningRepresentation.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorProvisioningRepresentation.java index 63fe2184..c5590ee0 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorProvisioningRepresentation.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorProvisioningRepresentation.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorSlotResource.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorSlotResource.java index 2df7f3b6..db9f28c0 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorSlotResource.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorSlotResource.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.inject.Inject; -import com.proofpoint.galaxy.shared.AgentStatus; -import com.proofpoint.galaxy.shared.Assignment; -import com.proofpoint.galaxy.shared.AssignmentRepresentation; -import com.proofpoint.galaxy.shared.Repository; -import com.proofpoint.galaxy.shared.SlotStatus; +import io.airlift.airship.shared.AgentStatus; +import io.airlift.airship.shared.Assignment; +import io.airlift.airship.shared.AssignmentRepresentation; +import io.airlift.airship.shared.Repository; +import io.airlift.airship.shared.SlotStatus; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; @@ -40,13 +40,13 @@ import java.util.UUID; import static com.google.common.collect.Lists.transform; -import static com.proofpoint.galaxy.shared.AgentStatus.idGetter; -import static com.proofpoint.galaxy.shared.SlotStatus.uuidGetter; -import static com.proofpoint.galaxy.shared.SlotStatusRepresentation.fromSlotStatus; -import static com.proofpoint.galaxy.shared.VersionsUtil.GALAXY_AGENTS_VERSION_HEADER; -import static com.proofpoint.galaxy.shared.VersionsUtil.GALAXY_SLOTS_VERSION_HEADER; -import static com.proofpoint.galaxy.shared.VersionsUtil.checkAgentsVersion; -import static com.proofpoint.galaxy.shared.VersionsUtil.createSlotsVersion; +import static io.airlift.airship.shared.AgentStatus.idGetter; +import static io.airlift.airship.shared.SlotStatus.uuidGetter; +import static io.airlift.airship.shared.SlotStatusRepresentation.fromSlotStatus; +import static io.airlift.airship.shared.VersionsUtil.AIRSHIP_AGENTS_VERSION_HEADER; +import static io.airlift.airship.shared.VersionsUtil.AIRSHIP_SLOTS_VERSION_HEADER; +import static io.airlift.airship.shared.VersionsUtil.checkAgentsVersion; +import static io.airlift.airship.shared.VersionsUtil.createSlotsVersion; @Path("/v1/slot") public class CoordinatorSlotResource @@ -79,7 +79,7 @@ public Response getAllSlots(@Context UriInfo uriInfo) // build response return Response.ok(Iterables.transform(slots, fromSlotStatus(coordinator.getAllSlotStatus(), repository))) - .header(GALAXY_SLOTS_VERSION_HEADER, createSlotsVersion(slots)) + .header(AIRSHIP_SLOTS_VERSION_HEADER, createSlotsVersion(slots)) .build(); } @@ -90,7 +90,7 @@ public Response install( AssignmentRepresentation assignmentRepresentation, @DefaultValue("1") @QueryParam("limit") int limit, @Context UriInfo uriInfo, - @HeaderParam(GALAXY_AGENTS_VERSION_HEADER) String expectedAgentsVersion) + @HeaderParam(AIRSHIP_AGENTS_VERSION_HEADER) String expectedAgentsVersion) { Preconditions.checkNotNull(assignmentRepresentation, "assignmentRepresentation must not be null"); Preconditions.checkArgument(limit > 0, "limit must be at least 1"); @@ -113,14 +113,14 @@ public Response install( // calculate unique prefix size with the new slots included return Response.ok(transform(slots, fromSlotStatus(coordinator.getAllSlotStatus(), repository))) - .header(GALAXY_SLOTS_VERSION_HEADER, createSlotsVersion(slots)) + .header(AIRSHIP_SLOTS_VERSION_HEADER, createSlotsVersion(slots)) .build(); } @DELETE @Produces(MediaType.APPLICATION_JSON) public Response terminateSlots(@Context UriInfo uriInfo, - @HeaderParam(GALAXY_SLOTS_VERSION_HEADER) String expectedSlotsVersion) + @HeaderParam(AIRSHIP_SLOTS_VERSION_HEADER) String expectedSlotsVersion) { // build filter List uuids = transform(coordinator.getAllSlotStatus(), uuidGetter()); @@ -131,7 +131,7 @@ public Response terminateSlots(@Context UriInfo uriInfo, // build response return Response.ok(transform(result, fromSlotStatus(coordinator.getAllSlotStatus(), repository))) - .header(GALAXY_SLOTS_VERSION_HEADER, createSlotsVersion(result)) + .header(AIRSHIP_SLOTS_VERSION_HEADER, createSlotsVersion(result)) .build(); } } diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/ExpectedStateResource.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/ExpectedStateResource.java index 224e6fdb..31d286f3 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/ExpectedStateResource.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/ExpectedStateResource.java @@ -1,11 +1,11 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.collect.Lists; import com.google.inject.Inject; -import com.proofpoint.galaxy.shared.Repository; -import com.proofpoint.galaxy.shared.SlotStatus; +import io.airlift.airship.shared.Repository; +import io.airlift.airship.shared.SlotStatus; import javax.ws.rs.DELETE; import javax.ws.rs.HeaderParam; @@ -19,10 +19,10 @@ import java.util.UUID; import static com.google.common.collect.Collections2.transform; -import static com.proofpoint.galaxy.shared.SlotStatus.uuidGetter; -import static com.proofpoint.galaxy.shared.VersionsUtil.GALAXY_SLOTS_VERSION_HEADER; -import static com.proofpoint.galaxy.shared.SlotStatusRepresentation.fromSlotStatus; -import static com.proofpoint.galaxy.shared.VersionsUtil.createSlotsVersion; +import static io.airlift.airship.shared.SlotStatus.uuidGetter; +import static io.airlift.airship.shared.VersionsUtil.AIRSHIP_SLOTS_VERSION_HEADER; +import static io.airlift.airship.shared.SlotStatusRepresentation.fromSlotStatus; +import static io.airlift.airship.shared.VersionsUtil.createSlotsVersion; @Path("/v1/slot/expected-state") public class ExpectedStateResource @@ -43,7 +43,7 @@ public ExpectedStateResource(Coordinator coordinator, Repository repository) @DELETE @Produces(MediaType.APPLICATION_JSON) public Response terminateSlots(@Context UriInfo uriInfo, - @HeaderParam(GALAXY_SLOTS_VERSION_HEADER) String expectedSlotsVersion) + @HeaderParam(AIRSHIP_SLOTS_VERSION_HEADER) String expectedSlotsVersion) { // build filter List uuids = Lists.transform(coordinator.getAllSlotStatus(), uuidGetter()); @@ -54,7 +54,7 @@ public Response terminateSlots(@Context UriInfo uriInfo, // build response return Response.ok(transform(result, fromSlotStatus(coordinator.getAllSlotStatus(), repository))) - .header(GALAXY_SLOTS_VERSION_HEADER, createSlotsVersion(result)) + .header(AIRSHIP_SLOTS_VERSION_HEADER, createSlotsVersion(result)) .build(); } } diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/FileStateManager.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/FileStateManager.java index 0b87218b..fa795930 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/FileStateManager.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/FileStateManager.java @@ -1,11 +1,11 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Charsets; import com.google.common.base.Preconditions; import com.google.common.io.Files; import com.google.common.io.PatternFilenameFilter; -import com.proofpoint.galaxy.shared.ExpectedSlotStatus; -import com.proofpoint.galaxy.shared.FileUtils; +import io.airlift.airship.shared.ExpectedSlotStatus; +import io.airlift.airship.shared.FileUtils; import com.proofpoint.json.JsonCodec; import com.proofpoint.log.Logger; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/GlobPredicate.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/GlobPredicate.java index 0b88cffa..9311ff85 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/GlobPredicate.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/GlobPredicate.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import java.util.regex.Pattern; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/Global.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/Global.java index 310d3024..bd6ed096 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/Global.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/Global.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.inject.BindingAnnotation; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpRemoteAgent.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpRemoteAgent.java index e27ec3bb..df3b2685 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpRemoteAgent.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpRemoteAgent.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Function; import com.google.common.base.Preconditions; @@ -7,13 +7,13 @@ import com.google.common.collect.Iterables; import com.proofpoint.discovery.client.ServiceDescriptor; import com.proofpoint.discovery.client.ServiceDescriptorsRepresentation; -import com.proofpoint.galaxy.shared.AgentStatus; -import com.proofpoint.galaxy.shared.AgentStatusRepresentation; -import com.proofpoint.galaxy.shared.Installation; -import com.proofpoint.galaxy.shared.InstallationRepresentation; -import com.proofpoint.galaxy.shared.SlotLifecycleState; -import com.proofpoint.galaxy.shared.SlotStatus; -import com.proofpoint.galaxy.shared.SlotStatusRepresentation; +import io.airlift.airship.shared.AgentStatus; +import io.airlift.airship.shared.AgentStatusRepresentation; +import io.airlift.airship.shared.Installation; +import io.airlift.airship.shared.InstallationRepresentation; +import io.airlift.airship.shared.SlotLifecycleState; +import io.airlift.airship.shared.SlotStatus; +import io.airlift.airship.shared.SlotStatusRepresentation; import com.proofpoint.http.client.HttpClient; import com.proofpoint.http.client.Request; import com.proofpoint.http.client.RequestBuilder; @@ -26,11 +26,11 @@ import java.util.concurrent.atomic.AtomicBoolean; import static com.google.common.net.HttpHeaders.CONTENT_TYPE; -import static com.proofpoint.galaxy.shared.AgentLifecycleState.OFFLINE; -import static com.proofpoint.galaxy.shared.AgentLifecycleState.ONLINE; -import static com.proofpoint.galaxy.shared.AgentLifecycleState.PROVISIONING; -import static com.proofpoint.galaxy.shared.HttpUriBuilder.uriBuilderFrom; -import static com.proofpoint.galaxy.shared.VersionsUtil.GALAXY_AGENT_VERSION_HEADER; +import static io.airlift.airship.shared.AgentLifecycleState.OFFLINE; +import static io.airlift.airship.shared.AgentLifecycleState.ONLINE; +import static io.airlift.airship.shared.AgentLifecycleState.PROVISIONING; +import static io.airlift.airship.shared.HttpUriBuilder.uriBuilderFrom; +import static io.airlift.airship.shared.VersionsUtil.AIRSHIP_AGENT_VERSION_HEADER; import static com.proofpoint.http.client.JsonBodyGenerator.jsonBodyGenerator; import static com.proofpoint.http.client.JsonResponseHandler.createJsonResponseHandler; import static com.proofpoint.http.client.StatusResponseHandler.createStatusResponseHandler; @@ -169,7 +169,7 @@ public SlotStatus install(Installation installation) Request request = RequestBuilder.preparePost() .setUri(uriBuilderFrom(internalUri).replacePath("/v1/agent/slot/").build()) .setHeader(CONTENT_TYPE, APPLICATION_JSON) - .setHeader(GALAXY_AGENT_VERSION_HEADER, status().getVersion()) + .setHeader(AIRSHIP_AGENT_VERSION_HEADER, status().getVersion()) .setBodyGenerator(jsonBodyGenerator(installationCodec, InstallationRepresentation.from(installation))) .build(); SlotStatusRepresentation slotStatusRepresentation = httpClient.execute(request, createJsonResponseHandler(slotStatusCodec, Status.CREATED.getStatusCode())); diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpRemoteAgentFactory.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpRemoteAgentFactory.java index a276847a..4181df82 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpRemoteAgentFactory.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpRemoteAgentFactory.java @@ -1,15 +1,15 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.inject.Inject; import com.proofpoint.discovery.client.ServiceDescriptorsRepresentation; -import com.proofpoint.galaxy.shared.AgentLifecycleState; -import com.proofpoint.galaxy.shared.AgentStatus; -import com.proofpoint.galaxy.shared.AgentStatusRepresentation; -import com.proofpoint.galaxy.shared.InstallationRepresentation; -import com.proofpoint.galaxy.shared.SlotStatus; -import com.proofpoint.galaxy.shared.SlotStatusRepresentation; +import io.airlift.airship.shared.AgentLifecycleState; +import io.airlift.airship.shared.AgentStatus; +import io.airlift.airship.shared.AgentStatusRepresentation; +import io.airlift.airship.shared.InstallationRepresentation; +import io.airlift.airship.shared.SlotStatus; +import io.airlift.airship.shared.SlotStatusRepresentation; import com.proofpoint.http.client.ApacheHttpClient; import com.proofpoint.http.client.HttpClient; import com.proofpoint.json.JsonCodec; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpRemoteSlot.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpRemoteSlot.java index 992fcc8e..37fd6075 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpRemoteSlot.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpRemoteSlot.java @@ -1,10 +1,10 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Preconditions; -import com.proofpoint.galaxy.shared.Installation; -import com.proofpoint.galaxy.shared.InstallationRepresentation; -import com.proofpoint.galaxy.shared.SlotStatus; -import com.proofpoint.galaxy.shared.SlotStatusRepresentation; +import io.airlift.airship.shared.Installation; +import io.airlift.airship.shared.InstallationRepresentation; +import io.airlift.airship.shared.SlotStatus; +import io.airlift.airship.shared.SlotStatusRepresentation; import com.proofpoint.http.client.HttpClient; import com.proofpoint.http.client.Request; import com.proofpoint.http.client.RequestBuilder; @@ -16,10 +16,10 @@ import static com.google.common.base.Charsets.UTF_8; import static com.google.common.net.HttpHeaders.CONTENT_TYPE; -import static com.proofpoint.galaxy.shared.HttpUriBuilder.uriBuilderFrom; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.UNKNOWN; -import static com.proofpoint.galaxy.shared.VersionsUtil.GALAXY_AGENT_VERSION_HEADER; -import static com.proofpoint.galaxy.shared.VersionsUtil.GALAXY_SLOT_VERSION_HEADER; +import static io.airlift.airship.shared.HttpUriBuilder.uriBuilderFrom; +import static io.airlift.airship.shared.SlotLifecycleState.UNKNOWN; +import static io.airlift.airship.shared.VersionsUtil.AIRSHIP_AGENT_VERSION_HEADER; +import static io.airlift.airship.shared.VersionsUtil.AIRSHIP_SLOT_VERSION_HEADER; import static com.proofpoint.http.client.JsonBodyGenerator.jsonBodyGenerator; import static com.proofpoint.http.client.JsonResponseHandler.createJsonResponseHandler; import static com.proofpoint.http.client.StaticBodyGenerator.createStaticBodyGenerator; @@ -82,8 +82,8 @@ public SlotStatus assign(Installation installation) Request request = RequestBuilder.preparePut() .setUri(uriBuilderFrom(slotStatus.getSelf()).appendPath("assignment").build()) .setHeader(CONTENT_TYPE, APPLICATION_JSON) - .setHeader(GALAXY_AGENT_VERSION_HEADER, agent.status().getVersion()) - .setHeader(GALAXY_SLOT_VERSION_HEADER, slotStatus.getVersion()) + .setHeader(AIRSHIP_AGENT_VERSION_HEADER, agent.status().getVersion()) + .setHeader(AIRSHIP_SLOT_VERSION_HEADER, slotStatus.getVersion()) .setBodyGenerator(jsonBodyGenerator(installationCodec, InstallationRepresentation.from(installation))) .build(); SlotStatusRepresentation slotStatusRepresentation = httpClient.execute(request, createJsonResponseHandler(slotStatusCodec, Status.OK.getStatusCode())); @@ -103,8 +103,8 @@ public SlotStatus terminate() try { Request request = RequestBuilder.prepareDelete() .setUri(slotStatus.getSelf()) - .setHeader(GALAXY_AGENT_VERSION_HEADER, agent.status().getVersion()) - .setHeader(GALAXY_SLOT_VERSION_HEADER, slotStatus.getVersion()) + .setHeader(AIRSHIP_AGENT_VERSION_HEADER, agent.status().getVersion()) + .setHeader(AIRSHIP_SLOT_VERSION_HEADER, slotStatus.getVersion()) .build(); SlotStatusRepresentation slotStatusRepresentation = httpClient.execute(request, createJsonResponseHandler(slotStatusCodec, Status.OK.getStatusCode())); @@ -123,8 +123,8 @@ public SlotStatus start() try { Request request = RequestBuilder.preparePut() .setUri(uriBuilderFrom(slotStatus.getSelf()).appendPath("lifecycle").build()) - .setHeader(GALAXY_AGENT_VERSION_HEADER, agent.status().getVersion()) - .setHeader(GALAXY_SLOT_VERSION_HEADER, slotStatus.getVersion()) + .setHeader(AIRSHIP_AGENT_VERSION_HEADER, agent.status().getVersion()) + .setHeader(AIRSHIP_SLOT_VERSION_HEADER, slotStatus.getVersion()) .setBodyGenerator(createStaticBodyGenerator("running", UTF_8)) .build(); SlotStatusRepresentation slotStatusRepresentation = httpClient.execute(request, createJsonResponseHandler(slotStatusCodec, Status.OK.getStatusCode())); @@ -144,8 +144,8 @@ public SlotStatus restart() try { Request request = RequestBuilder.preparePut() .setUri(uriBuilderFrom(slotStatus.getSelf()).appendPath("lifecycle").build()) - .setHeader(GALAXY_AGENT_VERSION_HEADER, agent.status().getVersion()) - .setHeader(GALAXY_SLOT_VERSION_HEADER, slotStatus.getVersion()) + .setHeader(AIRSHIP_AGENT_VERSION_HEADER, agent.status().getVersion()) + .setHeader(AIRSHIP_SLOT_VERSION_HEADER, slotStatus.getVersion()) .setBodyGenerator(createStaticBodyGenerator("restarting", UTF_8)) .build(); SlotStatusRepresentation slotStatusRepresentation = httpClient.execute(request, createJsonResponseHandler(slotStatusCodec, Status.OK.getStatusCode())); @@ -165,8 +165,8 @@ public SlotStatus stop() try { Request request = RequestBuilder.preparePut() .setUri(uriBuilderFrom(slotStatus.getSelf()).appendPath("lifecycle").build()) - .setHeader(GALAXY_AGENT_VERSION_HEADER, agent.status().getVersion()) - .setHeader(GALAXY_SLOT_VERSION_HEADER, slotStatus.getVersion()) + .setHeader(AIRSHIP_AGENT_VERSION_HEADER, agent.status().getVersion()) + .setHeader(AIRSHIP_SLOT_VERSION_HEADER, slotStatus.getVersion()) .setBodyGenerator(createStaticBodyGenerator("stopped", UTF_8)) .build(); SlotStatusRepresentation slotStatusRepresentation = httpClient.execute(request, createJsonResponseHandler(slotStatusCodec, Status.OK.getStatusCode())); diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpRepository.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpRepository.java index 81eb05e5..a5e94d01 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpRepository.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpRepository.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Function; import com.google.common.base.Preconditions; @@ -8,7 +8,7 @@ import com.google.common.io.ByteStreams; import com.google.common.io.InputSupplier; import com.google.common.io.Resources; -import com.proofpoint.galaxy.shared.Repository; +import io.airlift.airship.shared.Repository; import javax.annotation.Nullable; import javax.inject.Inject; @@ -20,9 +20,9 @@ import java.util.regex.Pattern; import static com.google.common.collect.Sets.newHashSet; -import static com.proofpoint.galaxy.shared.HttpUriBuilder.uriBuilderFrom; -import static com.proofpoint.galaxy.shared.MavenCoordinates.DEFAULT_BINARY_PACKAGING; -import static com.proofpoint.galaxy.shared.MavenCoordinates.DEFAULT_CONFIG_PACKAGING; +import static io.airlift.airship.shared.HttpUriBuilder.uriBuilderFrom; +import static io.airlift.airship.shared.MavenCoordinates.DEFAULT_BINARY_PACKAGING; +import static io.airlift.airship.shared.MavenCoordinates.DEFAULT_CONFIG_PACKAGING; public class HttpRepository implements Repository { diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpServiceInventory.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpServiceInventory.java index 2544523f..d9ed30f8 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpServiceInventory.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/HttpServiceInventory.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Charsets; import com.google.common.base.Preconditions; @@ -23,12 +23,12 @@ import com.google.inject.Inject; import com.proofpoint.discovery.client.ServiceDescriptor; import com.proofpoint.discovery.client.ServiceState; -import com.proofpoint.galaxy.shared.Assignment; -import com.proofpoint.galaxy.shared.DigestUtils; -import com.proofpoint.galaxy.shared.Repository; -import com.proofpoint.galaxy.shared.ConfigUtils; -import com.proofpoint.galaxy.shared.SlotLifecycleState; -import com.proofpoint.galaxy.shared.SlotStatus; +import io.airlift.airship.shared.Assignment; +import io.airlift.airship.shared.DigestUtils; +import io.airlift.airship.shared.Repository; +import io.airlift.airship.shared.ConfigUtils; +import io.airlift.airship.shared.SlotLifecycleState; +import io.airlift.airship.shared.SlotStatus; import com.proofpoint.json.JsonCodec; import com.proofpoint.log.Logger; @@ -101,7 +101,7 @@ private Map interpolateProperties(Map properties for (Entry entry : properties.entrySet()) { String key = entry.getKey(); String value = entry.getValue(); - value = value.replaceAll(Pattern.quote("${galaxy.host}"), slotStatus.getSelf().getHost()); + value = value.replaceAll(Pattern.quote("${airship.host}"), slotStatus.getSelf().getHost()); builder.put(key, value); } return builder.build(); @@ -130,7 +130,7 @@ private List getServiceInventory(SlotStatus slotStatus) } } - InputSupplier configFile = ConfigUtils.newConfigEntrySupplier(repository, config, "galaxy-service-inventory.json"); + InputSupplier configFile = ConfigUtils.newConfigEntrySupplier(repository, config, "airship-service-inventory.json"); if (configFile == null) { return null; } diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/InMemoryStateManager.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/InMemoryStateManager.java index b52d33db..65dac22a 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/InMemoryStateManager.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/InMemoryStateManager.java @@ -1,7 +1,7 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.collect.ImmutableList; -import com.proofpoint.galaxy.shared.ExpectedSlotStatus; +import io.airlift.airship.shared.ExpectedSlotStatus; import java.util.Collection; import java.util.UUID; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/InputSupplierStreamingOutput.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/InputSupplierStreamingOutput.java index 30106cf1..ea382238 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/InputSupplierStreamingOutput.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/InputSupplierStreamingOutput.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.io.ByteStreams; import com.google.common.io.InputSupplier; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/Instance.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/Instance.java index f61e82b4..c61a52d5 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/Instance.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/Instance.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Objects; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/InvalidSlotFilterException.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/InvalidSlotFilterException.java index 32413918..d978b140 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/InvalidSlotFilterException.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/InvalidSlotFilterException.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; public class InvalidSlotFilterException extends RuntimeException { diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/InvalidSlotFilterExceptionMapper.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/InvalidSlotFilterExceptionMapper.java index eacb5484..64885442 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/InvalidSlotFilterExceptionMapper.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/InvalidSlotFilterExceptionMapper.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/LocalProvisionerConfig.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/LocalProvisionerConfig.java index 3affd918..e07143fc 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/LocalProvisionerConfig.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/LocalProvisionerConfig.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/LocalProvisionerModule.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/LocalProvisionerModule.java index 6aa31003..4da9951b 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/LocalProvisionerModule.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/LocalProvisionerModule.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.inject.Binder; import com.google.inject.Module; import com.google.inject.Scopes; import com.proofpoint.configuration.ConfigurationModule; -import com.proofpoint.galaxy.coordinator.auth.AuthorizedKeyStore; -import com.proofpoint.galaxy.coordinator.auth.FileAuthorizedKeyStore; +import io.airlift.airship.coordinator.auth.AuthorizedKeyStore; +import io.airlift.airship.coordinator.auth.FileAuthorizedKeyStore; public class LocalProvisionerModule implements Module diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/MavenMetadata.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/MavenMetadata.java index e90f872b..3a7ce8d2 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/MavenMetadata.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/MavenMetadata.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/MavenRepository.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/MavenRepository.java index 8c1a6bd0..831ed174 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/MavenRepository.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/MavenRepository.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Objects; import com.google.common.base.Preconditions; @@ -10,10 +10,10 @@ import com.google.common.io.InputSupplier; import com.google.common.io.Resources; import com.google.inject.Inject; -import com.proofpoint.galaxy.coordinator.MavenMetadata.SnapshotVersion; -import com.proofpoint.galaxy.shared.HttpUriBuilder; -import com.proofpoint.galaxy.shared.MavenCoordinates; -import com.proofpoint.galaxy.shared.Repository; +import io.airlift.airship.coordinator.MavenMetadata.SnapshotVersion; +import io.airlift.airship.shared.HttpUriBuilder; +import io.airlift.airship.shared.MavenCoordinates; +import io.airlift.airship.shared.Repository; import java.io.IOException; import java.io.InputStream; @@ -28,9 +28,9 @@ import static com.google.common.base.Charsets.UTF_8; import static com.google.common.collect.Lists.newArrayList; -import static com.proofpoint.galaxy.shared.HttpUriBuilder.uriBuilderFrom; -import static com.proofpoint.galaxy.shared.MavenCoordinates.toBinaryGAV; -import static com.proofpoint.galaxy.shared.MavenCoordinates.toConfigGAV; +import static io.airlift.airship.shared.HttpUriBuilder.uriBuilderFrom; +import static io.airlift.airship.shared.MavenCoordinates.toBinaryGAV; +import static io.airlift.airship.shared.MavenCoordinates.toConfigGAV; public class MavenRepository implements Repository { diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/Provisioner.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/Provisioner.java index 84fe9346..fdd52366 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/Provisioner.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/Provisioner.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import java.util.List; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/RegexPredicate.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/RegexPredicate.java index ff56baa0..5a654343 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/RegexPredicate.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/RegexPredicate.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Predicate; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/RemoteAgent.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/RemoteAgent.java index 67478649..17a01e0d 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/RemoteAgent.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/RemoteAgent.java @@ -1,9 +1,9 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.proofpoint.discovery.client.ServiceDescriptor; -import com.proofpoint.galaxy.shared.AgentStatus; -import com.proofpoint.galaxy.shared.Installation; -import com.proofpoint.galaxy.shared.SlotStatus; +import io.airlift.airship.shared.AgentStatus; +import io.airlift.airship.shared.Installation; +import io.airlift.airship.shared.SlotStatus; import java.net.URI; import java.util.List; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/RemoteAgentFactory.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/RemoteAgentFactory.java index b82c8ad6..32fb50b4 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/RemoteAgentFactory.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/RemoteAgentFactory.java @@ -1,6 +1,6 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; -import com.proofpoint.galaxy.shared.AgentLifecycleState; +import io.airlift.airship.shared.AgentLifecycleState; public interface RemoteAgentFactory { diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/RemoteSlot.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/RemoteSlot.java index 9b7ad86e..33e14759 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/RemoteSlot.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/RemoteSlot.java @@ -1,7 +1,7 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; -import com.proofpoint.galaxy.shared.SlotStatus; -import com.proofpoint.galaxy.shared.Installation; +import io.airlift.airship.shared.SlotStatus; +import io.airlift.airship.shared.Installation; import java.util.UUID; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/ServiceInventory.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/ServiceInventory.java index bbb2d2df..946f5727 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/ServiceInventory.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/ServiceInventory.java @@ -1,7 +1,7 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.proofpoint.discovery.client.ServiceDescriptor; -import com.proofpoint.galaxy.shared.SlotStatus; +import io.airlift.airship.shared.SlotStatus; import java.util.List; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/ServiceInventoryResource.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/ServiceInventoryResource.java index be5ba22f..7b38a96b 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/ServiceInventoryResource.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/ServiceInventoryResource.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Preconditions; import com.google.inject.Inject; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/SimpleDbStateManager.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/SimpleDbStateManager.java index 5f8fce29..ad09f507 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/SimpleDbStateManager.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/SimpleDbStateManager.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.amazonaws.AmazonClientException; import com.amazonaws.services.simpledb.AmazonSimpleDB; @@ -11,9 +11,9 @@ import com.amazonaws.services.simpledb.model.SelectRequest; import com.amazonaws.services.simpledb.model.SelectResult; import com.google.common.base.Preconditions; -import com.proofpoint.galaxy.shared.Assignment; -import com.proofpoint.galaxy.shared.ExpectedSlotStatus; -import com.proofpoint.galaxy.shared.SlotLifecycleState; +import io.airlift.airship.shared.Assignment; +import io.airlift.airship.shared.ExpectedSlotStatus; +import io.airlift.airship.shared.SlotLifecycleState; import com.proofpoint.log.Logger; import com.proofpoint.node.NodeInfo; @@ -36,7 +36,7 @@ public class SimpleDbStateManager implements StateManager public SimpleDbStateManager(AmazonSimpleDB simpleDb, NodeInfo nodeInfo) { this.simpleDb = simpleDb; - domainName = "galaxy-" + nodeInfo.getEnvironment(); + domainName = "airship-" + nodeInfo.getEnvironment(); } @Override diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/SlotFilterBuilder.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/SlotFilterBuilder.java index 960165ae..da78057f 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/SlotFilterBuilder.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/SlotFilterBuilder.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Function; import com.google.common.base.Preconditions; @@ -6,9 +6,9 @@ import com.google.common.base.Predicates; import com.google.common.collect.Collections2; import com.google.common.collect.Lists; -import com.proofpoint.galaxy.shared.HttpUriBuilder; -import com.proofpoint.galaxy.shared.SlotLifecycleState; -import com.proofpoint.galaxy.shared.SlotStatus; +import io.airlift.airship.shared.HttpUriBuilder; +import io.airlift.airship.shared.SlotLifecycleState; +import io.airlift.airship.shared.SlotStatus; import javax.annotation.Nullable; import javax.ws.rs.core.UriInfo; @@ -19,8 +19,8 @@ import java.util.UUID; import static com.google.common.base.Functions.compose; -import static com.proofpoint.galaxy.coordinator.StringFunctions.startsWith; -import static com.proofpoint.galaxy.coordinator.StringFunctions.toLowerCase; +import static io.airlift.airship.coordinator.StringFunctions.startsWith; +import static io.airlift.airship.coordinator.StringFunctions.toLowerCase; import static java.lang.String.format; public class SlotFilterBuilder diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/StateManager.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/StateManager.java index b9923aa2..c70b2645 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/StateManager.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/StateManager.java @@ -1,6 +1,6 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; -import com.proofpoint.galaxy.shared.ExpectedSlotStatus; +import io.airlift.airship.shared.ExpectedSlotStatus; import java.util.Collection; import java.util.UUID; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/StaticProvisioner.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/StaticProvisioner.java index 73bac98d..e9c9757a 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/StaticProvisioner.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/StaticProvisioner.java @@ -1,9 +1,9 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSortedMap; -import com.proofpoint.galaxy.shared.AgentStatusRepresentation; +import io.airlift.airship.shared.AgentStatusRepresentation; import com.proofpoint.http.client.HttpClient; import com.proofpoint.http.client.Request; import com.proofpoint.http.client.RequestBuilder; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/StringFunctions.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/StringFunctions.java index ae1f4a0b..575ce139 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/StringFunctions.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/StringFunctions.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Function; import com.google.common.base.Predicate; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/UriHostPredicate.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/UriHostPredicate.java index aeace2d0..dbd976d9 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/UriHostPredicate.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/UriHostPredicate.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Predicate; import com.google.common.net.InetAddresses; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/AuthConfig.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/AuthConfig.java index 929700ce..cb633625 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/AuthConfig.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/AuthConfig.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator.auth; +package io.airlift.airship.coordinator.auth; import com.proofpoint.configuration.Config; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/AuthFilter.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/AuthFilter.java index bb5f15d6..f410641d 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/AuthFilter.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/AuthFilter.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator.auth; +package io.airlift.airship.coordinator.auth; import com.google.common.base.Charsets; import com.google.common.base.Joiner; @@ -57,7 +57,7 @@ public void init(FilterConfig filterConfig) /** * Verify authorization header: * 
-     * Authorization: Galaxy fingerprint:signature
+     * Authorization: Airship fingerprint:signature
      * fingerprint = hex md5 of private key
      * signature = base64 signature of [ts, method, uri, bodyMd5]
      *
@@ -124,7 +124,7 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo // parse authorization header List authTokens = ImmutableList.copyOf(Splitter.on(' ').omitEmptyStrings().split(authorization)); - if ((authTokens.size() != 2) || (!authTokens.get(0).equals("Galaxy"))) { + if ((authTokens.size() != 2) || (!authTokens.get(0).equals("Airship"))) { sendError(response, BAD_REQUEST, "Invalid Authorization header"); return; } diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/AuthorizedKey.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/AuthorizedKey.java index a51585dd..c217087c 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/AuthorizedKey.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/AuthorizedKey.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator.auth; +package io.airlift.airship.coordinator.auth; public class AuthorizedKey { diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/AuthorizedKeyStore.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/AuthorizedKeyStore.java index 194e0fd5..628b75a4 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/AuthorizedKeyStore.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/AuthorizedKeyStore.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator.auth; +package io.airlift.airship.coordinator.auth; public interface AuthorizedKeyStore { diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/DsaPublicKey.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/DsaPublicKey.java index 232c0797..0a674e2e 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/DsaPublicKey.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/DsaPublicKey.java @@ -1,16 +1,16 @@ -package com.proofpoint.galaxy.coordinator.auth; +package io.airlift.airship.coordinator.auth; import com.google.common.base.Throwables; -import com.proofpoint.galaxy.coordinator.auth.ssh.DerWriter; -import com.proofpoint.galaxy.coordinator.auth.ssh.SshDsaPublicKey; -import com.proofpoint.galaxy.coordinator.auth.ssh.SshKeyReader; +import io.airlift.airship.coordinator.auth.ssh.DerWriter; +import io.airlift.airship.coordinator.auth.ssh.SshDsaPublicKey; +import io.airlift.airship.coordinator.auth.ssh.SshKeyReader; import java.io.IOException; import java.math.BigInteger; import java.security.Signature; import java.util.Arrays; -import static com.proofpoint.galaxy.coordinator.auth.ssh.DerType.SEQUENCE; +import static io.airlift.airship.coordinator.auth.ssh.DerType.SEQUENCE; public class DsaPublicKey extends PublicKey diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/FileAuthorizedKeyStore.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/FileAuthorizedKeyStore.java index 5684049e..db08f51b 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/FileAuthorizedKeyStore.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/FileAuthorizedKeyStore.java @@ -1,6 +1,6 @@ -package com.proofpoint.galaxy.coordinator.auth; +package io.airlift.airship.coordinator.auth; -import com.proofpoint.galaxy.coordinator.LocalProvisionerConfig; +import io.airlift.airship.coordinator.LocalProvisionerConfig; import javax.inject.Inject; import java.io.File; @@ -12,7 +12,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.Lists.newArrayList; import static com.google.common.io.Files.readLines; -import static com.proofpoint.galaxy.shared.FileUtils.listFiles; +import static io.airlift.airship.shared.FileUtils.listFiles; public class FileAuthorizedKeyStore implements AuthorizedKeyStore diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/Fingerprint.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/Fingerprint.java index 040b3466..61940c8f 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/Fingerprint.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/Fingerprint.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator.auth; +package io.airlift.airship.coordinator.auth; import org.apache.commons.codec.DecoderException; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/InMemoryAuthorizedKeyStore.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/InMemoryAuthorizedKeyStore.java index 52695ef2..5a3b71f6 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/InMemoryAuthorizedKeyStore.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/InMemoryAuthorizedKeyStore.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator.auth; +package io.airlift.airship.coordinator.auth; import com.google.common.collect.ImmutableMap; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/PublicKey.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/PublicKey.java index dab0a262..6002c0f8 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/PublicKey.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/PublicKey.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator.auth; +package io.airlift.airship.coordinator.auth; import com.google.common.base.Joiner; import com.google.common.base.Splitter; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/RequestWrapper.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/RequestWrapper.java index 60c9528c..e24172ed 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/RequestWrapper.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/RequestWrapper.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator.auth; +package io.airlift.airship.coordinator.auth; import com.google.common.io.ByteStreams; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/RsaPublicKey.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/RsaPublicKey.java index 44e92c2c..b782e795 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/RsaPublicKey.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/RsaPublicKey.java @@ -1,6 +1,6 @@ -package com.proofpoint.galaxy.coordinator.auth; +package io.airlift.airship.coordinator.auth; -import com.proofpoint.galaxy.coordinator.auth.ssh.SshRsaPublicKey; +import io.airlift.airship.coordinator.auth.ssh.SshRsaPublicKey; import java.security.Signature; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/S3AuthorizedKeyStore.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/S3AuthorizedKeyStore.java index 34a1f46d..40fceb55 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/S3AuthorizedKeyStore.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/S3AuthorizedKeyStore.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator.auth; +package io.airlift.airship.coordinator.auth; import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.model.ListObjectsRequest; @@ -14,7 +14,7 @@ import com.google.common.io.CharStreams; import com.google.common.io.InputSupplier; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import com.proofpoint.galaxy.coordinator.AwsProvisionerConfig; +import io.airlift.airship.coordinator.AwsProvisionerConfig; import com.proofpoint.units.Duration; import javax.annotation.PostConstruct; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ServletInputStreamFromInputStream.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ServletInputStreamFromInputStream.java index 8848cfd4..52ec200b 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ServletInputStreamFromInputStream.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ServletInputStreamFromInputStream.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator.auth; +package io.airlift.airship.coordinator.auth; import javax.servlet.ServletInputStream; import java.io.IOException; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/SignatureVerifier.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/SignatureVerifier.java index 59f055d1..b8605135 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/SignatureVerifier.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/SignatureVerifier.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator.auth; +package io.airlift.airship.coordinator.auth; import javax.inject.Inject; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/DerReader.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/DerReader.java index 75edbaf9..6800f1e4 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/DerReader.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/DerReader.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator.auth.ssh; +package io.airlift.airship.coordinator.auth.ssh; import com.google.common.io.ByteStreams; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/DerType.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/DerType.java index f495ee39..bc8bca96 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/DerType.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/DerType.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator.auth.ssh; +package io.airlift.airship.coordinator.auth.ssh; public enum DerType { diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/DerWriter.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/DerWriter.java index b2e9bfc3..750ec21f 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/DerWriter.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/DerWriter.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator.auth.ssh; +package io.airlift.airship.coordinator.auth.ssh; import com.google.common.base.Throwables; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/PemDecoder.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/PemDecoder.java index 9966425b..62c506bc 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/PemDecoder.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/PemDecoder.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator.auth.ssh; +package io.airlift.airship.coordinator.auth.ssh; import com.google.common.base.Splitter; import com.google.common.collect.ArrayListMultimap; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/PemDsaPrivateKey.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/PemDsaPrivateKey.java index 3dcad389..6a672a56 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/PemDsaPrivateKey.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/PemDsaPrivateKey.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator.auth.ssh; +package io.airlift.airship.coordinator.auth.ssh; import java.math.BigInteger; import java.security.interfaces.DSAParams; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/PemRsaPrivateKey.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/PemRsaPrivateKey.java index 78844c7c..907a8c28 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/PemRsaPrivateKey.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/PemRsaPrivateKey.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator.auth.ssh; +package io.airlift.airship.coordinator.auth.ssh; import java.math.BigInteger; import java.security.interfaces.RSAPrivateKey; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/SshDsaPublicKey.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/SshDsaPublicKey.java index c2d7a288..5beb26db 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/SshDsaPublicKey.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/SshDsaPublicKey.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator.auth.ssh; +package io.airlift.airship.coordinator.auth.ssh; import java.math.BigInteger; import java.security.interfaces.DSAParams; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/SshKeyReader.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/SshKeyReader.java index 1ba09fd6..b33c66b9 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/SshKeyReader.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/SshKeyReader.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator.auth.ssh; +package io.airlift.airship.coordinator.auth.ssh; import com.google.common.base.Charsets; import com.google.common.base.Throwables; diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/SshRsaPublicKey.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/SshRsaPublicKey.java index a2db3c17..34be0dc4 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/SshRsaPublicKey.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/auth/ssh/SshRsaPublicKey.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator.auth.ssh; +package io.airlift.airship.coordinator.auth.ssh; import java.math.BigInteger; import java.security.interfaces.RSAPublicKey; diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockProvisioner.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockProvisioner.java index 8a63d919..f41ea0a9 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockProvisioner.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockProvisioner.java @@ -1,13 +1,13 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; -import com.proofpoint.galaxy.shared.AgentLifecycleState; -import com.proofpoint.galaxy.shared.AgentStatus; -import com.proofpoint.galaxy.shared.SlotStatus; +import io.airlift.airship.shared.AgentLifecycleState; +import io.airlift.airship.shared.AgentStatus; +import io.airlift.airship.shared.SlotStatus; import java.net.URI; import java.util.List; diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockRemoteAgent.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockRemoteAgent.java index 75b28378..6b9f7c55 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockRemoteAgent.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockRemoteAgent.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Function; import com.google.common.base.Preconditions; @@ -6,11 +6,11 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.proofpoint.discovery.client.ServiceDescriptor; -import com.proofpoint.galaxy.shared.AgentLifecycleState; -import com.proofpoint.galaxy.shared.AgentStatus; -import com.proofpoint.galaxy.shared.Installation; -import com.proofpoint.galaxy.shared.SlotLifecycleState; -import com.proofpoint.galaxy.shared.SlotStatus; +import io.airlift.airship.shared.AgentLifecycleState; +import io.airlift.airship.shared.AgentStatus; +import io.airlift.airship.shared.Installation; +import io.airlift.airship.shared.SlotLifecycleState; +import io.airlift.airship.shared.SlotStatus; import java.net.URI; import java.util.List; @@ -18,9 +18,9 @@ import java.util.UUID; import static com.google.common.base.Preconditions.checkNotNull; -import static com.proofpoint.galaxy.shared.AgentLifecycleState.*; -import static com.proofpoint.galaxy.shared.HttpUriBuilder.uriBuilderFrom; -import static com.proofpoint.galaxy.shared.SlotStatus.createSlotStatus; +import static io.airlift.airship.shared.AgentLifecycleState.*; +import static io.airlift.airship.shared.HttpUriBuilder.uriBuilderFrom; +import static io.airlift.airship.shared.SlotStatus.createSlotStatus; public class MockRemoteAgent implements RemoteAgent { diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockRemoteAgentFactory.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockRemoteAgentFactory.java index 98795022..631495f0 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockRemoteAgentFactory.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockRemoteAgentFactory.java @@ -1,8 +1,8 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Preconditions; -import com.proofpoint.galaxy.shared.AgentLifecycleState; -import com.proofpoint.galaxy.shared.AgentStatus; +import io.airlift.airship.shared.AgentLifecycleState; +import io.airlift.airship.shared.AgentStatus; import java.util.Map; diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockRemoteSlot.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockRemoteSlot.java index b54b36ab..2a8b077a 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockRemoteSlot.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockRemoteSlot.java @@ -1,14 +1,14 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Preconditions; -import com.proofpoint.galaxy.shared.SlotStatus; -import com.proofpoint.galaxy.shared.Installation; +import io.airlift.airship.shared.SlotStatus; +import io.airlift.airship.shared.Installation; import java.util.UUID; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.RUNNING; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.STOPPED; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.TERMINATED; +import static io.airlift.airship.shared.SlotLifecycleState.RUNNING; +import static io.airlift.airship.shared.SlotLifecycleState.STOPPED; +import static io.airlift.airship.shared.SlotLifecycleState.TERMINATED; public class MockRemoteSlot implements RemoteSlot { diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockServiceInventory.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockServiceInventory.java index 18dd0cae..2451c3d1 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockServiceInventory.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/MockServiceInventory.java @@ -1,9 +1,9 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.proofpoint.discovery.client.ServiceDescriptor; -import com.proofpoint.galaxy.shared.SlotStatus; +import io.airlift.airship.shared.SlotStatus; import java.util.List; diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestAdminResource.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestAdminResource.java index 6882ae50..3a74b31f 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestAdminResource.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestAdminResource.java @@ -1,16 +1,16 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; -import com.proofpoint.galaxy.shared.AgentLifecycleState; -import com.proofpoint.galaxy.shared.AgentStatus; -import com.proofpoint.galaxy.shared.AgentStatusRepresentation; -import com.proofpoint.galaxy.shared.CoordinatorLifecycleState; -import com.proofpoint.galaxy.shared.CoordinatorStatus; -import com.proofpoint.galaxy.shared.CoordinatorStatusRepresentation; -import com.proofpoint.galaxy.shared.MockUriInfo; -import com.proofpoint.galaxy.shared.SlotStatus; +import io.airlift.airship.shared.AgentLifecycleState; +import io.airlift.airship.shared.AgentStatus; +import io.airlift.airship.shared.AgentStatusRepresentation; +import io.airlift.airship.shared.CoordinatorLifecycleState; +import io.airlift.airship.shared.CoordinatorStatus; +import io.airlift.airship.shared.CoordinatorStatusRepresentation; +import io.airlift.airship.shared.MockUriInfo; +import io.airlift.airship.shared.SlotStatus; import com.proofpoint.units.Duration; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -23,7 +23,7 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; -import static com.proofpoint.galaxy.shared.ExtraAssertions.assertEqualsNoOrder; +import static io.airlift.airship.shared.ExtraAssertions.assertEqualsNoOrder; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestAgentFilterBuilder.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestAgentFilterBuilder.java index 1a686a87..12ab6c26 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestAgentFilterBuilder.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestAgentFilterBuilder.java @@ -1,18 +1,18 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.proofpoint.galaxy.coordinator.AgentFilterBuilder.AssignablePredicate; -import com.proofpoint.galaxy.coordinator.AgentFilterBuilder.HostPredicate; -import com.proofpoint.galaxy.coordinator.AgentFilterBuilder.MachinePredicate; -import com.proofpoint.galaxy.coordinator.AgentFilterBuilder.SlotUuidPredicate; -import com.proofpoint.galaxy.coordinator.AgentFilterBuilder.StatePredicate; -import com.proofpoint.galaxy.coordinator.AgentFilterBuilder.UuidPredicate; -import com.proofpoint.galaxy.shared.AgentStatus; -import com.proofpoint.galaxy.shared.MockUriInfo; -import com.proofpoint.galaxy.shared.Repository; -import com.proofpoint.galaxy.shared.SlotStatus; +import io.airlift.airship.coordinator.AgentFilterBuilder.AssignablePredicate; +import io.airlift.airship.coordinator.AgentFilterBuilder.HostPredicate; +import io.airlift.airship.coordinator.AgentFilterBuilder.MachinePredicate; +import io.airlift.airship.coordinator.AgentFilterBuilder.SlotUuidPredicate; +import io.airlift.airship.coordinator.AgentFilterBuilder.StatePredicate; +import io.airlift.airship.coordinator.AgentFilterBuilder.UuidPredicate; +import io.airlift.airship.shared.AgentStatus; +import io.airlift.airship.shared.MockUriInfo; +import io.airlift.airship.shared.Repository; +import io.airlift.airship.shared.SlotStatus; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -21,12 +21,12 @@ import java.util.List; import java.util.UUID; -import static com.proofpoint.galaxy.shared.AgentLifecycleState.OFFLINE; -import static com.proofpoint.galaxy.shared.AgentLifecycleState.ONLINE; -import static com.proofpoint.galaxy.shared.AssignmentHelper.APPLE_ASSIGNMENT; -import static com.proofpoint.galaxy.shared.AssignmentHelper.BANANA_ASSIGNMENT; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.UNKNOWN; -import static com.proofpoint.galaxy.shared.SlotStatus.createSlotStatus; +import static io.airlift.airship.shared.AgentLifecycleState.OFFLINE; +import static io.airlift.airship.shared.AgentLifecycleState.ONLINE; +import static io.airlift.airship.shared.AssignmentHelper.APPLE_ASSIGNMENT; +import static io.airlift.airship.shared.AssignmentHelper.BANANA_ASSIGNMENT; +import static io.airlift.airship.shared.SlotLifecycleState.UNKNOWN; +import static io.airlift.airship.shared.SlotStatus.createSlotStatus; import static java.util.Arrays.asList; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestAssignmentRepresentation.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestAssignmentRepresentation.java index 68e01ac9..7d7be5ba 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestAssignmentRepresentation.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestAssignmentRepresentation.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Charsets; import com.google.common.io.Resources; import com.proofpoint.json.JsonCodec; -import com.proofpoint.galaxy.shared.AssignmentRepresentation; +import io.airlift.airship.shared.AssignmentRepresentation; import org.testng.annotations.Test; import static com.proofpoint.json.JsonCodec.jsonCodec; -import static com.proofpoint.galaxy.shared.AssignmentHelper.APPLE_ASSIGNMENT; +import static io.airlift.airship.shared.AssignmentHelper.APPLE_ASSIGNMENT; import static org.testng.Assert.assertEquals; public class TestAssignmentRepresentation diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestAwsProvisionerConfig.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestAwsProvisionerConfig.java index 7de5ee69..a94578a0 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestAwsProvisionerConfig.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestAwsProvisionerConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.collect.ImmutableMap; import com.proofpoint.configuration.testing.ConfigAssertions; diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinator.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinator.java index 6b5c7bb3..1d07e71e 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinator.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinator.java @@ -1,14 +1,14 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; -import com.proofpoint.galaxy.shared.AgentLifecycleState; -import com.proofpoint.galaxy.shared.AgentStatus; -import com.proofpoint.galaxy.shared.CoordinatorLifecycleState; -import com.proofpoint.galaxy.shared.CoordinatorStatus; -import com.proofpoint.galaxy.shared.SlotStatus; +import io.airlift.airship.shared.AgentLifecycleState; +import io.airlift.airship.shared.AgentStatus; +import io.airlift.airship.shared.CoordinatorLifecycleState; +import io.airlift.airship.shared.CoordinatorStatus; +import io.airlift.airship.shared.SlotStatus; import com.proofpoint.units.Duration; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -20,11 +20,11 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; -import static com.proofpoint.galaxy.shared.AssignmentHelper.APPLE_ASSIGNMENT; -import static com.proofpoint.galaxy.shared.AssignmentHelper.BANANA_ASSIGNMENT; -import static com.proofpoint.galaxy.shared.AssignmentHelper.RESOLVED_APPLE_ASSIGNMENT; -import static com.proofpoint.galaxy.shared.AssignmentHelper.SHORT_APPLE_ASSIGNMENT; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.STOPPED; +import static io.airlift.airship.shared.AssignmentHelper.APPLE_ASSIGNMENT; +import static io.airlift.airship.shared.AssignmentHelper.BANANA_ASSIGNMENT; +import static io.airlift.airship.shared.AssignmentHelper.RESOLVED_APPLE_ASSIGNMENT; +import static io.airlift.airship.shared.AssignmentHelper.SHORT_APPLE_ASSIGNMENT; +import static io.airlift.airship.shared.SlotLifecycleState.STOPPED; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorAssignmentResource.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorAssignmentResource.java index 1ed12fe0..7ee41221 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorAssignmentResource.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorAssignmentResource.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList.Builder; import com.google.common.collect.ImmutableMap; -import com.proofpoint.galaxy.shared.AgentStatus; -import com.proofpoint.galaxy.shared.SlotLifecycleState; -import com.proofpoint.galaxy.shared.MockUriInfo; -import com.proofpoint.galaxy.shared.SlotStatus; -import com.proofpoint.galaxy.shared.SlotStatusRepresentation; -import com.proofpoint.galaxy.shared.UpgradeVersions; +import io.airlift.airship.shared.AgentStatus; +import io.airlift.airship.shared.SlotLifecycleState; +import io.airlift.airship.shared.MockUriInfo; +import io.airlift.airship.shared.SlotStatus; +import io.airlift.airship.shared.SlotStatusRepresentation; +import io.airlift.airship.shared.UpgradeVersions; import com.proofpoint.http.server.HttpServerConfig; import com.proofpoint.http.server.HttpServerInfo; import com.proofpoint.node.NodeInfo; @@ -36,15 +36,15 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; -import static com.proofpoint.galaxy.coordinator.CoordinatorSlotResource.MIN_PREFIX_SIZE; -import static com.proofpoint.galaxy.shared.Strings.shortestUniquePrefix; -import static com.proofpoint.galaxy.shared.AgentLifecycleState.ONLINE; -import static com.proofpoint.galaxy.shared.AssignmentHelper.APPLE_ASSIGNMENT; -import static com.proofpoint.galaxy.shared.AssignmentHelper.BANANA_ASSIGNMENT; -import static com.proofpoint.galaxy.shared.ExtraAssertions.assertEqualsNoOrder; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.STOPPED; -import static com.proofpoint.galaxy.coordinator.TestingMavenRepository.MOCK_REPO; -import static com.proofpoint.galaxy.shared.SlotStatus.createSlotStatus; +import static io.airlift.airship.coordinator.CoordinatorSlotResource.MIN_PREFIX_SIZE; +import static io.airlift.airship.shared.Strings.shortestUniquePrefix; +import static io.airlift.airship.shared.AgentLifecycleState.ONLINE; +import static io.airlift.airship.shared.AssignmentHelper.APPLE_ASSIGNMENT; +import static io.airlift.airship.shared.AssignmentHelper.BANANA_ASSIGNMENT; +import static io.airlift.airship.shared.ExtraAssertions.assertEqualsNoOrder; +import static io.airlift.airship.shared.SlotLifecycleState.STOPPED; +import static io.airlift.airship.coordinator.TestingMavenRepository.MOCK_REPO; +import static io.airlift.airship.shared.SlotStatus.createSlotStatus; import static java.util.Arrays.asList; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorConfig.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorConfig.java index 169c42c9..81d1334d 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorConfig.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorConfig.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -9,7 +9,7 @@ import java.util.Map; import java.util.concurrent.TimeUnit; -import static com.proofpoint.galaxy.coordinator.CoordinatorConfig.DEFAULT_HTTP_SHORT_NAME_PATTERN; +import static io.airlift.airship.coordinator.CoordinatorConfig.DEFAULT_HTTP_SHORT_NAME_PATTERN; public class TestCoordinatorConfig { @@ -17,7 +17,7 @@ public class TestCoordinatorConfig public void testDefaults() { ConfigAssertions.assertRecordedDefaults(ConfigAssertions.recordDefaults(CoordinatorConfig.class) - .setGalaxyVersion(null) + .setAirshipVersion(null) .setStatusExpiration(new Duration(30, TimeUnit.SECONDS)) .setServiceInventoryCacheDir("service-inventory-cache") .setAgentDefaultConfig(null) @@ -34,7 +34,7 @@ public void testDefaults() public void testExplicitPropertyMappings() { Map properties = new ImmutableMap.Builder() - .put("galaxy.version", "99.9") + .put("airship.version", "99.9") .put("coordinator.status.expiration", "1m") .put("coordinator.service-inventory.cache-dir", "si-cache") .put("coordinator.agent.default-config", "agent:config:1") @@ -47,7 +47,7 @@ public void testExplicitPropertyMappings() .build(); CoordinatorConfig expected = new CoordinatorConfig() - .setGalaxyVersion("99.9") + .setAirshipVersion("99.9") .setStatusExpiration(new Duration(1, TimeUnit.MINUTES)) .setServiceInventoryCacheDir("si-cache") .setAgentDefaultConfig("agent:config:1") diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorFilterBuilder.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorFilterBuilder.java index 08cb8894..f7cf753a 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorFilterBuilder.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorFilterBuilder.java @@ -1,18 +1,18 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Predicate; -import com.proofpoint.galaxy.coordinator.CoordinatorFilterBuilder.HostPredicate; -import com.proofpoint.galaxy.coordinator.CoordinatorFilterBuilder.MachinePredicate; -import com.proofpoint.galaxy.coordinator.CoordinatorFilterBuilder.StatePredicate; -import com.proofpoint.galaxy.coordinator.CoordinatorFilterBuilder.UuidPredicate; -import com.proofpoint.galaxy.shared.CoordinatorStatus; -import com.proofpoint.galaxy.shared.MockUriInfo; +import io.airlift.airship.coordinator.CoordinatorFilterBuilder.HostPredicate; +import io.airlift.airship.coordinator.CoordinatorFilterBuilder.MachinePredicate; +import io.airlift.airship.coordinator.CoordinatorFilterBuilder.StatePredicate; +import io.airlift.airship.coordinator.CoordinatorFilterBuilder.UuidPredicate; +import io.airlift.airship.shared.CoordinatorStatus; +import io.airlift.airship.shared.MockUriInfo; import org.testng.annotations.Test; import java.net.URI; -import static com.proofpoint.galaxy.shared.CoordinatorLifecycleState.OFFLINE; -import static com.proofpoint.galaxy.shared.CoordinatorLifecycleState.ONLINE; +import static io.airlift.airship.shared.CoordinatorLifecycleState.OFFLINE; +import static io.airlift.airship.shared.CoordinatorLifecycleState.ONLINE; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorLifecycleResource.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorLifecycleResource.java index 7070d032..7c1a5ae9 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorLifecycleResource.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorLifecycleResource.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList.Builder; import com.google.common.collect.ImmutableMap; -import com.proofpoint.galaxy.shared.AgentStatus; -import com.proofpoint.galaxy.shared.SlotLifecycleState; -import com.proofpoint.galaxy.shared.MockUriInfo; -import com.proofpoint.galaxy.shared.SlotStatus; -import com.proofpoint.galaxy.shared.SlotStatusRepresentation; -import com.proofpoint.galaxy.shared.VersionConflictException; -import com.proofpoint.galaxy.shared.VersionsUtil; +import io.airlift.airship.shared.AgentStatus; +import io.airlift.airship.shared.SlotLifecycleState; +import io.airlift.airship.shared.MockUriInfo; +import io.airlift.airship.shared.SlotStatus; +import io.airlift.airship.shared.SlotStatusRepresentation; +import io.airlift.airship.shared.VersionConflictException; +import io.airlift.airship.shared.VersionsUtil; import com.proofpoint.http.server.HttpServerConfig; import com.proofpoint.http.server.HttpServerInfo; import com.proofpoint.node.NodeInfo; @@ -37,17 +37,17 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; -import static com.proofpoint.galaxy.coordinator.CoordinatorSlotResource.MIN_PREFIX_SIZE; -import static com.proofpoint.galaxy.shared.Strings.shortestUniquePrefix; -import static com.proofpoint.galaxy.coordinator.TestingMavenRepository.MOCK_REPO; -import static com.proofpoint.galaxy.shared.AgentLifecycleState.ONLINE; -import static com.proofpoint.galaxy.shared.AssignmentHelper.APPLE_ASSIGNMENT; -import static com.proofpoint.galaxy.shared.AssignmentHelper.BANANA_ASSIGNMENT; -import static com.proofpoint.galaxy.shared.ExtraAssertions.assertEqualsNoOrder; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.RUNNING; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.STOPPED; -import static com.proofpoint.galaxy.shared.SlotStatus.createSlotStatus; -import static com.proofpoint.galaxy.shared.VersionsUtil.GALAXY_SLOTS_VERSION_HEADER; +import static io.airlift.airship.coordinator.CoordinatorSlotResource.MIN_PREFIX_SIZE; +import static io.airlift.airship.shared.Strings.shortestUniquePrefix; +import static io.airlift.airship.coordinator.TestingMavenRepository.MOCK_REPO; +import static io.airlift.airship.shared.AgentLifecycleState.ONLINE; +import static io.airlift.airship.shared.AssignmentHelper.APPLE_ASSIGNMENT; +import static io.airlift.airship.shared.AssignmentHelper.BANANA_ASSIGNMENT; +import static io.airlift.airship.shared.ExtraAssertions.assertEqualsNoOrder; +import static io.airlift.airship.shared.SlotLifecycleState.RUNNING; +import static io.airlift.airship.shared.SlotLifecycleState.STOPPED; +import static io.airlift.airship.shared.SlotStatus.createSlotStatus; +import static io.airlift.airship.shared.VersionsUtil.AIRSHIP_SLOTS_VERSION_HEADER; import static java.util.Arrays.asList; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; @@ -210,7 +210,7 @@ public void testInvalidVersion() fail("Expected VersionConflictException"); } catch (VersionConflictException e) { - assertEquals(e.getName(), GALAXY_SLOTS_VERSION_HEADER); + assertEquals(e.getName(), AIRSHIP_SLOTS_VERSION_HEADER); assertEquals(e.getVersion(), VersionsUtil.createSlotsVersion(coordinator.getAllSlotsStatus(SlotFilterBuilder.build(uriInfo, false, ImmutableList.of())))); } } diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorServer.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorServer.java index 52970983..623d051e 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorServer.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorServer.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; @@ -27,17 +27,17 @@ import com.proofpoint.configuration.ConfigurationFactory; import com.proofpoint.configuration.ConfigurationModule; import com.proofpoint.event.client.NullEventModule; -import com.proofpoint.galaxy.shared.AgentLifecycleState; -import com.proofpoint.galaxy.shared.AgentStatus; -import com.proofpoint.galaxy.shared.AgentStatusRepresentation; -import com.proofpoint.galaxy.shared.CoordinatorLifecycleState; -import com.proofpoint.galaxy.shared.CoordinatorStatusRepresentation; -import com.proofpoint.galaxy.shared.HttpUriBuilder; -import com.proofpoint.galaxy.shared.Repository; -import com.proofpoint.galaxy.shared.SlotStatus; -import com.proofpoint.galaxy.shared.SlotStatusRepresentation; -import com.proofpoint.galaxy.shared.SlotStatusRepresentation.SlotStatusRepresentationFactory; -import com.proofpoint.galaxy.shared.UpgradeVersions; +import io.airlift.airship.shared.AgentLifecycleState; +import io.airlift.airship.shared.AgentStatus; +import io.airlift.airship.shared.AgentStatusRepresentation; +import io.airlift.airship.shared.CoordinatorLifecycleState; +import io.airlift.airship.shared.CoordinatorStatusRepresentation; +import io.airlift.airship.shared.HttpUriBuilder; +import io.airlift.airship.shared.Repository; +import io.airlift.airship.shared.SlotStatus; +import io.airlift.airship.shared.SlotStatusRepresentation; +import io.airlift.airship.shared.SlotStatusRepresentation.SlotStatusRepresentationFactory; +import io.airlift.airship.shared.UpgradeVersions; import com.proofpoint.http.client.ApacheHttpClient; import com.proofpoint.http.client.HttpClient; import com.proofpoint.http.client.Request; @@ -64,18 +64,18 @@ import static com.google.common.base.Charsets.UTF_8; import static com.google.common.net.HttpHeaders.CONTENT_TYPE; import static com.google.inject.Scopes.SINGLETON; -import static com.proofpoint.galaxy.coordinator.CoordinatorSlotResource.MIN_PREFIX_SIZE; -import static com.proofpoint.galaxy.coordinator.TestingMavenRepository.MOCK_REPO; -import static com.proofpoint.galaxy.shared.AgentLifecycleState.ONLINE; -import static com.proofpoint.galaxy.shared.AssignmentHelper.APPLE_ASSIGNMENT; -import static com.proofpoint.galaxy.shared.AssignmentHelper.BANANA_ASSIGNMENT; -import static com.proofpoint.galaxy.shared.ExtraAssertions.assertEqualsNoOrder; -import static com.proofpoint.galaxy.shared.HttpUriBuilder.uriBuilderFrom; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.RUNNING; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.STOPPED; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.TERMINATED; -import static com.proofpoint.galaxy.shared.SlotStatus.createSlotStatus; -import static com.proofpoint.galaxy.shared.Strings.shortestUniquePrefix; +import static io.airlift.airship.coordinator.CoordinatorSlotResource.MIN_PREFIX_SIZE; +import static io.airlift.airship.coordinator.TestingMavenRepository.MOCK_REPO; +import static io.airlift.airship.shared.AgentLifecycleState.ONLINE; +import static io.airlift.airship.shared.AssignmentHelper.APPLE_ASSIGNMENT; +import static io.airlift.airship.shared.AssignmentHelper.BANANA_ASSIGNMENT; +import static io.airlift.airship.shared.ExtraAssertions.assertEqualsNoOrder; +import static io.airlift.airship.shared.HttpUriBuilder.uriBuilderFrom; +import static io.airlift.airship.shared.SlotLifecycleState.RUNNING; +import static io.airlift.airship.shared.SlotLifecycleState.STOPPED; +import static io.airlift.airship.shared.SlotLifecycleState.TERMINATED; +import static io.airlift.airship.shared.SlotStatus.createSlotStatus; +import static io.airlift.airship.shared.Strings.shortestUniquePrefix; import static com.proofpoint.http.client.JsonBodyGenerator.jsonBodyGenerator; import static com.proofpoint.http.client.JsonResponseHandler.createJsonResponseHandler; import static com.proofpoint.http.client.StaticBodyGenerator.createStaticBodyGenerator; @@ -117,7 +117,7 @@ public void startServer() throws Exception { Map properties = ImmutableMap.builder() - .put("galaxy.version", "123") + .put("airship.version", "123") .put("node.id", "this-coordinator-instance-id") .put("node.location", "/test/location") .put("coordinator.binary-repo", "http://localhost:9999/") diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorSlotResource.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorSlotResource.java index 14aaa630..b6444f32 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorSlotResource.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestCoordinatorSlotResource.java @@ -1,14 +1,14 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; -import com.proofpoint.galaxy.shared.AgentStatus; -import com.proofpoint.galaxy.shared.Assignment; -import com.proofpoint.galaxy.shared.AssignmentRepresentation; -import com.proofpoint.galaxy.shared.MockUriInfo; -import com.proofpoint.galaxy.shared.SlotStatus; -import com.proofpoint.galaxy.shared.SlotStatusRepresentation; +import io.airlift.airship.shared.AgentStatus; +import io.airlift.airship.shared.Assignment; +import io.airlift.airship.shared.AssignmentRepresentation; +import io.airlift.airship.shared.MockUriInfo; +import io.airlift.airship.shared.SlotStatus; +import io.airlift.airship.shared.SlotStatusRepresentation; import com.proofpoint.http.server.HttpServerConfig; import com.proofpoint.http.server.HttpServerInfo; import com.proofpoint.node.NodeInfo; @@ -24,14 +24,14 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; -import static com.proofpoint.galaxy.coordinator.CoordinatorSlotResource.MIN_PREFIX_SIZE; -import static com.proofpoint.galaxy.shared.Strings.shortestUniquePrefix; -import static com.proofpoint.galaxy.shared.AgentLifecycleState.ONLINE; -import static com.proofpoint.galaxy.shared.AssignmentHelper.APPLE_ASSIGNMENT; -import static com.proofpoint.galaxy.shared.AssignmentHelper.BANANA_ASSIGNMENT; -import static com.proofpoint.galaxy.shared.ExtraAssertions.assertEqualsNoOrder; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.STOPPED; -import static com.proofpoint.galaxy.shared.SlotStatus.createSlotStatus; +import static io.airlift.airship.coordinator.CoordinatorSlotResource.MIN_PREFIX_SIZE; +import static io.airlift.airship.shared.Strings.shortestUniquePrefix; +import static io.airlift.airship.shared.AgentLifecycleState.ONLINE; +import static io.airlift.airship.shared.AssignmentHelper.APPLE_ASSIGNMENT; +import static io.airlift.airship.shared.AssignmentHelper.BANANA_ASSIGNMENT; +import static io.airlift.airship.shared.ExtraAssertions.assertEqualsNoOrder; +import static io.airlift.airship.shared.SlotLifecycleState.STOPPED; +import static io.airlift.airship.shared.SlotStatus.createSlotStatus; import static java.lang.Math.min; import static java.util.Arrays.asList; import static org.testng.Assert.assertEquals; diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestGlobPredicate.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestGlobPredicate.java index 12c82a40..67e576cd 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestGlobPredicate.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestGlobPredicate.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import org.testng.annotations.Test; diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestHttpRepository.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestHttpRepository.java index 921cb1a4..93e2a1b6 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestHttpRepository.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestHttpRepository.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import org.testng.Assert; import org.testng.annotations.AfterMethod; diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestLocalProvisionerConfig.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestLocalProvisionerConfig.java index 904d7bca..c772cc6f 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestLocalProvisionerConfig.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestLocalProvisionerConfig.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestMavenMetadata.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestMavenMetadata.java index efe7b279..0f650c9b 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestMavenMetadata.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestMavenMetadata.java @@ -1,11 +1,11 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.collect.ImmutableList; import com.google.common.io.Resources; import org.testng.annotations.Test; import static com.google.common.base.Charsets.UTF_8; -import static com.proofpoint.galaxy.coordinator.MavenMetadata.unmarshalMavenMetadata; +import static io.airlift.airship.coordinator.MavenMetadata.unmarshalMavenMetadata; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestMavenRepository.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestMavenRepository.java index e18feabc..d59ca205 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestMavenRepository.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestMavenRepository.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import org.testng.Assert; import org.testng.annotations.AfterMethod; diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestProvisionAgent.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestProvisionAgent.java index e68524fb..1b8c47a1 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestProvisionAgent.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestProvisionAgent.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.amazonaws.auth.BasicAWSCredentials; import com.amazonaws.services.ec2.AmazonEC2Client; @@ -20,7 +20,7 @@ import static com.google.common.collect.Lists.newArrayList; import static com.proofpoint.experimental.testing.ValidationAssertions.assertValidates; -import static com.proofpoint.galaxy.coordinator.TestingMavenRepository.MOCK_REPO; +import static io.airlift.airship.coordinator.TestingMavenRepository.MOCK_REPO; import static org.testng.Assert.assertEquals; public class TestProvisionAgent @@ -42,7 +42,7 @@ public void testProvisionAgent(String awsCredentialsFile) assertValidates(awsProvisionerConfig); CoordinatorConfig coordinatorConfig = new CoordinatorConfig() - .setGalaxyVersion("0.7-SNAPSHOT"); + .setAirshipVersion("0.7-SNAPSHOT"); assertValidates(coordinatorConfig); BasicAWSCredentials awsCredentials = new BasicAWSCredentials(awsAccessKey, awsSecretKey); diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestRegexPredicate.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestRegexPredicate.java index 57be9b4a..97fb31ab 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestRegexPredicate.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestRegexPredicate.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import org.testng.annotations.Test; diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestSlotFilterBuilder.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestSlotFilterBuilder.java index 941c4430..40bef1bc 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestSlotFilterBuilder.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestSlotFilterBuilder.java @@ -1,16 +1,16 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.proofpoint.galaxy.coordinator.SlotFilterBuilder.SlotUuidPredicate; -import com.proofpoint.galaxy.shared.Assignment; -import com.proofpoint.galaxy.shared.MockUriInfo; -import com.proofpoint.galaxy.shared.SlotStatus; -import com.proofpoint.galaxy.coordinator.SlotFilterBuilder.BinarySpecPredicate; -import com.proofpoint.galaxy.coordinator.SlotFilterBuilder.ConfigSpecPredicate; -import com.proofpoint.galaxy.coordinator.SlotFilterBuilder.HostPredicate; -import com.proofpoint.galaxy.coordinator.SlotFilterBuilder.StatePredicate; +import io.airlift.airship.coordinator.SlotFilterBuilder.SlotUuidPredicate; +import io.airlift.airship.shared.Assignment; +import io.airlift.airship.shared.MockUriInfo; +import io.airlift.airship.shared.SlotStatus; +import io.airlift.airship.coordinator.SlotFilterBuilder.BinarySpecPredicate; +import io.airlift.airship.coordinator.SlotFilterBuilder.ConfigSpecPredicate; +import io.airlift.airship.coordinator.SlotFilterBuilder.HostPredicate; +import io.airlift.airship.coordinator.SlotFilterBuilder.StatePredicate; import org.testng.annotations.Test; import java.net.URI; @@ -18,10 +18,10 @@ import java.util.List; import java.util.UUID; -import static com.proofpoint.galaxy.shared.AssignmentHelper.APPLE_ASSIGNMENT; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.RUNNING; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.UNKNOWN; -import static com.proofpoint.galaxy.shared.SlotStatus.createSlotStatus; +import static io.airlift.airship.shared.AssignmentHelper.APPLE_ASSIGNMENT; +import static io.airlift.airship.shared.SlotLifecycleState.RUNNING; +import static io.airlift.airship.shared.SlotLifecycleState.UNKNOWN; +import static io.airlift.airship.shared.SlotStatus.createSlotStatus; import static java.util.Arrays.asList; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestingHttpRepository.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestingHttpRepository.java index 8eb16e4d..113184d2 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestingHttpRepository.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestingHttpRepository.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.collect.ImmutableList; import com.google.common.io.Files; @@ -10,10 +10,10 @@ import java.util.zip.ZipOutputStream; import static com.google.common.base.Charsets.UTF_8; -import static com.proofpoint.galaxy.shared.ArchiveHelper.createArchive; -import static com.proofpoint.galaxy.shared.FileUtils.createTempDir; -import static com.proofpoint.galaxy.shared.FileUtils.deleteRecursively; -import static com.proofpoint.galaxy.shared.FileUtils.newFile; +import static io.airlift.airship.shared.ArchiveHelper.createArchive; +import static io.airlift.airship.shared.FileUtils.createTempDir; +import static io.airlift.airship.shared.FileUtils.deleteRecursively; +import static io.airlift.airship.shared.FileUtils.newFile; public class TestingHttpRepository extends HttpRepository { @@ -107,7 +107,7 @@ public static void createConfig(File dir, String artifactId, String version) resources = "memory=1024\n" + "cpu=2"; } - out.putNextEntry(new ZipEntry("galaxy-resources.properties")); + out.putNextEntry(new ZipEntry("airship-resources.properties")); out.write(resources.getBytes(UTF_8)); out.close(); diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestingMavenRepository.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestingMavenRepository.java index 3455f0a5..15fd75f5 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestingMavenRepository.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/TestingMavenRepository.java @@ -1,12 +1,12 @@ -package com.proofpoint.galaxy.coordinator; +package io.airlift.airship.coordinator; import com.google.common.collect.ImmutableList; import com.google.common.io.Files; -import com.proofpoint.galaxy.coordinator.MavenMetadata.Snapshot; -import com.proofpoint.galaxy.coordinator.MavenMetadata.SnapshotVersion; -import com.proofpoint.galaxy.coordinator.MavenMetadata.Versioning; -import com.proofpoint.galaxy.shared.MavenCoordinates; -import com.proofpoint.galaxy.shared.Repository; +import io.airlift.airship.coordinator.MavenMetadata.Snapshot; +import io.airlift.airship.coordinator.MavenMetadata.SnapshotVersion; +import io.airlift.airship.coordinator.MavenMetadata.Versioning; +import io.airlift.airship.shared.MavenCoordinates; +import io.airlift.airship.shared.Repository; import java.io.File; import java.io.FileOutputStream; @@ -18,12 +18,12 @@ import static com.google.common.base.Objects.firstNonNull; import static com.google.common.io.Resources.getResource; import static com.google.common.io.Resources.newInputStreamSupplier; -import static com.proofpoint.galaxy.shared.ArchiveHelper.createArchive; -import static com.proofpoint.galaxy.shared.FileUtils.createTempDir; -import static com.proofpoint.galaxy.shared.FileUtils.deleteRecursively; -import static com.proofpoint.galaxy.shared.FileUtils.newFile; -import static com.proofpoint.galaxy.shared.MavenCoordinates.toBinaryGAV; -import static com.proofpoint.galaxy.shared.MavenCoordinates.toConfigGAV; +import static io.airlift.airship.shared.ArchiveHelper.createArchive; +import static io.airlift.airship.shared.FileUtils.createTempDir; +import static io.airlift.airship.shared.FileUtils.deleteRecursively; +import static io.airlift.airship.shared.FileUtils.newFile; +import static io.airlift.airship.shared.MavenCoordinates.toBinaryGAV; +import static io.airlift.airship.shared.MavenCoordinates.toConfigGAV; public class TestingMavenRepository extends MavenRepository { @@ -230,7 +230,7 @@ public static void createConfig(File dir, String groupId, String artifactId, Str resources = "memory=1024\n" + "cpu=2"; } - out.putNextEntry(new ZipEntry("galaxy-resources.properties")); + out.putNextEntry(new ZipEntry("airship-resources.properties")); out.write(resources.getBytes(UTF_8)); out.close(); diff --git a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/auth/TestPublicKey.java b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/auth/TestPublicKey.java index b1154fc4..5be7bb95 100644 --- a/airship-coordinator/src/test/java/io/airlift/airship/coordinator/auth/TestPublicKey.java +++ b/airship-coordinator/src/test/java/io/airlift/airship/coordinator/auth/TestPublicKey.java @@ -1,12 +1,12 @@ -package com.proofpoint.galaxy.coordinator.auth; +package io.airlift.airship.coordinator.auth; import com.google.common.base.Throwables; import com.google.common.io.Resources; import com.google.common.primitives.Bytes; -import com.proofpoint.galaxy.coordinator.auth.ssh.DerReader; -import com.proofpoint.galaxy.coordinator.auth.ssh.PemDecoder; -import com.proofpoint.galaxy.coordinator.auth.ssh.PemDsaPrivateKey; -import com.proofpoint.galaxy.coordinator.auth.ssh.PemRsaPrivateKey; +import io.airlift.airship.coordinator.auth.ssh.DerReader; +import io.airlift.airship.coordinator.auth.ssh.PemDecoder; +import io.airlift.airship.coordinator.auth.ssh.PemDsaPrivateKey; +import io.airlift.airship.coordinator.auth.ssh.PemRsaPrivateKey; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -18,7 +18,7 @@ import java.util.Arrays; import static com.google.common.base.Charsets.UTF_8; -import static com.proofpoint.galaxy.coordinator.auth.ssh.DerType.SEQUENCE; +import static io.airlift.airship.coordinator.auth.ssh.DerType.SEQUENCE; import static org.apache.commons.codec.binary.Hex.encodeHexString; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; @@ -26,7 +26,7 @@ /* Change to the resource directory: - cd src/test/resources/com/proofpoint/galaxy/coordinator/auth + cd src/test/resources/com/proofpoint/airship/coordinator/auth Generate test keys: diff --git a/airship-ec2/galaxy-install-prep.sh b/airship-ec2/galaxy-install-prep.sh index 3f336dc3..4edc78e4 100644 --- a/airship-ec2/galaxy-install-prep.sh +++ b/airship-ec2/galaxy-install-prep.sh @@ -3,10 +3,10 @@ # chown all cloudconf files to ubuntu chown -R ubuntu:ubuntu /home/ubuntu/cloudconf -# make galaxy dir and chown to ubuntu -mkdir -p /mnt/galaxy -chown ubuntu:ubuntu /mnt/galaxy +# make airship dir and chown to ubuntu +mkdir -p /mnt/airship +chown ubuntu:ubuntu /mnt/airship # run main installer as ubuntu -chmod 755 /home/ubuntu/cloudconf/galaxy-install.sh -su -l -c /home/ubuntu/cloudconf/galaxy-install.sh ubuntu +chmod 755 /home/ubuntu/cloudconf/airship-install.sh +su -l -c /home/ubuntu/cloudconf/airship-install.sh ubuntu diff --git a/airship-ec2/galaxy-install.sh b/airship-ec2/galaxy-install.sh index e9e3eab6..ad837ce5 100644 --- a/airship-ec2/galaxy-install.sh +++ b/airship-ec2/galaxy-install.sh @@ -6,21 +6,21 @@ do export "$(echo ${n/=*/})"="$(echo ${n/*=/})" done -x=${galaxyEnvironment?install.properties does not contain a value for galaxyEnvironment} -x=${galaxyInstallBinary?install.properties does not contain a value for galaxyInstallBinary} -x=${galaxyInstallConfig?install.properties does not contain a value for galaxyInstallConfig} -x=${galaxyRepositoryUris?install.properties does not contain a value for galaxyRepositoryUris} +x=${airshipEnvironment?install.properties does not contain a value for airshipEnvironment} +x=${airshipInstallBinary?install.properties does not contain a value for airshipInstallBinary} +x=${airshipInstallConfig?install.properties does not contain a value for airshipInstallConfig} +x=${airshipRepositoryUris?install.properties does not contain a value for airshipRepositoryUris} if [ -e /home/ubuntu/cloudconf/aws-credentials.properties ] then - x=${galaxyAwsCredentialsFile?install.properties does not contain a value for galaxyAwsCredentialsFile} + x=${airshipAwsCredentialsFile?install.properties does not contain a value for airshipAwsCredentialsFile} fi -REPOS=$(for i in $(echo $galaxyRepositoryUris | tr , ' '); do echo "--repository $i"; done) +REPOS=$(for i in $(echo $airshipRepositoryUris | tr , ' '); do echo "--repository $i"; done) -# install galaxy +# install airship mkdir -p /home/ubuntu/bin -cp /home/ubuntu/cloudconf/galaxy /home/ubuntu/bin -chmod 755 /home/ubuntu/bin/galaxy +cp /home/ubuntu/cloudconf/airship /home/ubuntu/bin +chmod 755 /home/ubuntu/bin/airship # add bin to path export PATH=$PATH:/home/ubuntu/bin @@ -41,22 +41,22 @@ EXTERNAL_ADDRESS=$(curl -s "http://169.254.169.254/latest/meta-data/public-hostn INTERNAL_IP=$(curl -s "http://169.254.169.254/latest/meta-data/local-ipv4") # add to bashrc -cat < /home/ubuntu/.galaxy.bashrc +cat < /home/ubuntu/.airship.bashrc export PATH=\$PATH:/home/ubuntu/bin YELLOW="\\[\\033[33m\\]" GREEN="\\[\\033[32m\\]" DEFAULT="\\[\\033[39m\\]" -export PS1="[\$(date +%H:%M) \u@\${YELLOW}${INSTANCE_ID}\${DEFAULT}:\w \${GREEN}$(cat ~/.galaxyconfig | awk '/^environment\.default *=/ {print $3}')\${DEFAULT}] " +export PS1="[\$(date +%H:%M) \u@\${YELLOW}${INSTANCE_ID}\${DEFAULT}:\w \${GREEN}$(cat ~/.airshipconfig | awk '/^environment\.default *=/ {print $3}')\${DEFAULT}] " EOT -(grep 'galaxy\.bashrc' /home/ubuntu/.bashrc >> /dev/null) || echo -e "\n. ~/.galaxy.bashrc\n" >> /home/ubuntu/.bashrc +(grep 'airship\.bashrc' /home/ubuntu/.bashrc >> /dev/null) || echo -e "\n. ~/.airship.bashrc\n" >> /home/ubuntu/.bashrc # setup filesystem environment (must be named $targetEnvironment) -galaxy environment provision-local galaxy /mnt/galaxy/ \ - --name ${galaxyEnvironment} \ +airship environment provision-local airship /mnt/airship/ \ + --name ${airshipEnvironment} \ ${REPOS} \ - --maven-default-group-id com.proofpoint.galaxy \ + --maven-default-group-id io.airlift.airship \ --agent-id $INSTANCE_ID \ --location $LOCATION \ --instance-type $INSTANCE_TYPE \ @@ -64,29 +64,29 @@ galaxy environment provision-local galaxy /mnt/galaxy/ \ --internal-ip $INTERNAL_IP # use the filesystem environment as the default (should already be set, but be careful) -galaxy environment use galaxy +airship environment use airship # local environment should show internal addresses -galaxy config set environment.galaxy.use-internal-address true +airship config set environment.airship.use-internal-address true -# add symlink to /mnt/galaxy -ln -n -f -s /mnt/galaxy /home/ubuntu/galaxy +# add symlink to /mnt/airship +ln -n -f -s /mnt/airship /home/ubuntu/airship # install server -galaxy --batch install ${galaxyInstallBinary} ${galaxyInstallConfig} +airship --batch install ${airshipInstallBinary} ${airshipInstallConfig} if [ -e /home/ubuntu/cloudconf/aws-credentials.properties ] then # copy aws credentials to server - galaxy ssh --all "mkdir -p $(dirname ${galaxyAwsCredentialsFile}) && cp /home/ubuntu/cloudconf/aws-credentials.properties ${galaxyAwsCredentialsFile}" + airship ssh --all "mkdir -p $(dirname ${airshipAwsCredentialsFile}) && cp /home/ubuntu/cloudconf/aws-credentials.properties ${airshipAwsCredentialsFile}" fi # start server -galaxy --batch start --all +airship --batch start --all # add target environment -galaxy environment add ${galaxyEnvironment} ${galaxyCoordinatorUri:-http://127.0.0.1:64000/} -galaxy environment use ${galaxyEnvironment} +airship environment add ${airshipEnvironment} ${airshipCoordinatorUri:-http://127.0.0.1:64000/} +airship environment use ${airshipEnvironment} # target environment should show internal addresses -galaxy config set environment.${galaxyEnvironment}.use-internal-address true +airship config set environment.${airshipEnvironment}.use-internal-address true diff --git a/airship-ec2/pom.xml b/airship-ec2/pom.xml index d82f5f15..67d6c828 100644 --- a/airship-ec2/pom.xml +++ b/airship-ec2/pom.xml @@ -3,17 +3,17 @@ 4.0.0 - com.proofpoint.galaxy - galaxy-root + io.airlift.airship + airship-root 0.9-SNAPSHOT ../pom.xml - com.proofpoint.galaxy - galaxy-ec2 + io.airlift.airship + airship-ec2 pom - galaxy-ec2 - Galaxy EC2 scripts + airship-ec2 + Airship EC2 scripts 0.9-SNAPSHOT @@ -50,17 +50,17 @@ - ${basedir}/galaxy-install.sh + ${basedir}/airship-install.sh sh install - ${basedir}/galaxy-install-prep.sh + ${basedir}/airship-install-prep.sh sh install-prep - ${basedir}/galaxy-part-handler.py + ${basedir}/airship-part-handler.py py part-handler diff --git a/airship-integration-tests/pom.xml b/airship-integration-tests/pom.xml index 59529ee6..9c97e7e5 100644 --- a/airship-integration-tests/pom.xml +++ b/airship-integration-tests/pom.xml @@ -3,16 +3,16 @@ 4.0.0 - com.proofpoint.galaxy - galaxy-root + io.airlift.airship + airship-root 0.9-SNAPSHOT ../pom.xml - com.proofpoint.galaxy - galaxy-integration-tests + io.airlift.airship + airship-integration-tests 0.9-SNAPSHOT - galaxy-integration-tests + airship-integration-tests UTF-8 @@ -35,22 +35,22 @@ - com.proofpoint.galaxy - galaxy-agent + io.airlift.airship + airship-agent 0.9-SNAPSHOT test - com.proofpoint.galaxy - galaxy-coordinator + io.airlift.airship + airship-coordinator 0.9-SNAPSHOT test - com.proofpoint.galaxy - galaxy-cli + io.airlift.airship + airship-cli 0.9-SNAPSHOT test @@ -70,24 +70,24 @@ - com.proofpoint.galaxy - galaxy-shared + io.airlift.airship + airship-shared 0.9-SNAPSHOT test-jar test - com.proofpoint.galaxy - galaxy-coordinator + io.airlift.airship + airship-coordinator 0.9-SNAPSHOT test-jar test - com.proofpoint.galaxy - galaxy-agent + io.airlift.airship + airship-agent 0.9-SNAPSHOT test-jar test diff --git a/airship-integration-tests/src/test/java/io/airlift/airship/integration/MockLocalProvisioner.java b/airship-integration-tests/src/test/java/io/airlift/airship/integration/MockLocalProvisioner.java index 555ffd27..9dbe1838 100644 --- a/airship-integration-tests/src/test/java/io/airlift/airship/integration/MockLocalProvisioner.java +++ b/airship-integration-tests/src/test/java/io/airlift/airship/integration/MockLocalProvisioner.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.integration; +package io.airlift.airship.integration; import com.google.common.base.Function; import com.google.common.base.Preconditions; @@ -12,11 +12,11 @@ import com.proofpoint.configuration.ConfigurationModule; import com.proofpoint.discovery.client.testing.TestingDiscoveryModule; import com.proofpoint.event.client.NullEventModule; -import com.proofpoint.galaxy.agent.Agent; -import com.proofpoint.galaxy.agent.AgentMainModule; -import com.proofpoint.galaxy.agent.Slot; -import com.proofpoint.galaxy.coordinator.Instance; -import com.proofpoint.galaxy.coordinator.Provisioner; +import io.airlift.airship.agent.Agent; +import io.airlift.airship.agent.AgentMainModule; +import io.airlift.airship.agent.Slot; +import io.airlift.airship.coordinator.Instance; +import io.airlift.airship.coordinator.Provisioner; import com.proofpoint.http.server.testing.TestingHttpServer; import com.proofpoint.http.server.testing.TestingHttpServerModule; import com.proofpoint.jaxrs.JaxrsModule; @@ -35,8 +35,8 @@ import java.util.concurrent.atomic.AtomicInteger; import static com.google.common.collect.Lists.newArrayList; -import static com.proofpoint.galaxy.shared.FileUtils.createTempDir; -import static com.proofpoint.galaxy.shared.FileUtils.deleteRecursively; +import static io.airlift.airship.shared.FileUtils.createTempDir; +import static io.airlift.airship.shared.FileUtils.deleteRecursively; public class MockLocalProvisioner implements Provisioner { @@ -212,7 +212,7 @@ public AgentServer(Instance instance) this.instance = instance; tempDir = createTempDir("agent"); - resourcesFile = new File(tempDir, "slots/galaxy-resources.properties"); + resourcesFile = new File(tempDir, "slots/airship-resources.properties"); writeResources(AGENT_RESOURCES, resourcesFile); } diff --git a/airship-integration-tests/src/test/java/io/airlift/airship/integration/TestCliIntegration.java b/airship-integration-tests/src/test/java/io/airlift/airship/integration/TestCliIntegration.java index ebe68960..201c9e89 100644 --- a/airship-integration-tests/src/test/java/io/airlift/airship/integration/TestCliIntegration.java +++ b/airship-integration-tests/src/test/java/io/airlift/airship/integration/TestCliIntegration.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.integration; +package io.airlift.airship.integration; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableList; @@ -12,24 +12,23 @@ import com.proofpoint.configuration.ConfigurationFactory; import com.proofpoint.configuration.ConfigurationModule; import com.proofpoint.event.client.NullEventModule; -import com.proofpoint.galaxy.cli.Config; -import com.proofpoint.galaxy.cli.Galaxy; -import com.proofpoint.galaxy.cli.Galaxy.GalaxyCommand; -import com.proofpoint.galaxy.cli.Galaxy.GalaxyCommanderCommand; -import com.proofpoint.galaxy.cli.InteractiveUser; -import com.proofpoint.galaxy.cli.OutputFormat; -import com.proofpoint.galaxy.coordinator.Coordinator; -import com.proofpoint.galaxy.coordinator.CoordinatorMainModule; -import com.proofpoint.galaxy.coordinator.InMemoryStateManager; -import com.proofpoint.galaxy.coordinator.LocalProvisionerModule; -import com.proofpoint.galaxy.coordinator.Provisioner; -import com.proofpoint.galaxy.coordinator.StateManager; -import com.proofpoint.galaxy.coordinator.TestingMavenRepository; -import com.proofpoint.galaxy.shared.AgentStatusRepresentation; -import com.proofpoint.galaxy.shared.Assignment; -import com.proofpoint.galaxy.shared.CoordinatorStatusRepresentation; -import com.proofpoint.galaxy.shared.SlotLifecycleState; -import com.proofpoint.galaxy.shared.SlotStatusRepresentation; +import io.airlift.airship.cli.Airship; +import io.airlift.airship.cli.Config; +import io.airlift.airship.cli.Airship.AirshipCommand; +import io.airlift.airship.cli.InteractiveUser; +import io.airlift.airship.cli.OutputFormat; +import io.airlift.airship.coordinator.Coordinator; +import io.airlift.airship.coordinator.CoordinatorMainModule; +import io.airlift.airship.coordinator.InMemoryStateManager; +import io.airlift.airship.coordinator.LocalProvisionerModule; +import io.airlift.airship.coordinator.Provisioner; +import io.airlift.airship.coordinator.StateManager; +import io.airlift.airship.coordinator.TestingMavenRepository; +import io.airlift.airship.shared.AgentStatusRepresentation; +import io.airlift.airship.shared.Assignment; +import io.airlift.airship.shared.CoordinatorStatusRepresentation; +import io.airlift.airship.shared.SlotLifecycleState; +import io.airlift.airship.shared.SlotStatusRepresentation; import com.proofpoint.http.server.testing.TestingHttpServer; import com.proofpoint.http.server.testing.TestingHttpServerModule; import com.proofpoint.jaxrs.JaxrsModule; @@ -46,12 +45,12 @@ import java.util.UUID; import static com.google.inject.Scopes.SINGLETON; -import static com.proofpoint.galaxy.shared.AssignmentHelper.APPLE_ASSIGNMENT; -import static com.proofpoint.galaxy.shared.AssignmentHelper.APPLE_ASSIGNMENT_2; -import static com.proofpoint.galaxy.shared.AssignmentHelper.BANANA_ASSIGNMENT; -import static com.proofpoint.galaxy.shared.AssignmentHelper.BANANA_ASSIGNMENT_EXACT; -import static com.proofpoint.galaxy.shared.FileUtils.createTempDir; -import static com.proofpoint.galaxy.shared.FileUtils.deleteRecursively; +import static io.airlift.airship.shared.AssignmentHelper.APPLE_ASSIGNMENT; +import static io.airlift.airship.shared.AssignmentHelper.APPLE_ASSIGNMENT_2; +import static io.airlift.airship.shared.AssignmentHelper.BANANA_ASSIGNMENT; +import static io.airlift.airship.shared.AssignmentHelper.BANANA_ASSIGNMENT_EXACT; +import static io.airlift.airship.shared.FileUtils.createTempDir; +import static io.airlift.airship.shared.FileUtils.deleteRecursively; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; @@ -91,7 +90,7 @@ public void setUp() Map coordinatorProperties = ImmutableMap.builder() .put("node.environment", "prod") - .put("galaxy.version", "123") + .put("airship.version", "123") .put("coordinator.binary-repo", binaryRepoDir.toURI().toString()) .put("coordinator.default-group-id", "prod") .put("coordinator.binary-repo.local", localBinaryRepoDir.toString()) @@ -480,11 +479,11 @@ private void execute(String... args) { outputFormat.clear(); - GalaxyCommand command = Galaxy.GALAXY_PARSER.parse(ImmutableList.builder().add("--debug").add(args).build()); + AirshipCommand command = Airship.AIRSHIP_PARSER.parse(ImmutableList.builder().add("--debug").add(args).build()); command.config = config; - if (command instanceof GalaxyCommanderCommand) { - GalaxyCommanderCommand galaxyCommanderCommand = (GalaxyCommanderCommand) command; - galaxyCommanderCommand.execute("local", outputFormat, interactiveUser); + if (command instanceof Airship.AirshipCommanderCommand) { + Airship.AirshipCommanderCommand airshipCommanderCommand = (Airship.AirshipCommanderCommand) command; + airshipCommanderCommand.execute("local", outputFormat, interactiveUser); } else { command.execute(); diff --git a/airship-integration-tests/src/test/java/io/airlift/airship/integration/TestRemoteSlot.java b/airship-integration-tests/src/test/java/io/airlift/airship/integration/TestRemoteSlot.java index e95a7fc0..84f94897 100644 --- a/airship-integration-tests/src/test/java/io/airlift/airship/integration/TestRemoteSlot.java +++ b/airship-integration-tests/src/test/java/io/airlift/airship/integration/TestRemoteSlot.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.integration; +package io.airlift.airship.integration; import com.google.common.collect.ImmutableMap; import com.google.inject.Binder; @@ -24,21 +24,21 @@ import com.proofpoint.configuration.ConfigurationModule; import com.proofpoint.discovery.client.ServiceDescriptorsRepresentation; import com.proofpoint.event.client.NullEventModule; -import com.proofpoint.galaxy.agent.Agent; -import com.proofpoint.galaxy.agent.AgentMainModule; -import com.proofpoint.galaxy.agent.DeploymentManagerFactory; -import com.proofpoint.galaxy.agent.LifecycleManager; -import com.proofpoint.galaxy.agent.MockDeploymentManagerFactory; -import com.proofpoint.galaxy.agent.MockLifecycleManager; -import com.proofpoint.galaxy.agent.Slot; -import com.proofpoint.galaxy.coordinator.HttpRemoteAgent; -import com.proofpoint.galaxy.coordinator.HttpRemoteSlot; -import com.proofpoint.galaxy.coordinator.RemoteSlot; -import com.proofpoint.galaxy.shared.AgentStatusRepresentation; -import com.proofpoint.galaxy.shared.Installation; -import com.proofpoint.galaxy.shared.InstallationRepresentation; -import com.proofpoint.galaxy.shared.SlotStatus; -import com.proofpoint.galaxy.shared.SlotStatusRepresentation; +import io.airlift.airship.agent.Agent; +import io.airlift.airship.agent.AgentMainModule; +import io.airlift.airship.agent.DeploymentManagerFactory; +import io.airlift.airship.agent.LifecycleManager; +import io.airlift.airship.agent.MockDeploymentManagerFactory; +import io.airlift.airship.agent.MockLifecycleManager; +import io.airlift.airship.agent.Slot; +import io.airlift.airship.coordinator.HttpRemoteAgent; +import io.airlift.airship.coordinator.HttpRemoteSlot; +import io.airlift.airship.coordinator.RemoteSlot; +import io.airlift.airship.shared.AgentStatusRepresentation; +import io.airlift.airship.shared.Installation; +import io.airlift.airship.shared.InstallationRepresentation; +import io.airlift.airship.shared.SlotStatus; +import io.airlift.airship.shared.SlotStatusRepresentation; import com.proofpoint.http.client.ApacheHttpClient; import com.proofpoint.http.client.HttpClient; import com.proofpoint.http.server.testing.TestingHttpServer; @@ -57,14 +57,14 @@ import java.util.Map; import java.util.UUID; -import static com.proofpoint.galaxy.shared.AssignmentHelper.APPLE_ASSIGNMENT; -import static com.proofpoint.galaxy.shared.AssignmentHelper.BANANA_ASSIGNMENT; -import static com.proofpoint.galaxy.shared.FileUtils.createTempDir; -import static com.proofpoint.galaxy.shared.FileUtils.deleteRecursively; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.RUNNING; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.STOPPED; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.TERMINATED; -import static com.proofpoint.galaxy.shared.SlotStatus.createSlotStatus; +import static io.airlift.airship.shared.AssignmentHelper.APPLE_ASSIGNMENT; +import static io.airlift.airship.shared.AssignmentHelper.BANANA_ASSIGNMENT; +import static io.airlift.airship.shared.FileUtils.createTempDir; +import static io.airlift.airship.shared.FileUtils.deleteRecursively; +import static io.airlift.airship.shared.SlotLifecycleState.RUNNING; +import static io.airlift.airship.shared.SlotLifecycleState.STOPPED; +import static io.airlift.airship.shared.SlotLifecycleState.TERMINATED; +import static io.airlift.airship.shared.SlotStatus.createSlotStatus; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/airship-integration-tests/src/test/java/io/airlift/airship/integration/TestServerIntegration.java b/airship-integration-tests/src/test/java/io/airlift/airship/integration/TestServerIntegration.java index 5c06d059..5d9090ce 100644 --- a/airship-integration-tests/src/test/java/io/airlift/airship/integration/TestServerIntegration.java +++ b/airship-integration-tests/src/test/java/io/airlift/airship/integration/TestServerIntegration.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.integration; +package io.airlift.airship.integration; import com.google.common.base.Charsets; import com.google.common.collect.ImmutableList; @@ -25,29 +25,29 @@ import com.proofpoint.configuration.ConfigurationFactory; import com.proofpoint.configuration.ConfigurationModule; import com.proofpoint.event.client.NullEventModule; -import com.proofpoint.galaxy.agent.Agent; -import com.proofpoint.galaxy.agent.Slot; -import com.proofpoint.galaxy.coordinator.AgentProvisioningRepresentation; -import com.proofpoint.galaxy.coordinator.Coordinator; -import com.proofpoint.galaxy.coordinator.CoordinatorMainModule; -import com.proofpoint.galaxy.coordinator.CoordinatorProvisioningRepresentation; -import com.proofpoint.galaxy.coordinator.InMemoryStateManager; -import com.proofpoint.galaxy.coordinator.Instance; -import com.proofpoint.galaxy.coordinator.LocalProvisionerModule; -import com.proofpoint.galaxy.coordinator.Provisioner; -import com.proofpoint.galaxy.coordinator.StateManager; -import com.proofpoint.galaxy.coordinator.TestingMavenRepository; -import com.proofpoint.galaxy.integration.MockLocalProvisioner.AgentServer; -import com.proofpoint.galaxy.shared.AgentLifecycleState; -import com.proofpoint.galaxy.shared.AgentStatusRepresentation; -import com.proofpoint.galaxy.shared.CoordinatorLifecycleState; -import com.proofpoint.galaxy.shared.CoordinatorStatusRepresentation; -import com.proofpoint.galaxy.shared.HttpUriBuilder; -import com.proofpoint.galaxy.shared.Installation; -import com.proofpoint.galaxy.shared.Repository; -import com.proofpoint.galaxy.shared.SlotStatusRepresentation; -import com.proofpoint.galaxy.shared.SlotStatusRepresentation.SlotStatusRepresentationFactory; -import com.proofpoint.galaxy.shared.UpgradeVersions; +import io.airlift.airship.agent.Agent; +import io.airlift.airship.agent.Slot; +import io.airlift.airship.coordinator.AgentProvisioningRepresentation; +import io.airlift.airship.coordinator.Coordinator; +import io.airlift.airship.coordinator.CoordinatorMainModule; +import io.airlift.airship.coordinator.CoordinatorProvisioningRepresentation; +import io.airlift.airship.coordinator.InMemoryStateManager; +import io.airlift.airship.coordinator.Instance; +import io.airlift.airship.coordinator.LocalProvisionerModule; +import io.airlift.airship.coordinator.Provisioner; +import io.airlift.airship.coordinator.StateManager; +import io.airlift.airship.coordinator.TestingMavenRepository; +import io.airlift.airship.integration.MockLocalProvisioner.AgentServer; +import io.airlift.airship.shared.AgentLifecycleState; +import io.airlift.airship.shared.AgentStatusRepresentation; +import io.airlift.airship.shared.CoordinatorLifecycleState; +import io.airlift.airship.shared.CoordinatorStatusRepresentation; +import io.airlift.airship.shared.HttpUriBuilder; +import io.airlift.airship.shared.Installation; +import io.airlift.airship.shared.Repository; +import io.airlift.airship.shared.SlotStatusRepresentation; +import io.airlift.airship.shared.SlotStatusRepresentation.SlotStatusRepresentationFactory; +import io.airlift.airship.shared.UpgradeVersions; import com.proofpoint.http.client.ApacheHttpClient; import com.proofpoint.http.client.HttpClient; import com.proofpoint.http.client.Request; @@ -72,16 +72,16 @@ import static com.google.common.base.Charsets.UTF_8; import static com.google.common.net.HttpHeaders.CONTENT_TYPE; import static com.google.inject.Scopes.SINGLETON; -import static com.proofpoint.galaxy.shared.AssignmentHelper.APPLE_ASSIGNMENT; -import static com.proofpoint.galaxy.shared.AssignmentHelper.BANANA_ASSIGNMENT; -import static com.proofpoint.galaxy.shared.ExtraAssertions.assertEqualsNoOrder; -import static com.proofpoint.galaxy.shared.FileUtils.createTempDir; -import static com.proofpoint.galaxy.shared.FileUtils.deleteRecursively; -import static com.proofpoint.galaxy.shared.FileUtils.newFile; -import static com.proofpoint.galaxy.shared.HttpUriBuilder.uriBuilderFrom; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.RUNNING; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.STOPPED; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.TERMINATED; +import static io.airlift.airship.shared.AssignmentHelper.APPLE_ASSIGNMENT; +import static io.airlift.airship.shared.AssignmentHelper.BANANA_ASSIGNMENT; +import static io.airlift.airship.shared.ExtraAssertions.assertEqualsNoOrder; +import static io.airlift.airship.shared.FileUtils.createTempDir; +import static io.airlift.airship.shared.FileUtils.deleteRecursively; +import static io.airlift.airship.shared.FileUtils.newFile; +import static io.airlift.airship.shared.HttpUriBuilder.uriBuilderFrom; +import static io.airlift.airship.shared.SlotLifecycleState.RUNNING; +import static io.airlift.airship.shared.SlotLifecycleState.STOPPED; +import static io.airlift.airship.shared.SlotLifecycleState.TERMINATED; import static com.proofpoint.http.client.JsonBodyGenerator.jsonBodyGenerator; import static com.proofpoint.http.client.JsonResponseHandler.createJsonResponseHandler; import static com.proofpoint.http.client.StaticBodyGenerator.createStaticBodyGenerator; @@ -141,7 +141,7 @@ public void startServer() Map coordinatorProperties = ImmutableMap.builder() .put("node.environment", "prod") - .put("galaxy.version", "123") + .put("airship.version", "123") .put("coordinator.binary-repo", binaryRepoDir.toURI().toString()) .put("coordinator.default-group-id", "prod") .put("coordinator.binary-repo.local", localBinaryRepoDir.toString()) diff --git a/airship-shared/pom.xml b/airship-shared/pom.xml index bb979898..827c7cbe 100644 --- a/airship-shared/pom.xml +++ b/airship-shared/pom.xml @@ -3,16 +3,16 @@ 4.0.0 - com.proofpoint.galaxy - galaxy-root + io.airlift.airship + airship-root 0.9-SNAPSHOT ../pom.xml - com.proofpoint.galaxy - galaxy-shared + io.airlift.airship + airship-shared 0.9-SNAPSHOT - galaxy-shared + airship-shared UTF-8 diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/AgentLifecycleState.java b/airship-shared/src/main/java/io/airlift/airship/shared/AgentLifecycleState.java index 1611d8eb..5fd923df 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/AgentLifecycleState.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/AgentLifecycleState.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.shared; +package io.airlift.airship.shared; public enum AgentLifecycleState { diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/AgentStatus.java b/airship-shared/src/main/java/io/airlift/airship/shared/AgentStatus.java index 184348b2..59dd3a9f 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/AgentStatus.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/AgentStatus.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.shared; +package io.airlift.airship.shared; import com.google.common.base.Function; import com.google.common.base.Objects; @@ -16,7 +16,7 @@ import static com.google.common.collect.Iterables.transform; import static com.google.common.collect.Maps.newHashMap; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.TERMINATED; +import static io.airlift.airship.shared.SlotLifecycleState.TERMINATED; @Immutable public class AgentStatus diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/AgentStatusRepresentation.java b/airship-shared/src/main/java/io/airlift/airship/shared/AgentStatusRepresentation.java index 687902c9..72e128f0 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/AgentStatusRepresentation.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/AgentStatusRepresentation.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.shared; +package io.airlift.airship.shared; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; @@ -17,12 +17,12 @@ import java.util.Map; import static com.google.common.collect.Lists.transform; -import static com.proofpoint.galaxy.shared.AgentStatus.idGetter; -import static com.proofpoint.galaxy.shared.AgentStatus.locationGetter; -import static com.proofpoint.galaxy.shared.Strings.commonPrefixSegments; -import static com.proofpoint.galaxy.shared.Strings.safeTruncate; -import static com.proofpoint.galaxy.shared.Strings.shortestUniquePrefix; -import static com.proofpoint.galaxy.shared.Strings.trimLeadingSegments; +import static io.airlift.airship.shared.AgentStatus.idGetter; +import static io.airlift.airship.shared.AgentStatus.locationGetter; +import static io.airlift.airship.shared.Strings.commonPrefixSegments; +import static io.airlift.airship.shared.Strings.safeTruncate; +import static io.airlift.airship.shared.Strings.shortestUniquePrefix; +import static io.airlift.airship.shared.Strings.trimLeadingSegments; @JsonAutoDetect(JsonMethod.NONE) public class AgentStatusRepresentation diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/Assignment.java b/airship-shared/src/main/java/io/airlift/airship/shared/Assignment.java index 4be17823..df4b9349 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/Assignment.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/Assignment.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.shared; +package io.airlift.airship.shared; import com.google.common.base.Preconditions; diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/AssignmentRepresentation.java b/airship-shared/src/main/java/io/airlift/airship/shared/AssignmentRepresentation.java index 2f6d90ec..47004c97 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/AssignmentRepresentation.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/AssignmentRepresentation.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.shared; +package io.airlift.airship.shared; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonCreator; diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/Command.java b/airship-shared/src/main/java/io/airlift/airship/shared/Command.java index b5a66c9f..a45452ea 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/Command.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/Command.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.shared; +package io.airlift.airship.shared; import com.google.common.base.Charsets; import com.google.common.base.Preconditions; diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/CommandFailedException.java b/airship-shared/src/main/java/io/airlift/airship/shared/CommandFailedException.java index c46b5e31..38e617ff 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/CommandFailedException.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/CommandFailedException.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.shared; +package io.airlift.airship.shared; public class CommandFailedException extends Exception { diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/CommandTimeoutException.java b/airship-shared/src/main/java/io/airlift/airship/shared/CommandTimeoutException.java index 8472d849..0746a971 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/CommandTimeoutException.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/CommandTimeoutException.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.shared; +package io.airlift.airship.shared; public class CommandTimeoutException extends CommandFailedException { diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/ConfigUtils.java b/airship-shared/src/main/java/io/airlift/airship/shared/ConfigUtils.java index 97783d01..03e7d373 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/ConfigUtils.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/ConfigUtils.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.shared; +package io.airlift.airship.shared; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/CoordinatorLifecycleState.java b/airship-shared/src/main/java/io/airlift/airship/shared/CoordinatorLifecycleState.java index a40ccb37..82fbd136 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/CoordinatorLifecycleState.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/CoordinatorLifecycleState.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.shared; +package io.airlift.airship.shared; public enum CoordinatorLifecycleState { diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/CoordinatorStatus.java b/airship-shared/src/main/java/io/airlift/airship/shared/CoordinatorStatus.java index eca8a531..13611d09 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/CoordinatorStatus.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/CoordinatorStatus.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.shared; +package io.airlift.airship.shared; import com.google.common.base.Function; import com.google.common.base.Preconditions; diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/CoordinatorStatusRepresentation.java b/airship-shared/src/main/java/io/airlift/airship/shared/CoordinatorStatusRepresentation.java index c536c005..76fa29f1 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/CoordinatorStatusRepresentation.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/CoordinatorStatusRepresentation.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.shared; +package io.airlift.airship.shared; import com.google.common.base.Function; import org.codehaus.jackson.annotate.JsonAutoDetect; @@ -13,12 +13,12 @@ import java.util.List; import static com.google.common.collect.Lists.transform; -import static com.proofpoint.galaxy.shared.CoordinatorStatus.idGetter; -import static com.proofpoint.galaxy.shared.CoordinatorStatus.locationGetter; -import static com.proofpoint.galaxy.shared.Strings.commonPrefixSegments; -import static com.proofpoint.galaxy.shared.Strings.safeTruncate; -import static com.proofpoint.galaxy.shared.Strings.shortestUniquePrefix; -import static com.proofpoint.galaxy.shared.Strings.trimLeadingSegments; +import static io.airlift.airship.shared.CoordinatorStatus.idGetter; +import static io.airlift.airship.shared.CoordinatorStatus.locationGetter; +import static io.airlift.airship.shared.Strings.commonPrefixSegments; +import static io.airlift.airship.shared.Strings.safeTruncate; +import static io.airlift.airship.shared.Strings.shortestUniquePrefix; +import static io.airlift.airship.shared.Strings.trimLeadingSegments; @JsonAutoDetect(JsonMethod.NONE) public class CoordinatorStatusRepresentation diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/DigestUtils.java b/airship-shared/src/main/java/io/airlift/airship/shared/DigestUtils.java index aa7a3e19..c74a302b 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/DigestUtils.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/DigestUtils.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.shared; +package io.airlift.airship.shared; import com.google.common.base.Charsets; import com.google.common.base.Throwables; diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/ExpectedSlotStatus.java b/airship-shared/src/main/java/io/airlift/airship/shared/ExpectedSlotStatus.java index f2412738..e75de862 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/ExpectedSlotStatus.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/ExpectedSlotStatus.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.shared; +package io.airlift.airship.shared; import com.google.common.base.Function; import com.google.common.base.Preconditions; diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/FileUtils.java b/airship-shared/src/main/java/io/airlift/airship/shared/FileUtils.java index 4888a0e4..8898d267 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/FileUtils.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/FileUtils.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.shared; +package io.airlift.airship.shared; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/HttpUriBuilder.java b/airship-shared/src/main/java/io/airlift/airship/shared/HttpUriBuilder.java index c0ec9375..82b937fe 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/HttpUriBuilder.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/HttpUriBuilder.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.shared; +package io.airlift.airship.shared; import com.google.common.base.Ascii; import com.google.common.base.CharMatcher; diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/Installation.java b/airship-shared/src/main/java/io/airlift/airship/shared/Installation.java index e727413f..cfd7207d 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/Installation.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/Installation.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.shared; +package io.airlift.airship.shared; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/InstallationRepresentation.java b/airship-shared/src/main/java/io/airlift/airship/shared/InstallationRepresentation.java index 38697290..553a9b94 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/InstallationRepresentation.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/InstallationRepresentation.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.shared; +package io.airlift.airship.shared; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonCreator; diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/InstallationUtils.java b/airship-shared/src/main/java/io/airlift/airship/shared/InstallationUtils.java index 550d48db..c8229f68 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/InstallationUtils.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/InstallationUtils.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.shared; +package io.airlift.airship.shared; import com.google.common.base.Objects; import com.google.common.base.Preconditions; @@ -13,7 +13,7 @@ import java.util.Properties; import java.util.TreeMap; -import static com.proofpoint.galaxy.shared.ConfigUtils.newConfigEntrySupplier; +import static io.airlift.airship.shared.ConfigUtils.newConfigEntrySupplier; public class InstallationUtils { @@ -78,7 +78,7 @@ public static Map readResources(Repository repository, Assignme { ImmutableMap.Builder builder = ImmutableMap.builder(); - InputSupplier resourcesFile = newConfigEntrySupplier(repository, assignment.getConfig(), "galaxy-resources.properties"); + InputSupplier resourcesFile = newConfigEntrySupplier(repository, assignment.getConfig(), "airship-resources.properties"); if (resourcesFile != null) { try { Properties resources = new Properties(); diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/LocationUtils.java b/airship-shared/src/main/java/io/airlift/airship/shared/LocationUtils.java index ea120514..86e69d9a 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/LocationUtils.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/LocationUtils.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.shared; +package io.airlift.airship.shared; import com.google.common.base.Preconditions; import com.google.common.base.Splitter; diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/MavenCoordinates.java b/airship-shared/src/main/java/io/airlift/airship/shared/MavenCoordinates.java index 316b0635..9fb8c146 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/MavenCoordinates.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/MavenCoordinates.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.shared; +package io.airlift.airship.shared; import com.google.common.base.Objects; import com.google.common.base.Preconditions; diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/Repository.java b/airship-shared/src/main/java/io/airlift/airship/shared/Repository.java index 27b7255e..5457ab25 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/Repository.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/Repository.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.shared; +package io.airlift.airship.shared; import java.net.URI; diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/RepositorySet.java b/airship-shared/src/main/java/io/airlift/airship/shared/RepositorySet.java index 216c4774..d19b5ac4 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/RepositorySet.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/RepositorySet.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.shared; +package io.airlift.airship.shared; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/SlotLifecycleState.java b/airship-shared/src/main/java/io/airlift/airship/shared/SlotLifecycleState.java index d01c4739..5778604c 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/SlotLifecycleState.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/SlotLifecycleState.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.shared; +package io.airlift.airship.shared; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/SlotStatus.java b/airship-shared/src/main/java/io/airlift/airship/shared/SlotStatus.java index b7f1224f..427d009e 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/SlotStatus.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/SlotStatus.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.shared; +package io.airlift.airship.shared; import com.google.common.base.Function; import com.google.common.base.Preconditions; @@ -22,8 +22,8 @@ import java.util.Map; import java.util.UUID; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.TERMINATED; -import static com.proofpoint.galaxy.shared.SlotLifecycleState.UNKNOWN; +import static io.airlift.airship.shared.SlotLifecycleState.TERMINATED; +import static io.airlift.airship.shared.SlotLifecycleState.UNKNOWN; @Immutable public class SlotStatus diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/SlotStatusRepresentation.java b/airship-shared/src/main/java/io/airlift/airship/shared/SlotStatusRepresentation.java index 7a6d154f..489c2ed4 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/SlotStatusRepresentation.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/SlotStatusRepresentation.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.proofpoint.galaxy.shared; +package io.airlift.airship.shared; import com.google.common.base.Function; import com.google.common.base.Objects; @@ -29,12 +29,12 @@ import java.util.UUID; import static com.google.common.collect.Lists.transform; -import static com.proofpoint.galaxy.shared.SlotStatus.idGetter; -import static com.proofpoint.galaxy.shared.SlotStatus.locationGetter; -import static com.proofpoint.galaxy.shared.Strings.commonPrefixSegments; -import static com.proofpoint.galaxy.shared.Strings.safeTruncate; -import static com.proofpoint.galaxy.shared.Strings.shortestUniquePrefix; -import static com.proofpoint.galaxy.shared.Strings.trimLeadingSegments; +import static io.airlift.airship.shared.SlotStatus.idGetter; +import static io.airlift.airship.shared.SlotStatus.locationGetter; +import static io.airlift.airship.shared.Strings.commonPrefixSegments; +import static io.airlift.airship.shared.Strings.safeTruncate; +import static io.airlift.airship.shared.Strings.shortestUniquePrefix; +import static io.airlift.airship.shared.Strings.trimLeadingSegments; @JsonAutoDetect(JsonMethod.NONE) public class SlotStatusRepresentation diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/Strings.java b/airship-shared/src/main/java/io/airlift/airship/shared/Strings.java index d1abe73d..95d206c0 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/Strings.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/Strings.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.shared; +package io.airlift.airship.shared; import com.google.common.base.Function; import com.google.common.base.Joiner; diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/UpgradeVersions.java b/airship-shared/src/main/java/io/airlift/airship/shared/UpgradeVersions.java index 30bbdc5a..78ff9362 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/UpgradeVersions.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/UpgradeVersions.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.shared; +package io.airlift.airship.shared; import com.google.common.base.Preconditions; import org.codehaus.jackson.annotate.JsonAutoDetect; diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/VersionConflictException.java b/airship-shared/src/main/java/io/airlift/airship/shared/VersionConflictException.java index 46840741..7fc475a1 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/VersionConflictException.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/VersionConflictException.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.shared; +package io.airlift.airship.shared; public class VersionConflictException extends RuntimeException { diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/VersionConflictExceptionMapper.java b/airship-shared/src/main/java/io/airlift/airship/shared/VersionConflictExceptionMapper.java index c8c0fb7d..ac48e63a 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/VersionConflictExceptionMapper.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/VersionConflictExceptionMapper.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.shared; +package io.airlift.airship.shared; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; diff --git a/airship-shared/src/main/java/io/airlift/airship/shared/VersionsUtil.java b/airship-shared/src/main/java/io/airlift/airship/shared/VersionsUtil.java index 9e54671e..e9982c16 100644 --- a/airship-shared/src/main/java/io/airlift/airship/shared/VersionsUtil.java +++ b/airship-shared/src/main/java/io/airlift/airship/shared/VersionsUtil.java @@ -1,4 +1,4 @@ -package com.proofpoint.galaxy.shared; +package io.airlift.airship.shared; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; @@ -12,11 +12,11 @@ public class VersionsUtil { - public static final String GALAXY_SLOTS_VERSION_HEADER = "x-galaxy-slots-version"; - public static final String GALAXY_SLOT_VERSION_HEADER = "x-galaxy-slot-version"; + public static final String AIRSHIP_SLOTS_VERSION_HEADER = "x-airship-slots-version"; + public static final String AIRSHIP_SLOT_VERSION_HEADER = "x-airship-slot-version"; - public static final String GALAXY_AGENTS_VERSION_HEADER = "x-galaxy-agents-version"; - public static final String GALAXY_AGENT_VERSION_HEADER = "x-galaxy-agent-version"; + public static final String AIRSHIP_AGENTS_VERSION_HEADER = "x-airship-agents-version"; + public static final String AIRSHIP_AGENT_VERSION_HEADER = "x-airship-agent-version"; private VersionsUtil() { @@ -31,7 +31,7 @@ public static void checkSlotVersion(SlotStatus slotStatus, String expectedSlotVe } if (!expectedSlotVersion.equals(slotStatus.getVersion())) { - throw new VersionConflictException(GALAXY_SLOT_VERSION_HEADER, slotStatus.getVersion()); + throw new VersionConflictException(AIRSHIP_SLOT_VERSION_HEADER, slotStatus.getVersion()); } } @@ -45,7 +45,7 @@ public static void checkSlotsVersion(String expectedSlotsVersion, Iterable 4.0.0 - com.proofpoint.galaxy - galaxy-root + io.airlift.airship + airship-root 0.9-SNAPSHOT pom - galaxy-root + airship-root - Galaxy - http://github.com/dain/galaxy-server + Airship + http://github.com/airlift/airship 2011 @@ -39,9 +39,9 @@ - scm:git:git://github.com/dain/galaxy-server.git - scm:git:git@github.com:dain/galaxy-server.git - http://github.com/dain/galaxy-server/tree/master + scm:git:git://github.com/airlift/airship.git + scm:git:git@github.com:airlift/airship.git + http://github.com/airlift/airship/tree/master @@ -63,13 +63,13 @@ - galaxy-shared - galaxy-coordinator - galaxy-agent - galaxy-integration-tests - galaxy-cli - galaxy-config-bundler - galaxy-ec2 + airship-shared + airship-coordinator + airship-agent + airship-integration-tests + airship-cli + airship-config-bundler + airship-ec2