You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ge...@apache.org on 2017/07/19 16:25:49 UTC
[19/39] brooklyn-server git commit: Merge branch 'master' into
osgi-auto-wrap-yaml
Merge branch 'master' into osgi-auto-wrap-yaml
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/915e3bf8
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/915e3bf8
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/915e3bf8
Branch: refs/heads/master
Commit: 915e3bf892755a099e3dd2f4b444fd801850da8d
Parents: 580c00d 69cce32
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Jun 30 15:05:24 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Jun 30 15:05:24 2017 +0100
----------------------------------------------------------------------
.../BrooklynComponentTemplateResolver.java | 12 +-
.../brooklyn/ValidationMissingTypeYamlTest.java | 222 ++++
.../mgmt/internal/BrooklynShutdownHooks.java | 24 +-
.../apache/brooklyn/util/core/osgi/Osgis.java | 18 +-
.../system/internal/ExecWithLoggingHelpers.java | 112 +-
.../ssh/SshMachineLocationIntegrationTest.java | 36 +
.../location/ssh/SshMachineLocationTest.java | 51 +-
.../core/internal/ssh/RecordingSshTool.java | 8 +-
karaf/features/src/main/feature/feature.xml | 9 +
.../brooklyn/launcher/osgi/OsgiLauncher.java | 2 +
locations/container/pom.xml | 154 +++
.../entity/docker/DockerContainer.java | 92 ++
.../entity/docker/DockerContainerImpl.java | 89 ++
.../entity/kubernetes/KubernetesPod.java | 102 ++
.../entity/kubernetes/KubernetesPodImpl.java | 25 +
.../entity/kubernetes/KubernetesResource.java | 58 +
.../kubernetes/KubernetesResourceImpl.java | 36 +
.../entity/openshift/OpenShiftPod.java | 27 +
.../entity/openshift/OpenShiftPodImpl.java | 25 +
.../entity/openshift/OpenShiftResource.java | 32 +
.../entity/openshift/OpenShiftResourceImpl.java | 24 +
.../location/docker/DockerJcloudsLocation.java | 198 ++++
.../location/docker/DockerLocationResolver.java | 89 ++
.../location/kubernetes/ImageChooser.java | 87 ++
.../location/kubernetes/KubernetesCerts.java | 82 ++
.../kubernetes/KubernetesClientRegistry.java | 29 +
.../KubernetesClientRegistryImpl.java | 96 ++
.../location/kubernetes/KubernetesLocation.java | 1054 ++++++++++++++++++
.../kubernetes/KubernetesLocationConfig.java | 182 +++
.../kubernetes/KubernetesLocationResolver.java | 65 ++
.../machine/KubernetesEmptyMachineLocation.java | 86 ++
.../machine/KubernetesMachineLocation.java | 45 +
.../machine/KubernetesSshMachineLocation.java | 46 +
.../openshift/OpenShiftClientRegistryImpl.java | 45 +
.../location/openshift/OpenShiftLocation.java | 263 +++++
.../openshift/OpenShiftLocationConfig.java | 32 +
.../openshift/OpenShiftLocationResolver.java | 65 ++
...pache.brooklyn.api.location.LocationResolver | 21 +
.../resources/OSGI-INF/blueprint/blueprint.xml | 37 +
.../docker/DockerJcloudsLocationLiveTest.java | 268 +++++
.../docker/DockerLocationResolverTest.java | 118 ++
.../location/kubernetes/ImageChooserTest.java | 85 ++
.../kubernetes/KubernetesCertsTest.java | 164 +++
.../kubernetes/KubernetesLocationLiveTest.java | 238 ++++
.../KubernetesLocationResolverTest.java | 102 ++
.../KubernetesLocationYamlLiveTest.java | 532 +++++++++
.../openshift/OpenShiftLocationLiveTest.java | 65 ++
.../OpenShiftLocationResolverTest.java | 103 ++
.../OpenShiftLocationYamlLiveTest.java | 146 +++
.../resources/nginx-replication-controller.yaml | 37 +
.../src/test/resources/nginx-service.yaml | 29 +
.../creator/DefaultAzureArmNetworkCreator.java | 31 +-
.../DefaultAzureArmNetworkCreatorTest.java | 160 ++-
parent/pom.xml | 20 +-
pom.xml | 2 +
.../apache/brooklyn/rest/api/CatalogApi.java | 19 +-
.../rest/resources/CatalogResource.java | 26 +-
.../rest/resources/CatalogResourceTest.java | 171 +++
.../org/apache/brooklyn/test/LogWatcher.java | 14 +-
utils/common/pom.xml | 5 +
.../util/stream/LoggingOutputStream.java | 157 +++
.../brooklyn/util/stream/StreamGobbler.java | 2 +
.../util/stream/LoggingOutputStreamTest.java | 104 ++
63 files changed, 6076 insertions(+), 202 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/915e3bf8/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/915e3bf8/core/src/main/java/org/apache/brooklyn/util/core/osgi/Osgis.java
----------------------------------------------------------------------