You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by gr...@apache.org on 2014/11/18 08:44:33 UTC
[2/4] incubator-brooklyn git commit: Configure attribute for storing
PropertiesReloadListener for later removal
Configure attribute for storing PropertiesReloadListener for later removal
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c68ae757
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c68ae757
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c68ae757
Branch: refs/heads/master
Commit: c68ae75790cc729d194946254f725b69593ace28
Parents: 5d2faf6
Author: Andrew Kennedy <gr...@apache.org>
Authored: Sat Nov 15 23:17:51 2014 +0000
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Mon Nov 17 17:44:09 2014 +0100
----------------------------------------------------------------------
.../brooklyn/management/ManagementContext.java | 17 +++++++++++++----
.../java/brooklyn/config/BrooklynServerConfig.java | 5 -----
.../java/brooklyn/entity/basic/Attributes.java | 9 +++++++++
3 files changed, 22 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c68ae757/api/src/main/java/brooklyn/management/ManagementContext.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/brooklyn/management/ManagementContext.java b/api/src/main/java/brooklyn/management/ManagementContext.java
index 26024b0..221e3c9 100644
--- a/api/src/main/java/brooklyn/management/ManagementContext.java
+++ b/api/src/main/java/brooklyn/management/ManagementContext.java
@@ -18,6 +18,7 @@
*/
package brooklyn.management;
+import java.io.Serializable;
import java.net.URI;
import java.util.Collection;
@@ -191,13 +192,21 @@ public interface ManagementContext {
AccessController getAccessController();
/**
- * Reloads locations from brooklyn.properties. Any changes will apply only to newly created applications
- * @return
+ * Reloads locations from {@code brooklyn.properties}. Any changes will apply only to newly created applications
*/
void reloadBrooklynProperties();
-
- interface PropertiesReloadListener {
+
+ /**
+ * Listener for {@code brooklyn.properties} reload events.
+ *
+ * @see {@link #raddPropertiesReloadListenerPropertiesReloadListener)}
+ * @see {@link #removePropertiesReloadListener(PropertiesReloadListener)}
+ */
+ interface PropertiesReloadListener extends Serializable {
+
+ /** Called when {@code brooklyn.properties} is reloaded. */
void reloaded();
+
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c68ae757/core/src/main/java/brooklyn/config/BrooklynServerConfig.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/config/BrooklynServerConfig.java b/core/src/main/java/brooklyn/config/BrooklynServerConfig.java
index 621dc10..02f8dc0 100644
--- a/core/src/main/java/brooklyn/config/BrooklynServerConfig.java
+++ b/core/src/main/java/brooklyn/config/BrooklynServerConfig.java
@@ -30,7 +30,6 @@ import org.slf4j.LoggerFactory;
import brooklyn.catalog.CatalogLoadMode;
import brooklyn.entity.basic.ConfigKeys;
-import brooklyn.event.AttributeSensor;
import brooklyn.event.basic.Sensors;
import brooklyn.management.ManagementContext;
import brooklyn.util.guava.Maybe;
@@ -126,10 +125,6 @@ public class BrooklynServerConfig {
public static final ConfigKey<CampPlatform> CAMP_PLATFORM = ConfigKeys.newConfigKey(CampPlatform.class, "brooklyn.camp.platform",
"Config set at brooklyn management platform to find the CampPlatform instance (bi-directional)");
- public static final AttributeSensor<ManagementContext.PropertiesReloadListener> PROPERTIES_RELOAD_LISTENER = Sensors.newSensor(
- ManagementContext.PropertiesReloadListener.class, "brooklyn.management.propertiesReloadListenet", "Properties reload listener");
-
-
/** @see BrooklynServerPaths#getMgmtBaseDir(ManagementContext) */
public static String getMgmtBaseDir(ManagementContext mgmt) {
return BrooklynServerPaths.getMgmtBaseDir(mgmt);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c68ae757/core/src/main/java/brooklyn/entity/basic/Attributes.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/Attributes.java b/core/src/main/java/brooklyn/entity/basic/Attributes.java
index f8781e3..33df9ba 100644
--- a/core/src/main/java/brooklyn/entity/basic/Attributes.java
+++ b/core/src/main/java/brooklyn/entity/basic/Attributes.java
@@ -30,6 +30,7 @@ import brooklyn.event.basic.BasicAttributeSensorAndConfigKey;
import brooklyn.event.basic.BasicNotificationSensor;
import brooklyn.event.basic.PortAttributeSensorAndConfigKey;
import brooklyn.event.basic.Sensors;
+import brooklyn.management.ManagementContext;
import brooklyn.util.net.UserAndHostAndPort;
import com.google.common.collect.ImmutableList;
@@ -136,4 +137,12 @@ public interface Attributes {
}
}
+ /*
+ * Brooklyn management attributes (optional)
+ */
+
+ AttributeSensor<ManagementContext.PropertiesReloadListener> PROPERTIES_RELOAD_LISTENER = Sensors.newSensor(
+ ManagementContext.PropertiesReloadListener.class,
+ "brooklyn.management.propertiesReloadListener", "Properties reload listener");
+
}