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:19 UTC
[7/9] brooklyn-server git commit: PR #819 config descriptions:
incorporate comments
PR #819 config descriptions: incorporate comments
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d4650916
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d4650916
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d4650916
Branch: refs/heads/master
Commit: d46509163a0389715f0b93eb8a07f8458adebf9b
Parents: 9ae4944
Author: Aled Sage <al...@gmail.com>
Authored: Wed Sep 13 13:33:07 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Sep 13 13:33:07 2017 +0100
----------------------------------------------------------------------
.../org/apache/brooklyn/core/entity/Attributes.java | 4 ++--
.../brooklyn/core/entity/BrooklynConfigKeys.java | 3 +--
.../apache/brooklyn/entity/group/DynamicFabric.java | 15 ++++++++++-----
3 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d4650916/core/src/main/java/org/apache/brooklyn/core/entity/Attributes.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/Attributes.java b/core/src/main/java/org/apache/brooklyn/core/entity/Attributes.java
index db2f07b..fd39a5b 100644
--- a/core/src/main/java/org/apache/brooklyn/core/entity/Attributes.java
+++ b/core/src/main/java/org/apache/brooklyn/core/entity/Attributes.java
@@ -54,13 +54,13 @@ public interface Attributes {
BasicAttributeSensorAndConfigKey<String> DOWNLOAD_URL = new BasicAttributeSensorAndConfigKey<String>(
String.class,
"download.url",
- "URL pattern for downloading the installer (will substitute things like ${version} automatically)");
+ "URL for downloading the installer; uses FreeMarker templating format to substitute things like ${version} automatically");
@SuppressWarnings({ "unchecked", "rawtypes" })
BasicAttributeSensorAndConfigKey<Map<String,String>> DOWNLOAD_ADDON_URLS = new BasicAttributeSensorAndConfigKey(
Map.class,
"download.addon.urls",
- "URL patterns for downloading named add-ons (will substitute things like ${version} automatically)");
+ "URL for downloading named add-ons; uses FreeMarker templating format to substitute things like ${version} automatically");
/*
* Port number attributes.
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d4650916/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 0928f14..9d92d19 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,7 +18,6 @@
*/
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;
@@ -260,7 +259,7 @@ public class BrooklynConfigKeys {
public static final ConfigKey<Duration> START_TIMEOUT = newConfigKey(
"start.timeout",
- "Time to wait, after launching, for SERVICE_UP before failing (default to '2m')",
+ "Time to wait, after launching, for SERVICE_UP before failing",
Duration.seconds(120));
/* selected properties from SshTool for external public access (e.g. putting on entities) */
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d4650916/core/src/main/java/org/apache/brooklyn/entity/group/DynamicFabric.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/entity/group/DynamicFabric.java b/core/src/main/java/org/apache/brooklyn/entity/group/DynamicFabric.java
index 0b8e0b2..ede190a 100644
--- a/core/src/main/java/org/apache/brooklyn/entity/group/DynamicFabric.java
+++ b/core/src/main/java/org/apache/brooklyn/entity/group/DynamicFabric.java
@@ -56,27 +56,32 @@ public interface DynamicFabric extends AbstractGroup, Startable, Fabric {
ConfigKey<EntitySpec<?>> MEMBER_SPEC = ConfigKeys.newConfigKey(
new TypeToken<EntitySpec<?>>() {},
"dynamiccfabric.memberspec",
- "entity spec for creating new members (one per location)",
+ "Entity spec for creating new members (one per location)",
null);
@SetFromFlag("firstMemberSpec")
ConfigKey<EntitySpec<?>> FIRST_MEMBER_SPEC = ConfigKeys.newConfigKey(
new TypeToken<EntitySpec<?>>() {},
"dynamiccfabric.firstmemberspec",
- "entity spec for the first member",
+ "Entity spec for the first member",
null);
@SetFromFlag("displayNamePrefix")
ConfigKey<String> DISPLAY_NAME_PREFIX = ConfigKeys.newStringConfigKey(
- "dynamicfabric.displayNamePrefix", "Display name prefix, for created children");
+ "dynamicfabric.displayNamePrefix",
+ "Display name prefix, for created children");
@SetFromFlag("displayNameSuffix")
ConfigKey<String> DISPLAY_NAME_SUFFIX = ConfigKeys.newStringConfigKey(
- "dynamicfabric.displayNameSuffix", "Display name suffix, for created children");
+ "dynamicfabric.displayNameSuffix",
+ "Display name suffix, for created children");
@SetFromFlag("customChildFlags")
MapConfigKey<Object> CUSTOM_CHILD_FLAGS = new MapConfigKey<Object>(
- Object.class, "dynamicfabric.customChildFlags", "Additional flags to be passed to children when they are being created", ImmutableMap.<String,Object>of());
+ Object.class,
+ "dynamicfabric.customChildFlags",
+ "Additional flags to be passed to children when they are being created",
+ ImmutableMap.<String,Object>of());
AttributeSensor<Integer> FABRIC_SIZE = Sensors.newIntegerSensor("fabric.size", "Fabric size");