You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2016/10/11 18:32:53 UTC
[1/2] brooklyn-server git commit: Add more sensors for main.uri,
based on the context, i.e public or not
Repository: brooklyn-server
Updated Branches:
refs/heads/master 9846f6e26 -> e222bdb2f
Add more sensors for main.uri, based on the context, i.e public or not
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/042afe5f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/042afe5f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/042afe5f
Branch: refs/heads/master
Commit: 042afe5f7c1619fbaa048f23ac0efd60b5864a8b
Parents: b9dfdaa
Author: Thomas Bouron <th...@cloudsoftcorp.com>
Authored: Tue Oct 11 16:49:39 2016 +0100
Committer: Thomas Bouron <th...@cloudsoftcorp.com>
Committed: Tue Oct 11 17:36:48 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/brooklyn/core/entity/Attributes.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/042afe5f/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 a59c484..ba60a42 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
@@ -147,13 +147,19 @@ public interface Attributes {
AttributeSensor<String> LOG_FILE_LOCATION = Sensors.newStringSensor("log.location", "Log file location");
AttributeSensor<URI> MAIN_URI = MainUri.MAIN_URI;
+ AttributeSensor<URI> MAIN_URI_MAPPED_SUBNET = MainUri.MAIN_URI_MAPPED_SUBNET;
+ AttributeSensor<URI> MAIN_URI_MAPPED_PUBLIC = MainUri.MAIN_URI_MAPPED_PUBLIC;
// this class is added because the MAIN_URI relies on a static initialization which unfortunately can't be added to an interface.
class MainUri {
private final static AttributeSensor<URI> MAIN_URI = Sensors.newSensor(URI.class, "main.uri", "Main URI for contacting the service/endpoint offered by this entity");
+ private final static AttributeSensor<URI> MAIN_URI_MAPPED_SUBNET = Sensors.newSensor(URI.class, "main.uri.mapped.subnet", "Main URI for contacting the service/endpoint offered by this entity from the same subnet");
+ private final static AttributeSensor<URI> MAIN_URI_MAPPED_PUBLIC = Sensors.newSensor(URI.class, "main.uri.mapped.public", "Main URI for contacting the service/endpoint offered by this entity from the outside world");
static {
RendererHints.register(MAIN_URI, RendererHints.namedActionWithUrl());
+ RendererHints.register(MAIN_URI_MAPPED_SUBNET, RendererHints.namedActionWithUrl());
+ RendererHints.register(MAIN_URI_MAPPED_PUBLIC, RendererHints.namedActionWithUrl());
}
}
[2/2] brooklyn-server git commit: This closes #378
Posted by al...@apache.org.
This closes #378
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/e222bdb2
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/e222bdb2
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/e222bdb2
Branch: refs/heads/master
Commit: e222bdb2fc16bd0ff9e5a5649087ab8f00f7e701
Parents: 9846f6e 042afe5
Author: Aled Sage <al...@gmail.com>
Authored: Tue Oct 11 19:32:21 2016 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Oct 11 19:32:21 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/brooklyn/core/entity/Attributes.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------