You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2015/10/07 14:51:36 UTC
[1/3] incubator-brooklyn git commit: Add VanillaWindowsProcess to
catalog items
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master e94897849 -> 6467a91d7
Add VanillaWindowsProcess to catalog items
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/55fc8a90
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/55fc8a90
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/55fc8a90
Branch: refs/heads/master
Commit: 55fc8a90b7a427cffa9e91d2048e8b9530b7ad52
Parents: 8636eb3
Author: Valentin Aitken <va...@cloudsoftcorp.com>
Authored: Tue Sep 29 18:40:42 2015 +0300
Committer: Valentin Aitken <va...@cloudsoftcorp.com>
Committed: Mon Oct 5 15:49:02 2015 +0300
----------------------------------------------------------------------
.../brooklyn/entity/software/base/VanillaWindowsProcess.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/55fc8a90/software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaWindowsProcess.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaWindowsProcess.java b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaWindowsProcess.java
index f243e38..c0ee181 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaWindowsProcess.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaWindowsProcess.java
@@ -20,6 +20,7 @@ package org.apache.brooklyn.entity.software.base;
import java.util.Collection;
+import org.apache.brooklyn.api.catalog.Catalog;
import org.apache.brooklyn.api.entity.ImplementedBy;
import org.apache.brooklyn.api.sensor.AttributeSensor;
import org.apache.brooklyn.config.ConfigKey;
@@ -29,6 +30,7 @@ import org.apache.brooklyn.util.time.Duration;
import com.google.common.collect.ImmutableSet;
+@Catalog(name="Vanilla Windows Process", description="A basic Windows entity configured with scripts, e.g. for launch, check-running and stop")
@ImplementedBy(VanillaWindowsProcessImpl.class)
public interface VanillaWindowsProcess extends AbstractVanillaProcess {
// 3389 is RDP; 5985 is WinRM (3389 isn't used by Brooklyn, but useful for the end-user subsequently)
[2/3] incubator-brooklyn git commit: Annotate the most important
attributes in VanillaWindowsProcess as CatalogConfig
Posted by al...@apache.org.
Annotate the most important attributes in VanillaWindowsProcess as CatalogConfig
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/0192a71b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/0192a71b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/0192a71b
Branch: refs/heads/master
Commit: 0192a71bbef0b2dbe34345e1109c19af0c3f0360
Parents: 55fc8a9
Author: Valentin Aitken <va...@cloudsoftcorp.com>
Authored: Mon Oct 5 17:28:38 2015 +0300
Committer: Valentin Aitken <va...@cloudsoftcorp.com>
Committed: Mon Oct 5 17:28:38 2015 +0300
----------------------------------------------------------------------
.../software/base/VanillaWindowsProcess.java | 21 ++++++++++++++++++++
1 file changed, 21 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0192a71b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaWindowsProcess.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaWindowsProcess.java b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaWindowsProcess.java
index c0ee181..71fccfc 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaWindowsProcess.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaWindowsProcess.java
@@ -21,6 +21,7 @@ package org.apache.brooklyn.entity.software.base;
import java.util.Collection;
import org.apache.brooklyn.api.catalog.Catalog;
+import org.apache.brooklyn.api.catalog.CatalogConfig;
import org.apache.brooklyn.api.entity.ImplementedBy;
import org.apache.brooklyn.api.sensor.AttributeSensor;
import org.apache.brooklyn.config.ConfigKey;
@@ -51,14 +52,34 @@ public interface VanillaWindowsProcess extends AbstractVanillaProcess {
"indicates that a reboot should be performed after the install command is run", false);
ConfigKey<Boolean> CUSTOMIZE_REBOOT_REQUIRED = ConfigKeys.newBooleanConfigKey("customize.reboot.required",
"indicates that a reboot should be performed after the customize command is run", false);
+
+ @CatalogConfig(label = "Launch Command")
+ ConfigKey<String> LAUNCH_COMMAND = VanillaSoftwareProcess.LAUNCH_COMMAND;
+
+ @CatalogConfig(label = "Launch PowerShell command")
ConfigKey<String> LAUNCH_POWERSHELL_COMMAND = ConfigKeys.newStringConfigKey("launch.powershell.command",
"command to run to launch the process");
+
+ @CatalogConfig(label = "Check Running Command")
+ ConfigKey<String> CHECK_RUNNING_COMMAND = VanillaSoftwareProcess.CHECK_RUNNING_COMMAND;
+
+ @CatalogConfig(label = "Check Running PowerShell Command")
ConfigKey<String> CHECK_RUNNING_POWERSHELL_COMMAND = ConfigKeys.newStringConfigKey("checkRunning.powershell.command",
"command to determine whether the process is running");
+
+ @CatalogConfig(label = "Stop PowerShell Command")
+ ConfigKey<String> STOP_COMMAND = VanillaSoftwareProcess.STOP_COMMAND;
+
+ @CatalogConfig(label = "Stop Command")
ConfigKey<String> STOP_POWERSHELL_COMMAND = ConfigKeys.newStringConfigKey("stop.powershell.command",
"command to run to stop the process");
ConfigKey<String> CUSTOMIZE_POWERSHELL_COMMAND = ConfigKeys.newStringConfigKey("customize.powershell.command",
"powershell command to run during the customization phase");
+
+ @CatalogConfig(label = "Install Command")
+ ConfigKey<String> INSTALL_COMMAND = VanillaSoftwareProcess.INSTALL_COMMAND;
+
+ @CatalogConfig(label = "Install PowerShell command")
ConfigKey<String> INSTALL_POWERSHELL_COMMAND = ConfigKeys.newStringConfigKey("install.powershell.command",
"powershell command to run during the install phase");
ConfigKey<Duration> REBOOT_BEGUN_TIMEOUT = ConfigKeys.newDurationConfigKey("reboot.begun.timeout",
[3/3] incubator-brooklyn git commit: This closes #927
Posted by al...@apache.org.
This closes #927
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/6467a91d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/6467a91d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/6467a91d
Branch: refs/heads/master
Commit: 6467a91d7c5c09667d68410aac7edcd774cc1a35
Parents: e948978 0192a71
Author: Aled Sage <al...@gmail.com>
Authored: Wed Oct 7 13:51:22 2015 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Oct 7 13:51:22 2015 +0100
----------------------------------------------------------------------
.../software/base/VanillaWindowsProcess.java | 23 ++++++++++++++++++++
1 file changed, 23 insertions(+)
----------------------------------------------------------------------