You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by dr...@apache.org on 2017/09/15 11:42:18 UTC
[6/9] brooklyn-server git commit: ConfigKeys: rename “latch.*” and “skip.*”
ConfigKeys: rename “latch.*” and “skip.*”
More consistent naming will help, especially in UIs where config is
listed in alphabetical order - the “latch.*” config will all be
together.
(Deprecates old values).
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/9ae4944b
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/9ae4944b
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/9ae4944b
Branch: refs/heads/master
Commit: 9ae4944bff8e1b012ecce32649caa72198aa997a
Parents: 8fa7b78
Author: Aled Sage <al...@gmail.com>
Authored: Tue Sep 12 16:08:58 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Sep 12 18:31:58 2017 +0100
----------------------------------------------------------------------
.../core/entity/BrooklynConfigKeys.java | 43 +++++++++++++-------
1 file changed, 29 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/9ae4944b/core/src/main/java/org/apache/brooklyn/core/entity/BrooklynConfigKeys.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/BrooklynConfigKeys.java b/core/src/main/java/org/apache/brooklyn/core/entity/BrooklynConfigKeys.java
index 86ebbbf..0928f14 100644
--- a/core/src/main/java/org/apache/brooklyn/core/entity/BrooklynConfigKeys.java
+++ b/core/src/main/java/org/apache/brooklyn/core/entity/BrooklynConfigKeys.java
@@ -18,6 +18,7 @@
*/
package org.apache.brooklyn.core.entity;
+import static org.apache.brooklyn.core.config.ConfigKeys.newBooleanConfigKey;
import static org.apache.brooklyn.core.config.ConfigKeys.newConfigKey;
import static org.apache.brooklyn.core.config.ConfigKeys.newConfigKeyWithPrefix;
import static org.apache.brooklyn.core.config.ConfigKeys.newStringConfigKey;
@@ -81,7 +82,8 @@ public class BrooklynConfigKeys {
* @see #SKIP_ENTITY_START_IF_RUNNING
*/
public static final ConfigKey<Boolean> SKIP_ENTITY_START = ConfigKeys.builder(Boolean.class)
- .name("entity.started")
+ .name("skip.start")
+ .deprecatedNames("entity.started")
.description("Whether to skip the startup process entirely (useful for auto-running software, such as in containers)")
.build();
@@ -95,7 +97,8 @@ public class BrooklynConfigKeys {
* @see #SKIP_ENTITY_START
*/
public static final ConfigKey<Boolean> SKIP_ENTITY_START_IF_RUNNING = ConfigKeys.builder(Boolean.class)
- .name("entity.running")
+ .name("skip.start.ifRunning")
+ .deprecatedNames("entity.running")
.description("Whether to skip the startup process entirely, but only if it already running")
.build();
@@ -105,7 +108,8 @@ public class BrooklynConfigKeys {
* This will skip the installation phase of the lifecycle, and move directly to customization and launching of the entity.
*/
public static final ConfigKey<Boolean> SKIP_ENTITY_INSTALLATION = ConfigKeys.builder(Boolean.class)
- .name("install.skip")
+ .name("skip.install")
+ .deprecatedNames("install.skip")
.description("Whether to skip the install commands entirely (useful for pre-installed images)")
.build();
@@ -195,51 +199,62 @@ public class BrooklynConfigKeys {
*/
public static final ConfigKey<Boolean> PROVISION_LATCH = ConfigKeys.builder(Boolean.class)
- .name("provision.latch")
+ .name("latch.provision")
+ .deprecatedNames("provision.latch")
.description("Latch for blocking machine provisioning; if non-null will wait for this to resolve (normal use is with '$brooklyn:attributeWhenReady')")
.build();
public static final ConfigKey<Boolean> START_LATCH = ConfigKeys.builder(Boolean.class)
- .name("start.latch")
+ .name("latch.start")
+ .deprecatedNames("start.latch")
.description("Latch for blocking start (done post-provisioning for software processes); if non-null will wait for this to resolve (normal use is with '$brooklyn:attributeWhenReady')")
.build();
@Beta // on stop DSLs time out after a minute and unblock; may be easier to fix after https://github.com/apache/brooklyn-server/pull/390
public static final ConfigKey<Boolean> STOP_LATCH = ConfigKeys.builder(Boolean.class)
- .name("stop.latch")
+ .name("latch.stop")
+ .deprecatedNames("stop.latch")
.description("Latch for blocking stop; if non-null will wait for at most 1 minute for this to resolve (normal use is with '$brooklyn:attributeWhenReady')")
.build();
public static final ConfigKey<Boolean> SETUP_LATCH = ConfigKeys.builder(Boolean.class)
- .name("setup.latch")
+ .name("latch.setup")
+ .deprecatedNames("setup.latch")
.description("Latch for blocking setup; if non-null will wait for this to resolve (normal use is with '$brooklyn:attributeWhenReady')")
.build();
public static final ConfigKey<Boolean> PRE_INSTALL_RESOURCES_LATCH = ConfigKeys.builder(Boolean.class)
- .name("resources.preInstall.latch")
+ .name("latch.preInstall.resources")
+ .deprecatedNames("resources.preInstall.latch")
.description("Latch for blocking files being copied before the pre-install; if non-null will wait for this to resolve (normal use is with '$brooklyn:attributeWhenReady')")
.build();
public static final ConfigKey<Boolean> INSTALL_RESOURCES_LATCH = ConfigKeys.builder(Boolean.class)
- .name("resources.install.latch")
+ .name("latch.install.reources")
+ .deprecatedNames("resources.install.latch")
.description("Latch for blocking files being copied before the install; if non-null will wait for this to resolve (normal use is with '$brooklyn:attributeWhenReady')")
.build();
public static final ConfigKey<Boolean> INSTALL_LATCH = ConfigKeys.builder(Boolean.class)
- .name("install.latch")
+ .name("latch.install")
+ .deprecatedNames("install.latch")
.description("Latch for blocking install; if non-null will wait for this to resolve (normal use is with '$brooklyn:attributeWhenReady')")
.build();
public static final ConfigKey<Boolean> CUSTOMIZE_RESOURCES_LATCH = ConfigKeys.builder(Boolean.class)
- .name("resources.customize.latch")
+ .name("latch.customize.resources")
+ .deprecatedNames("resources.customize.latch")
.description("Latch for blocking files being copied before customize; if non-null will wait for this to resolve (normal use is with '$brooklyn:attributeWhenReady')")
.build();
public static final ConfigKey<Boolean> CUSTOMIZE_LATCH = ConfigKeys.builder(Boolean.class)
- .name("customize.latch")
+ .name("latch.customize")
+ .deprecatedNames("customize.latch")
.description("Latch for blocking customize; if non-null will wait for this to resolve (normal use is with '$brooklyn:attributeWhenReady')")
.build();
public static final ConfigKey<Boolean> RUNTIME_RESOURCES_LATCH = ConfigKeys.builder(Boolean.class)
- .name("resources.runtime.latch")
+ .name("latch.launch.resources")
+ .deprecatedNames("resources.runtime.latch")
.description("Latch for blocking files being copied before the launch; if non-null will wait for this to resolve (normal use is with '$brooklyn:attributeWhenReady')")
.build();
public static final ConfigKey<Boolean> LAUNCH_LATCH = ConfigKeys.builder(Boolean.class)
- .name("launch.latch")
+ .name("latch.launch")
+ .deprecatedNames("launch.latch")
.description("Latch for blocking luanch; if non-null will wait for this to resolve (normal use is with '$brooklyn:attributeWhenReady')")
.build();