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 <[email protected]> Authored: Mon Oct 5 17:28:38 2015 +0300 Committer: Valentin Aitken <[email protected]> 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",
