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 2014/07/14 18:13:12 UTC
[1/2] git commit: changing the tags on an entity should trigger
persistence
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master d6ef743c0 -> bcdf42c2e
changing the tags on an entity should trigger persistence
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/63239bf1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/63239bf1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/63239bf1
Branch: refs/heads/master
Commit: 63239bf1a97e9ebe5417c007ea7cca077db5cdba
Parents: 342a336
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Jul 11 02:01:38 2014 -0400
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Jul 11 02:01:38 2014 -0400
----------------------------------------------------------------------
.../main/java/brooklyn/entity/basic/AbstractEntity.java | 10 ++++++++--
.../management/internal/EntityChangeListener.java | 3 +++
.../management/internal/EntityManagementSupport.java | 4 ++++
3 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/63239bf1/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java b/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java
index cf74ef3..0f291bf 100644
--- a/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java
+++ b/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java
@@ -1292,16 +1292,22 @@ public abstract class AbstractEntity implements EntityLocal, EntityInternal {
@Override
public boolean addTag(Object tag) {
+ boolean result;
synchronized (tags) {
- return tags.add(tag);
+ result = tags.add(tag);
}
+ getManagementSupport().getEntityChangeListener().onTagsChanged();
+ return result;
}
@Override
public boolean removeTag(Object tag) {
+ boolean result;
synchronized (tags) {
- return tags.remove(tag);
+ result = tags.remove(tag);
}
+ getManagementSupport().getEntityChangeListener().onTagsChanged();
+ return result;
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/63239bf1/core/src/main/java/brooklyn/management/internal/EntityChangeListener.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/internal/EntityChangeListener.java b/core/src/main/java/brooklyn/management/internal/EntityChangeListener.java
index d993ee6..8e1dbe6 100644
--- a/core/src/main/java/brooklyn/management/internal/EntityChangeListener.java
+++ b/core/src/main/java/brooklyn/management/internal/EntityChangeListener.java
@@ -33,6 +33,7 @@ public interface EntityChangeListener {
@Override public void onConfigChanged(ConfigKey<?> key) {}
@Override public void onLocationsChanged() {}
@Override public void onMembersChanged() {}
+ @Override public void onTagsChanged() {}
@Override public void onChildrenChanged() {}
@Override public void onPolicyAdded(Policy policy) {}
@Override public void onPolicyRemoved(Policy policy) {}
@@ -49,6 +50,8 @@ public interface EntityChangeListener {
void onConfigChanged(ConfigKey<?> key);
void onLocationsChanged();
+
+ void onTagsChanged();
void onMembersChanged();
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/63239bf1/core/src/main/java/brooklyn/management/internal/EntityManagementSupport.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/internal/EntityManagementSupport.java b/core/src/main/java/brooklyn/management/internal/EntityManagementSupport.java
index a371510..e7a4bbe 100644
--- a/core/src/main/java/brooklyn/management/internal/EntityManagementSupport.java
+++ b/core/src/main/java/brooklyn/management/internal/EntityManagementSupport.java
@@ -361,6 +361,10 @@ public class EntityManagementSupport {
getManagementContext().getRebindManager().getChangeListener().onChanged(entity);
}
@Override
+ public void onTagsChanged() {
+ getManagementContext().getRebindManager().getChangeListener().onChanged(entity);
+ }
+ @Override
public void onMembersChanged() {
getManagementContext().getRebindManager().getChangeListener().onChanged(entity);
}
[2/2] git commit: This closes #63
Posted by al...@apache.org.
This closes #63
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/bcdf42c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/bcdf42c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/bcdf42c2
Branch: refs/heads/master
Commit: bcdf42c2e01bd4c1eba213bb9cb3f2f5156ed9d4
Parents: d6ef743 63239bf
Author: Aled Sage <al...@gmail.com>
Authored: Mon Jul 14 17:12:55 2014 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Mon Jul 14 17:12:55 2014 +0100
----------------------------------------------------------------------
.../main/java/brooklyn/entity/basic/AbstractEntity.java | 10 ++++++++--
.../management/internal/EntityChangeListener.java | 3 +++
.../management/internal/EntityManagementSupport.java | 4 ++++
3 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------