no_entry: Updates package signatures Signed-off-by: Andrew Donald Kennedy <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/e9ff1399 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/e9ff1399 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/e9ff1399 Branch: refs/heads/master Commit: e9ff13997e6752a66c17ecc07e41fb72d99c94b5 Parents: e5bf1a8 Author: CloudsoftOps <[email protected]> Authored: Thu May 18 18:36:21 2017 +0100 Committer: Andrew Donald Kennedy <[email protected]> Committed: Fri May 19 14:03:37 2017 +0100 ---------------------------------------------------------------------- brooklyn-server/locations/container/pom.xml | 0 .../entity/docker/DockerContainer.java | 4 ++-- .../entity/docker/DockerContainerImpl.java | 2 +- .../entity/kubernetes/KubernetesPod.java | 6 +++--- .../entity/kubernetes/KubernetesPodImpl.java | 4 ++-- .../entity/kubernetes/KubernetesResource.java | 2 +- .../kubernetes/KubernetesResourceImpl.java | 2 +- .../entity/openshift/OpenShiftPod.java | 4 ++-- .../entity/openshift/OpenShiftPodImpl.java | 4 ++-- .../entity/openshift/OpenShiftResource.java | 4 ++-- .../entity/openshift/OpenShiftResourceImpl.java | 4 ++-- .../location/docker/DockerJcloudsLocation.java | 4 ++-- .../location/docker/DockerLocationResolver.java | 2 +- .../location/kubernetes/ImageChooser.java | 2 +- .../location/kubernetes/KubernetesCerts.java | 18 ++++++++-------- .../kubernetes/KubernetesClientRegistry.java | 2 +- .../KubernetesClientRegistryImpl.java | 2 +- .../location/kubernetes/KubernetesLocation.java | 16 +++++++------- .../kubernetes/KubernetesLocationConfig.java | 2 +- .../kubernetes/KubernetesLocationResolver.java | 2 +- .../machine/KubernetesEmptyMachineLocation.java | 2 +- .../machine/KubernetesMachineLocation.java | 2 +- .../machine/KubernetesSshMachineLocation.java | 2 +- .../openshift/OpenShiftClientRegistryImpl.java | 4 ++-- .../location/openshift/OpenShiftLocation.java | 12 +++++------ .../openshift/OpenShiftLocationConfig.java | 4 ++-- .../openshift/OpenShiftLocationResolver.java | 2 +- ...pache.brooklyn.api.location.LocationResolver | 6 +++--- .../resources/OSGI-INF/blueprint/blueprint.xml | 6 +++--- .../docker/DockerJcloudsLocationLiveTest.java | 2 +- .../docker/DockerLocationResolverTest.java | 2 +- .../location/kubernetes/ImageChooserTest.java | 2 +- .../kubernetes/KubernetesCertsTest.java | 2 +- .../kubernetes/KubernetesLocationLiveTest.java | 6 +++--- .../KubernetesLocationResolverTest.java | 2 +- .../KubernetesLocationYamlLiveTest.java | 14 ++++++------- .../openshift/OpenShiftLocationLiveTest.java | 4 ++-- .../OpenShiftLocationResolverTest.java | 2 +- .../OpenShiftLocationYamlLiveTest.java | 22 ++++++++++---------- container.bom | 10 ++++----- docker-location/docker-container-location.md | 4 ++-- kubernetes-location/README.md | 6 +++--- openshift-location/README.md | 6 +++--- tests/generic-application.tests.bom | 2 +- 44 files changed, 106 insertions(+), 106 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/pom.xml b/brooklyn-server/locations/container/pom.xml new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/docker/DockerContainer.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/docker/DockerContainer.java b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/docker/DockerContainer.java index ef012c3..de82874 100644 --- a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/docker/DockerContainer.java +++ b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/docker/DockerContainer.java @@ -1,4 +1,4 @@ -package io.cloudsoft.amp.containerservice.dockercontainer; +package org.apache.brooklyn.container.entity.docker; import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.config.ConfigKey; @@ -32,7 +32,7 @@ import com.google.common.reflect.TypeToken; * - "HTTP_CONFIG_ROOT=/var/httpd" * - "USE_DEFAULTS=true" * services: - * - type: io.cloudsoft.amp.containerservice.dockercontainer.DockerContainer + * - type: org.apache.brooklyn.container.entity.docker.DockerContainer * brooklyn.config: * docker.container.imageName: "apache/httpd:latest" * docker.container.disableSsh: true http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/docker/DockerContainerImpl.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/docker/DockerContainerImpl.java b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/docker/DockerContainerImpl.java index 790985f..a3d2671 100644 --- a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/docker/DockerContainerImpl.java +++ b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/docker/DockerContainerImpl.java @@ -1,4 +1,4 @@ -package io.cloudsoft.amp.containerservice.dockercontainer; +package org.apache.brooklyn.container.entity.docker; import java.util.Iterator; import java.util.List; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/kubernetes/KubernetesPod.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/kubernetes/KubernetesPod.java b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/kubernetes/KubernetesPod.java index bf5444d..5dfc509 100644 --- a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/kubernetes/KubernetesPod.java +++ b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/kubernetes/KubernetesPod.java @@ -1,4 +1,4 @@ -package io.cloudsoft.amp.containerservice.kubernetes.entity; +package org.apache.brooklyn.container.entity.kubernetes; import java.util.List; import java.util.Map; @@ -15,8 +15,8 @@ import org.apache.brooklyn.util.math.MathPredicates; import com.google.common.collect.ImmutableMap; import com.google.common.reflect.TypeToken; -import io.cloudsoft.amp.containerservice.dockercontainer.DockerContainer; -import io.cloudsoft.amp.containerservice.kubernetes.location.KubernetesLocationConfig; +import org.apache.brooklyn.container.entity.docker.DockerContainer; +import org.apache.brooklyn.container.location.kubernetes.KubernetesLocationConfig; @ImplementedBy(KubernetesPodImpl.class) public interface KubernetesPod extends DockerContainer { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/kubernetes/KubernetesPodImpl.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/kubernetes/KubernetesPodImpl.java b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/kubernetes/KubernetesPodImpl.java index 2acf734..c71c1a7 100644 --- a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/kubernetes/KubernetesPodImpl.java +++ b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/kubernetes/KubernetesPodImpl.java @@ -1,6 +1,6 @@ -package io.cloudsoft.amp.containerservice.kubernetes.entity; +package org.apache.brooklyn.container.entity.kubernetes; -import io.cloudsoft.amp.containerservice.dockercontainer.DockerContainerImpl; +import org.apache.brooklyn.container.entity.docker.DockerContainerImpl; public class KubernetesPodImpl extends DockerContainerImpl implements KubernetesPod { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/kubernetes/KubernetesResource.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/kubernetes/KubernetesResource.java b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/kubernetes/KubernetesResource.java index 320c924..4fbd75d 100644 --- a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/kubernetes/KubernetesResource.java +++ b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/kubernetes/KubernetesResource.java @@ -1,4 +1,4 @@ -package io.cloudsoft.amp.containerservice.kubernetes.entity; +package org.apache.brooklyn.container.entity.kubernetes; import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.api.sensor.AttributeSensor; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/kubernetes/KubernetesResourceImpl.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/kubernetes/KubernetesResourceImpl.java b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/kubernetes/KubernetesResourceImpl.java index 3e7dad3..59b8fdf 100644 --- a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/kubernetes/KubernetesResourceImpl.java +++ b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/kubernetes/KubernetesResourceImpl.java @@ -1,4 +1,4 @@ -package io.cloudsoft.amp.containerservice.kubernetes.entity; +package org.apache.brooklyn.container.entity.kubernetes; import org.apache.brooklyn.core.entity.BrooklynConfigKeys; import org.apache.brooklyn.entity.software.base.EmptySoftwareProcessImpl; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/openshift/OpenShiftPod.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/openshift/OpenShiftPod.java b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/openshift/OpenShiftPod.java index 0073904..feec036 100644 --- a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/openshift/OpenShiftPod.java +++ b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/openshift/OpenShiftPod.java @@ -1,8 +1,8 @@ -package io.cloudsoft.amp.containerservice.openshift.entity; +package org.apache.brooklyn.container.entity.openshift; import org.apache.brooklyn.api.entity.ImplementedBy; -import io.cloudsoft.amp.containerservice.kubernetes.entity.KubernetesPod; +import org.apache.brooklyn.container.entity.kubernetes.KubernetesPod; @ImplementedBy(OpenShiftPodImpl.class) public interface OpenShiftPod extends KubernetesPod { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/openshift/OpenShiftPodImpl.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/openshift/OpenShiftPodImpl.java b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/openshift/OpenShiftPodImpl.java index 49ffa4d..03a3e6d 100644 --- a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/openshift/OpenShiftPodImpl.java +++ b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/openshift/OpenShiftPodImpl.java @@ -1,6 +1,6 @@ -package io.cloudsoft.amp.containerservice.openshift.entity; +package org.apache.brooklyn.container.entity.openshift; -import io.cloudsoft.amp.containerservice.kubernetes.entity.KubernetesPodImpl; +import org.apache.brooklyn.container.entity.kubernetes.KubernetesPodImpl; public class OpenShiftPodImpl extends KubernetesPodImpl implements OpenShiftPod { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/openshift/OpenShiftResource.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/openshift/OpenShiftResource.java b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/openshift/OpenShiftResource.java index d4c8d95..f57a3c6 100644 --- a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/openshift/OpenShiftResource.java +++ b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/openshift/OpenShiftResource.java @@ -1,8 +1,8 @@ -package io.cloudsoft.amp.containerservice.openshift.entity; +package org.apache.brooklyn.container.entity.openshift; import org.apache.brooklyn.api.entity.ImplementedBy; -import io.cloudsoft.amp.containerservice.kubernetes.entity.KubernetesResource; +import org.apache.brooklyn.container.entity.kubernetes.KubernetesResource; @ImplementedBy(OpenShiftResourceImpl.class) public interface OpenShiftResource extends KubernetesResource { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/openshift/OpenShiftResourceImpl.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/openshift/OpenShiftResourceImpl.java b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/openshift/OpenShiftResourceImpl.java index 53badcc..473f7f8 100644 --- a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/openshift/OpenShiftResourceImpl.java +++ b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/entity/openshift/OpenShiftResourceImpl.java @@ -1,6 +1,6 @@ -package io.cloudsoft.amp.containerservice.openshift.entity; +package org.apache.brooklyn.container.entity.openshift; -import io.cloudsoft.amp.containerservice.kubernetes.entity.KubernetesResourceImpl; +import org.apache.brooklyn.container.entity.kubernetes.KubernetesResourceImpl; public class OpenShiftResourceImpl extends KubernetesResourceImpl implements OpenShiftResource { } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocation.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocation.java b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocation.java index ecf3214..4354ed3 100644 --- a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocation.java +++ b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocation.java @@ -1,4 +1,4 @@ -package io.cloudsoft.amp.containerservice.dockerlocation; +package org.apache.brooklyn.container.location.docker; import static com.google.common.base.Preconditions.checkNotNull; @@ -33,7 +33,7 @@ import com.google.common.base.Functions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; -import io.cloudsoft.amp.containerservice.dockercontainer.DockerContainer; +import org.apache.brooklyn.container.entity.docker.DockerContainer; /** * For provisioning docker containers, using the jclouds-docker integration. http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/docker/DockerLocationResolver.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/docker/DockerLocationResolver.java b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/docker/DockerLocationResolver.java index d6c8c99..1b2318f 100644 --- a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/docker/DockerLocationResolver.java +++ b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/docker/DockerLocationResolver.java @@ -1,4 +1,4 @@ -package io.cloudsoft.amp.containerservice.dockerlocation; +package org.apache.brooklyn.container.location.docker; import java.util.Map; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/ImageChooser.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/ImageChooser.java b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/ImageChooser.java index 1bda432..93b8f6d 100644 --- a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/ImageChooser.java +++ b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/ImageChooser.java @@ -1,4 +1,4 @@ -package io.cloudsoft.amp.containerservice.kubernetes.location; +package org.apache.brooklyn.container.location.kubernetes; import static com.google.common.base.Preconditions.checkNotNull; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesCerts.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesCerts.java b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesCerts.java index 9bb840f..6005c52 100644 --- a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesCerts.java +++ b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesCerts.java @@ -1,13 +1,13 @@ -package io.cloudsoft.amp.containerservice.kubernetes.location; +package org.apache.brooklyn.container.location.kubernetes; -import static io.cloudsoft.amp.containerservice.kubernetes.location.KubernetesLocationConfig.CA_CERT_DATA; -import static io.cloudsoft.amp.containerservice.kubernetes.location.KubernetesLocationConfig.CA_CERT_FILE; -import static io.cloudsoft.amp.containerservice.kubernetes.location.KubernetesLocationConfig.CLIENT_CERT_DATA; -import static io.cloudsoft.amp.containerservice.kubernetes.location.KubernetesLocationConfig.CLIENT_CERT_FILE; -import static io.cloudsoft.amp.containerservice.kubernetes.location.KubernetesLocationConfig.CLIENT_KEY_ALGO; -import static io.cloudsoft.amp.containerservice.kubernetes.location.KubernetesLocationConfig.CLIENT_KEY_DATA; -import static io.cloudsoft.amp.containerservice.kubernetes.location.KubernetesLocationConfig.CLIENT_KEY_FILE; -import static io.cloudsoft.amp.containerservice.kubernetes.location.KubernetesLocationConfig.CLIENT_KEY_PASSPHRASE; +import static org.apache.brooklyn.container.location.kubernetes.KubernetesLocationConfig.CA_CERT_DATA; +import static org.apache.brooklyn.container.location.kubernetes.KubernetesLocationConfig.CA_CERT_FILE; +import static org.apache.brooklyn.container.location.kubernetes.KubernetesLocationConfig.CLIENT_CERT_DATA; +import static org.apache.brooklyn.container.location.kubernetes.KubernetesLocationConfig.CLIENT_CERT_FILE; +import static org.apache.brooklyn.container.location.kubernetes.KubernetesLocationConfig.CLIENT_KEY_ALGO; +import static org.apache.brooklyn.container.location.kubernetes.KubernetesLocationConfig.CLIENT_KEY_DATA; +import static org.apache.brooklyn.container.location.kubernetes.KubernetesLocationConfig.CLIENT_KEY_FILE; +import static org.apache.brooklyn.container.location.kubernetes.KubernetesLocationConfig.CLIENT_KEY_PASSPHRASE; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.util.core.ResourceUtils; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesClientRegistry.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesClientRegistry.java b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesClientRegistry.java index c240378..db8b4cc 100644 --- a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesClientRegistry.java +++ b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesClientRegistry.java @@ -1,4 +1,4 @@ -package io.cloudsoft.amp.containerservice.kubernetes.location; +package org.apache.brooklyn.container.location.kubernetes; import org.apache.brooklyn.util.core.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesClientRegistryImpl.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesClientRegistryImpl.java b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesClientRegistryImpl.java index 32bfee6..e1777e5 100644 --- a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesClientRegistryImpl.java +++ b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesClientRegistryImpl.java @@ -1,4 +1,4 @@ -package io.cloudsoft.amp.containerservice.kubernetes.location; +package org.apache.brooklyn.container.location.kubernetes; import static com.google.common.base.Preconditions.checkNotNull; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocation.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocation.java b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocation.java index e87866c..aa5e1f9 100644 --- a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocation.java +++ b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocation.java @@ -1,4 +1,4 @@ -package io.cloudsoft.amp.containerservice.kubernetes.location; +package org.apache.brooklyn.container.location.kubernetes; import java.io.InputStream; import java.net.InetAddress; @@ -65,13 +65,13 @@ import com.google.common.collect.Sets; import com.google.common.io.BaseEncoding; import com.google.common.net.HostAndPort; -import io.cloudsoft.amp.containerservice.dockercontainer.DockerContainer; -import io.cloudsoft.amp.containerservice.dockerlocation.DockerJcloudsLocation; -import io.cloudsoft.amp.containerservice.kubernetes.entity.KubernetesPod; -import io.cloudsoft.amp.containerservice.kubernetes.entity.KubernetesResource; -import io.cloudsoft.amp.containerservice.kubernetes.location.machine.KubernetesEmptyMachineLocation; -import io.cloudsoft.amp.containerservice.kubernetes.location.machine.KubernetesMachineLocation; -import io.cloudsoft.amp.containerservice.kubernetes.location.machine.KubernetesSshMachineLocation; +import org.apache.brooklyn.container.entity.docker.DockerContainer; +import org.apache.brooklyn.container.location.docker.DockerJcloudsLocation; +import org.apache.brooklyn.container.entity.kubernetes.KubernetesPod; +import org.apache.brooklyn.container.entity.kubernetes.KubernetesResource; +import org.apache.brooklyn.container.location.kubernetes.machine.KubernetesEmptyMachineLocation; +import org.apache.brooklyn.container.location.kubernetes.machine.KubernetesMachineLocation; +import org.apache.brooklyn.container.location.kubernetes.machine.KubernetesSshMachineLocation; import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.ContainerBuilder; import io.fabric8.kubernetes.api.model.ContainerPort; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationConfig.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationConfig.java b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationConfig.java index 0571fc2..3251144 100644 --- a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationConfig.java +++ b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationConfig.java @@ -1,4 +1,4 @@ -package io.cloudsoft.amp.containerservice.kubernetes.location; +package org.apache.brooklyn.container.location.kubernetes; import java.util.Map; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationResolver.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationResolver.java b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationResolver.java index 79e7c64..4e10cdd 100644 --- a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationResolver.java +++ b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationResolver.java @@ -1,4 +1,4 @@ -package io.cloudsoft.amp.containerservice.kubernetes.location; +package org.apache.brooklyn.container.location.kubernetes; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationResolver; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/machine/KubernetesEmptyMachineLocation.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/machine/KubernetesEmptyMachineLocation.java b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/machine/KubernetesEmptyMachineLocation.java index 8875ef3..7e0e413 100644 --- a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/machine/KubernetesEmptyMachineLocation.java +++ b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/machine/KubernetesEmptyMachineLocation.java @@ -1,4 +1,4 @@ -package io.cloudsoft.amp.containerservice.kubernetes.location.machine; +package org.apache.brooklyn.container.location.kubernetes.machine; import java.net.InetAddress; import java.util.Set; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/machine/KubernetesMachineLocation.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/machine/KubernetesMachineLocation.java b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/machine/KubernetesMachineLocation.java index 6d8838b..0a1fb8e 100644 --- a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/machine/KubernetesMachineLocation.java +++ b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/machine/KubernetesMachineLocation.java @@ -1,4 +1,4 @@ -package io.cloudsoft.amp.containerservice.kubernetes.location.machine; +package org.apache.brooklyn.container.location.kubernetes.machine; import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.config.ConfigKey; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/machine/KubernetesSshMachineLocation.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/machine/KubernetesSshMachineLocation.java b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/machine/KubernetesSshMachineLocation.java index ad83f8f..7535f67 100644 --- a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/machine/KubernetesSshMachineLocation.java +++ b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/machine/KubernetesSshMachineLocation.java @@ -1,4 +1,4 @@ -package io.cloudsoft.amp.containerservice.kubernetes.location.machine; +package org.apache.brooklyn.container.location.kubernetes.machine; import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.location.ssh.SshMachineLocation; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftClientRegistryImpl.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftClientRegistryImpl.java b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftClientRegistryImpl.java index 157fef5..ea43ac2 100644 --- a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftClientRegistryImpl.java +++ b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftClientRegistryImpl.java @@ -1,8 +1,8 @@ -package io.cloudsoft.amp.containerservice.openshift.location; +package org.apache.brooklyn.container.location.openshift; import org.apache.brooklyn.util.core.config.ConfigBag; -import io.cloudsoft.amp.containerservice.kubernetes.location.KubernetesClientRegistryImpl; +import org.apache.brooklyn.container.location.kubernetes.KubernetesClientRegistryImpl; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.openshift.client.OpenShiftClient; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocation.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocation.java b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocation.java index af79dfd..9a4b299 100644 --- a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocation.java +++ b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocation.java @@ -1,4 +1,4 @@ -package io.cloudsoft.amp.containerservice.openshift.location; +package org.apache.brooklyn.container.location.openshift; import java.net.InetAddress; import java.util.Map; @@ -14,11 +14,11 @@ import org.slf4j.LoggerFactory; import com.google.common.collect.ImmutableSet; -import io.cloudsoft.amp.containerservice.kubernetes.location.KubernetesClientRegistry; -import io.cloudsoft.amp.containerservice.kubernetes.location.KubernetesLocation; -import io.cloudsoft.amp.containerservice.kubernetes.location.machine.KubernetesMachineLocation; -import io.cloudsoft.amp.containerservice.openshift.entity.OpenShiftPod; -import io.cloudsoft.amp.containerservice.openshift.entity.OpenShiftResource; +import org.apache.brooklyn.container.location.kubernetes.KubernetesClientRegistry; +import org.apache.brooklyn.container.location.kubernetes.KubernetesLocation; +import org.apache.brooklyn.container.location.kubernetes.machine.KubernetesMachineLocation; +import org.apache.brooklyn.container.entity.openshift.OpenShiftPod; +import org.apache.brooklyn.container.entity.openshift.OpenShiftResource; import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.Namespace; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationConfig.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationConfig.java b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationConfig.java index 6dbf7b9..9c94022 100644 --- a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationConfig.java +++ b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationConfig.java @@ -1,9 +1,9 @@ -package io.cloudsoft.amp.containerservice.openshift.location; +package org.apache.brooklyn.container.location.openshift; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; -import io.cloudsoft.amp.containerservice.kubernetes.location.KubernetesClientRegistry; +import org.apache.brooklyn.container.location.kubernetes.KubernetesClientRegistry; public interface OpenShiftLocationConfig { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationResolver.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationResolver.java b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationResolver.java index 50300e1..69aef4f 100644 --- a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationResolver.java +++ b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationResolver.java @@ -1,4 +1,4 @@ -package io.cloudsoft.amp.containerservice.openshift.location; +package org.apache.brooklyn.container.location.openshift; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationResolver; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver b/brooklyn-server/locations/container/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver index 88a0ec4..0ca29fd 100644 --- a/brooklyn-server/locations/container/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver +++ b/brooklyn-server/locations/container/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver @@ -1,3 +1,3 @@ -io.cloudsoft.amp.containerservice.dockerlocation.DockerLocationResolver -io.cloudsoft.amp.containerservice.kubernetes.location.KubernetesLocationResolver -io.cloudsoft.amp.containerservice.openshift.location.OpenShiftLocationResolver +org.apache.brooklyn.container.location.docker.DockerLocationResolver +org.apache.brooklyn.container.location.kubernetes.KubernetesLocationResolver +org.apache.brooklyn.container.location.openshift.OpenShiftLocationResolver http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/main/resources/OSGI-INF/blueprint/blueprint.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/brooklyn-server/locations/container/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 2275ce5..a7c7794 100644 --- a/brooklyn-server/locations/container/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/brooklyn-server/locations/container/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -6,11 +6,11 @@ <bean id="dockerLocationResolver" scope="prototype" - class="io.cloudsoft.amp.containerservice.dockerlocation.DockerLocationResolver"/> + class="org.apache.brooklyn.container.location.docker.DockerLocationResolver"/> <bean id="kubernetesLocationResolver" scope="prototype" - class="io.cloudsoft.amp.containerservice.kubernetes.location.KubernetesLocationResolver"/> + class="org.apache.brooklyn.container.location.kubernetes.KubernetesLocationResolver"/> <bean id="openshiftLocationResolver" scope="prototype" - class="io.cloudsoft.amp.containerservice.openshift.location.OpenShiftLocationResolver"/> + class="org.apache.brooklyn.container.location.openshift.OpenShiftLocationResolver"/> <service id="dockerLocationResolverService" ref="dockerLocationResolver" interface="org.apache.brooklyn.api.location.LocationResolver"/> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocationLiveTest.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocationLiveTest.java b/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocationLiveTest.java index eb64173..dafa7b2 100644 --- a/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocationLiveTest.java +++ b/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocationLiveTest.java @@ -1,4 +1,4 @@ -package io.cloudsoft.amp.containerservice.dockerlocation; +package org.apache.brooklyn.container.location.docker; import static com.google.common.base.Preconditions.checkNotNull; import static org.testng.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/docker/DockerLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/docker/DockerLocationResolverTest.java b/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/docker/DockerLocationResolverTest.java index d04ccf3..83ff51d 100644 --- a/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/docker/DockerLocationResolverTest.java +++ b/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/docker/DockerLocationResolverTest.java @@ -1,4 +1,4 @@ -package io.cloudsoft.amp.containerservice.dockerlocation; +package org.apache.brooklyn.container.location.docker; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/ImageChooserTest.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/ImageChooserTest.java b/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/ImageChooserTest.java index 8f28929..dc19857 100644 --- a/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/ImageChooserTest.java +++ b/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/ImageChooserTest.java @@ -1,4 +1,4 @@ -package io.cloudsoft.amp.containerservice.kubernetes.location; +package org.apache.brooklyn.container.location.kubernetes; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesCertsTest.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesCertsTest.java b/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesCertsTest.java index 27c1b79..4b30bbd 100644 --- a/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesCertsTest.java +++ b/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesCertsTest.java @@ -1,4 +1,4 @@ -package io.cloudsoft.amp.containerservice.kubernetes.location; +package org.apache.brooklyn.container.location.kubernetes; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationLiveTest.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationLiveTest.java b/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationLiveTest.java index 4fb416f..b12c511 100644 --- a/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationLiveTest.java +++ b/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationLiveTest.java @@ -1,4 +1,4 @@ -package io.cloudsoft.amp.containerservice.kubernetes.location; +package org.apache.brooklyn.container.location.kubernetes; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; @@ -28,8 +28,8 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.net.HostAndPort; -import io.cloudsoft.amp.containerservice.kubernetes.location.machine.KubernetesMachineLocation; -import io.cloudsoft.amp.containerservice.kubernetes.location.machine.KubernetesSshMachineLocation; +import org.apache.brooklyn.container.location.kubernetes.machine.KubernetesMachineLocation; +import org.apache.brooklyn.container.location.kubernetes.machine.KubernetesSshMachineLocation; /** /** http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationResolverTest.java b/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationResolverTest.java index acd366b..353b590 100644 --- a/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationResolverTest.java +++ b/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationResolverTest.java @@ -1,4 +1,4 @@ -package io.cloudsoft.amp.containerservice.kubernetes.location; +package org.apache.brooklyn.container.location.kubernetes; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationYamlLiveTest.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationYamlLiveTest.java b/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationYamlLiveTest.java index 6c09b16..3c2a31d 100644 --- a/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationYamlLiveTest.java +++ b/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationYamlLiveTest.java @@ -1,12 +1,12 @@ -package io.cloudsoft.amp.containerservice.kubernetes.location; +package org.apache.brooklyn.container.location.kubernetes; import static com.google.common.base.Predicates.and; import static com.google.common.base.Predicates.equalTo; import static com.google.common.base.Predicates.not; import static com.google.common.base.Predicates.notNull; -import static io.cloudsoft.amp.containerservice.kubernetes.location.KubernetesLocationLiveTest.CREDENTIAL; -import static io.cloudsoft.amp.containerservice.kubernetes.location.KubernetesLocationLiveTest.IDENTITY; -import static io.cloudsoft.amp.containerservice.kubernetes.location.KubernetesLocationLiveTest.KUBERNETES_ENDPOINT; +import static org.apache.brooklyn.container.location.kubernetes.KubernetesLocationLiveTest.CREDENTIAL; +import static org.apache.brooklyn.container.location.kubernetes.KubernetesLocationLiveTest.IDENTITY; +import static org.apache.brooklyn.container.location.kubernetes.KubernetesLocationLiveTest.KUBERNETES_ENDPOINT; import static org.apache.brooklyn.core.entity.EntityAsserts.assertAttributeEquals; import static org.apache.brooklyn.core.entity.EntityAsserts.assertAttributeEqualsEventually; import static org.apache.brooklyn.core.entity.EntityAsserts.assertAttributeEventually; @@ -48,9 +48,9 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.net.HostAndPort; -import io.cloudsoft.amp.containerservice.dockercontainer.DockerContainer; -import io.cloudsoft.amp.containerservice.kubernetes.entity.KubernetesPod; -import io.cloudsoft.amp.containerservice.kubernetes.entity.KubernetesResource; +import org.apache.brooklyn.container.entity.docker.DockerContainer; +import org.apache.brooklyn.container.entity.kubernetes.KubernetesPod; +import org.apache.brooklyn.container.entity.kubernetes.KubernetesResource; import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.client.KubernetesClient; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationLiveTest.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationLiveTest.java b/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationLiveTest.java index 2aa20c4..529733e 100644 --- a/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationLiveTest.java +++ b/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationLiveTest.java @@ -1,4 +1,4 @@ -package io.cloudsoft.amp.containerservice.openshift.location; +package org.apache.brooklyn.container.location.openshift; import java.util.Map; @@ -7,7 +7,7 @@ import org.apache.brooklyn.util.os.Os; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.cloudsoft.amp.containerservice.kubernetes.location.KubernetesLocationLiveTest; +import org.apache.brooklyn.container.location.kubernetes.KubernetesLocationLiveTest; /** * Tests deploying containers via the {@code openshift"} location, to an OpenShift endpoint. http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationResolverTest.java b/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationResolverTest.java index 7d06460..a8db320 100644 --- a/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationResolverTest.java +++ b/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationResolverTest.java @@ -1,4 +1,4 @@ -package io.cloudsoft.amp.containerservice.openshift.location; +package org.apache.brooklyn.container.location.openshift; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationYamlLiveTest.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationYamlLiveTest.java b/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationYamlLiveTest.java index 08d8ec4..4ad146f 100644 --- a/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationYamlLiveTest.java +++ b/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationYamlLiveTest.java @@ -1,14 +1,14 @@ -package io.cloudsoft.amp.containerservice.openshift.location; +package org.apache.brooklyn.container.location.openshift; import static com.google.common.base.Predicates.and; import static com.google.common.base.Predicates.equalTo; import static com.google.common.base.Predicates.not; import static com.google.common.base.Predicates.notNull; -import static io.cloudsoft.amp.containerservice.openshift.location.OpenShiftLocationLiveTest.CA_CERT_FILE; -import static io.cloudsoft.amp.containerservice.openshift.location.OpenShiftLocationLiveTest.CLIENT_CERT_FILE; -import static io.cloudsoft.amp.containerservice.openshift.location.OpenShiftLocationLiveTest.CLIENT_KEY_FILE; -import static io.cloudsoft.amp.containerservice.openshift.location.OpenShiftLocationLiveTest.NAMESPACE; -import static io.cloudsoft.amp.containerservice.openshift.location.OpenShiftLocationLiveTest.OPENSHIFT_ENDPOINT; +import static org.apache.brooklyn.container.location.openshift.OpenShiftLocationLiveTest.CA_CERT_FILE; +import static org.apache.brooklyn.container.location.openshift.OpenShiftLocationLiveTest.CLIENT_CERT_FILE; +import static org.apache.brooklyn.container.location.openshift.OpenShiftLocationLiveTest.CLIENT_KEY_FILE; +import static org.apache.brooklyn.container.location.openshift.OpenShiftLocationLiveTest.NAMESPACE; +import static org.apache.brooklyn.container.location.openshift.OpenShiftLocationLiveTest.OPENSHIFT_ENDPOINT; import static org.apache.brooklyn.core.entity.EntityAsserts.assertAttribute; import static org.apache.brooklyn.core.entity.EntityAsserts.assertAttributeEquals; import static org.apache.brooklyn.core.entity.EntityAsserts.assertEntityHealthy; @@ -22,11 +22,11 @@ import org.testng.annotations.Test; import com.google.common.base.Joiner; import com.google.common.collect.Iterables; -import io.cloudsoft.amp.containerservice.kubernetes.entity.KubernetesPod; -import io.cloudsoft.amp.containerservice.kubernetes.entity.KubernetesResource; -import io.cloudsoft.amp.containerservice.kubernetes.location.KubernetesLocationYamlLiveTest; -import io.cloudsoft.amp.containerservice.openshift.entity.OpenShiftPod; -import io.cloudsoft.amp.containerservice.openshift.entity.OpenShiftResource; +import org.apache.brooklyn.container.entity.kubernetes.KubernetesPod; +import org.apache.brooklyn.container.entity.kubernetes.KubernetesResource; +import org.apache.brooklyn.container.location.kubernetes.KubernetesLocationYamlLiveTest; +import org.apache.brooklyn.container.entity.openshift.OpenShiftPod; +import org.apache.brooklyn.container.entity.openshift.OpenShiftResource; /** * Tests YAML apps via the {@code openshift"} location, to an OpenShift endpoint. http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/container.bom ---------------------------------------------------------------------- diff --git a/container.bom b/container.bom index ece4b01..d9e8814 100644 --- a/container.bom +++ b/container.bom @@ -15,7 +15,7 @@ brooklyn.catalog: itemType: entity iconUrl: https://raw.githubusercontent.com/docker-library/docs/c350af05d3fac7b5c3f6327ac82fe4d990d8729c/docker/logo.png item: - type: io.cloudsoft.amp.containerservice.dockercontainer.DockerContainer + type: org.apache.brooklyn.container.entity.docker.DockerContainer brooklyn.parameters: - name: docker.container.imageName label: "Docker Container Image Name" @@ -40,7 +40,7 @@ brooklyn.catalog: itemType: entity iconUrl: https://pbs.twimg.com/media/Bt_pEfqCAAAiVyz.png item: - type: io.cloudsoft.amp.containerservice.kubernetes.entity.KubernetesPod + type: org.apache.brooklyn.container.entity.kubernetes.KubernetesPod brooklyn.parameters: - name: docker.container.imageName label: "Docker Container Image Name" @@ -81,7 +81,7 @@ brooklyn.catalog: itemType: entity iconUrl: https://pbs.twimg.com/media/Bt_pEfqCAAAiVyz.png item: - type: io.cloudsoft.amp.containerservice.kubernetes.entity.KubernetesResource + type: org.apache.brooklyn.container.entity.kubernetes.KubernetesResource brooklyn.parameters: - name: resource label: "Resource" @@ -96,7 +96,7 @@ brooklyn.catalog: itemType: entity iconUrl: https://upload.wikimedia.org/wikipedia/commons/thumb/3/3a/OpenShift-LogoType.svg/225px-OpenShift-LogoType.svg.png item: - type: io.cloudsoft.amp.containerservice.openshift.entity.OpenShiftPod + type: org.apache.brooklyn.container.entity.openshift.OpenShiftPod brooklyn.parameters: - name: docker.container.imageName label: "Docker Container Image Name" @@ -137,7 +137,7 @@ brooklyn.catalog: itemType: entity iconUrl: https://upload.wikimedia.org/wikipedia/commons/thumb/3/3a/OpenShift-LogoType.svg/225px-OpenShift-LogoType.svg.png item: - type: io.cloudsoft.amp.containerservice.openshift.entity.OpenShiftResource + type: org.apache.brooklyn.container.entity.openshift.OpenShiftResource brooklyn.parameters: - name: resource label: "Resource" http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/docker-location/docker-container-location.md ---------------------------------------------------------------------- diff --git a/docker-location/docker-container-location.md b/docker-location/docker-container-location.md index 0c105fc..5cb5087 100644 --- a/docker-location/docker-container-location.md +++ b/docker-location/docker-container-location.md @@ -33,7 +33,7 @@ Once your Docker container location has been configured, AMP can launch instance location: my-docker-engine services: - - type: io.cloudsoft.amp.containerservice.dockercontainer.DockerContainer + - type: org.apache.brooklyn.container.entity.docker.DockerContainer id: wordpress-mysql name: MySQL brooklyn.config: @@ -44,7 +44,7 @@ Once your Docker container location has been configured, AMP can launch instance - "3306" docker.container.environment: MYSQL_ROOT_PASSWORD: $brooklyn:config("mysql.root_password") - - type: io.cloudsoft.amp.containerservice.dockercontainer.DockerContainer + - type: org.apache.brooklyn.container.entity.docker.DockerContainer id: wordpress name: Wordpress brooklyn.config: http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/kubernetes-location/README.md ---------------------------------------------------------------------- diff --git a/kubernetes-location/README.md b/kubernetes-location/README.md index dbef15f..6feadc4 100644 --- a/kubernetes-location/README.md +++ b/kubernetes-location/README.md @@ -87,9 +87,9 @@ Alternatively AMP can launch instances based on a `DockerContainer`, this means << see above >> services: - - type: io.cloudsoft.amp.containerservice.kubernetes.entity.KubernetesPod + - type: org.apache.brooklyn.container.entity.kubernetes.KubernetesPod brooklyn.children: - - type: io.cloudsoft.amp.containerservice.dockercontainer.DockerContainer + - type: org.apache.brooklyn.container.entity.docker.DockerContainer id: wordpress-mysql name: "MySQL" brooklyn.config: @@ -99,7 +99,7 @@ Alternatively AMP can launch instances based on a `DockerContainer`, this means MYSQL_ROOT_PASSWORD: "password" provisioning.properties: deployment: wordpress-mysql - - type: io.cloudsoft.amp.containerservice.dockercontainer.DockerContainer + - type: org.apache.brooklyn.container.entity.docker.DockerContainer id: wordpress name: "Wordpress" brooklyn.config: http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/openshift-location/README.md ---------------------------------------------------------------------- diff --git a/openshift-location/README.md b/openshift-location/README.md index ce2031b..7cefbd6 100644 --- a/openshift-location/README.md +++ b/openshift-location/README.md @@ -134,9 +134,9 @@ Alternatively AMP can launch instances based on a `DockerContainer`, this means << see above >> services: - - type: io.cloudsoft.amp.containerservice.kubernetes.entity.KubernetesPod + - type: org.apache.brooklyn.container.entity.kubernetes.KubernetesPod brooklyn.children: - - type: io.cloudsoft.amp.containerservice.dockercontainer.DockerContainer + - type: org.apache.brooklyn.container.entity.docker.DockerContainer id: wordpress-mysql name: "MySQL" brooklyn.config: @@ -146,7 +146,7 @@ Alternatively AMP can launch instances based on a `DockerContainer`, this means MYSQL_ROOT_PASSWORD: "password" provisioning.properties: deployment: wordpress-mysql - - type: io.cloudsoft.amp.containerservice.dockercontainer.DockerContainer + - type: org.apache.brooklyn.container.entity.docker.DockerContainer id: wordpress name: "Wordpress" brooklyn.config: http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9ff1399/tests/generic-application.tests.bom ---------------------------------------------------------------------- diff --git a/tests/generic-application.tests.bom b/tests/generic-application.tests.bom index 746b5bf..c871f06 100644 --- a/tests/generic-application.tests.bom +++ b/tests/generic-application.tests.bom @@ -426,7 +426,7 @@ brooklyn.catalog: type: test-case name: "Deploy Container Type Tests" brooklyn.children: - - type: io.cloudsoft.amp.containerservice.dockercontainer.DockerContainer + - type: org.apache.brooklyn.container.entity.docker.DockerContainer location: testing-cluster id: httpd name: "httpd"
