You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/01 18:49:15 UTC
[11/50] brooklyn-server git commit: minor javadoc addition and
usability tweak
minor javadoc addition and usability tweak
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/12b1678c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/12b1678c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/12b1678c
Branch: refs/heads/0.6.0
Commit: 12b1678c1b20ed7b5c40f44be272de818bda0096
Parents: 4c24127
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Nov 5 13:01:23 2013 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Nov 5 13:44:11 2013 +0000
----------------------------------------------------------------------
api/src/main/java/brooklyn/location/LocationRegistry.java | 2 ++
.../src/main/java/brooklyn/event/feed/function/FunctionFeed.java | 4 ++++
.../java/brooklyn/location/jclouds/JcloudsLocationConfig.java | 2 +-
3 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/12b1678c/api/src/main/java/brooklyn/location/LocationRegistry.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/brooklyn/location/LocationRegistry.java b/api/src/main/java/brooklyn/location/LocationRegistry.java
index 43cb944..5b1d616 100644
--- a/api/src/main/java/brooklyn/location/LocationRegistry.java
+++ b/api/src/main/java/brooklyn/location/LocationRegistry.java
@@ -12,6 +12,8 @@ import java.util.NoSuchElementException;
@SuppressWarnings("rawtypes")
public interface LocationRegistry {
+ /** map of ID (possibly randomly generated) to the definition (spec, name, id, and props;
+ * where spec is the spec as defined, for instance possibly another named:xxx location) */
public Map<String,LocationDefinition> getDefinedLocations();
/**
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/12b1678c/core/src/main/java/brooklyn/event/feed/function/FunctionFeed.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/event/feed/function/FunctionFeed.java b/core/src/main/java/brooklyn/event/feed/function/FunctionFeed.java
index 05cb785..d4c3f7f 100644
--- a/core/src/main/java/brooklyn/event/feed/function/FunctionFeed.java
+++ b/core/src/main/java/brooklyn/event/feed/function/FunctionFeed.java
@@ -15,6 +15,7 @@ import brooklyn.event.feed.AbstractFeed;
import brooklyn.event.feed.AttributePollHandler;
import brooklyn.event.feed.DelegatingPollHandler;
import brooklyn.event.feed.Poller;
+import brooklyn.util.time.Duration;
import com.google.common.base.Objects;
import com.google.common.collect.HashMultimap;
@@ -76,6 +77,9 @@ public class FunctionFeed extends AbstractFeed {
this.entity = val;
return this;
}
+ public Builder period(Duration d) {
+ return period(d.toMilliseconds(), TimeUnit.MILLISECONDS);
+ }
public Builder period(long millis) {
return period(millis, TimeUnit.MILLISECONDS);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/12b1678c/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocationConfig.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocationConfig.java b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocationConfig.java
index 4ea8144..c634482 100644
--- a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocationConfig.java
+++ b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocationConfig.java
@@ -138,7 +138,7 @@ public interface JcloudsLocationConfig extends CloudLocationConfig {
public static final ConfigKey<String> CUSTOM_MACHINE_SETUP_SCRIPT_VARS = ConfigKeys.newStringConfigKey("setup.script.vars", "vars to customize a setup.script i.e.: key1:value1,key2:value2");
- public static final ConfigKey<Boolean> GENERATE_HOSTNAME = new BasicConfigKey<Boolean>(Boolean.class, "generate.hostname", "Use the nodename generated by jclouds ", false);
+ public static final ConfigKey<Boolean> GENERATE_HOSTNAME = new BasicConfigKey<Boolean>(Boolean.class, "generate.hostname", "Use the nodename generated by jclouds", false);
public static final ConfigKey<Integer> MACHINE_CREATE_ATTEMPTS = ConfigKeys.newIntegerConfigKey(
"machineCreateAttempts", "Number of times to retry if jclouds fails to create a VM", 1);