[1/2] brooklyn-server git commit: BasicSpecParameter: fix compatibility of persisted state

[aledsage]

Repository: brooklyn-server
Updated Branches:
  refs/heads/master 43a8816c8 -> ae57587eb


BasicSpecParameter: fix compatibility of persisted state

Support old-style persisted state, by implementing readResolve()


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/1d63e39d
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/1d63e39d
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/1d63e39d

Branch: refs/heads/master
Commit: 1d63e39d3569ae9de23747e3e19590f19c67f743
Parents: b8211ed
Author: Aled Sage 
Authored: Wed Mar 23 00:50:41 2016 +
Committer: Aled Sage 
Committed: Wed Mar 23 20:29:25 2016 +

--
 .../apache/brooklyn/core/objs/BasicSpecParameter.java  | 13 +
 1 file changed, 13 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1d63e39d/core/src/main/java/org/apache/brooklyn/core/objs/BasicSpecParameter.java
--
diff --git 
a/core/src/main/java/org/apache/brooklyn/core/objs/BasicSpecParameter.java 
b/core/src/main/java/org/apache/brooklyn/core/objs/BasicSpecParameter.java
index 2bc2346..ea041b2 100644
--- a/core/src/main/java/org/apache/brooklyn/core/objs/BasicSpecParameter.java
+++ b/core/src/main/java/org/apache/brooklyn/core/objs/BasicSpecParameter.java
@@ -69,6 +69,19 @@ public class BasicSpecParameter implements 
SpecParameter{
 private final ConfigKey configKey;
 private final AttributeSensor sensor;
 
+// For backwards compatibility of persisted state.
+// Automatically called by xstream (which is used under the covers by 
XmlMementoSerializer).
+// Required for those who have state from a version between
+// 29th October 2015 and 21st January 2016 (when this class was 
introduced, and then when it was changed).
+private ConfigKey type;
+private Object readResolve() {
+if (type != null && configKey == null) {
+return new BasicSpecParameter(label, pinned, type, sensor);
+} else {
+return this;
+}
+}
+
 @Beta // TBD whether "pinned" stays
 public BasicSpecParameter(String label, boolean pinned, ConfigKey 
config) {
 this(label, pinned, config, null);

[2/2] brooklyn-server git commit: This closes #76

[aledsage]

This closes #76


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/ae57587e
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/ae57587e
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/ae57587e

Branch: refs/heads/master
Commit: ae57587ebcf69c8e07c1e24250483aac0eb3b6d1
Parents: 43a8816 1d63e39
Author: Aled Sage 
Authored: Wed Mar 23 20:30:34 2016 +
Committer: Aled Sage 
Committed: Wed Mar 23 20:30:34 2016 +

--
 .../apache/brooklyn/core/objs/BasicSpecParameter.java  | 13 +
 1 file changed, 13 insertions(+)
--

[2/2] brooklyn-server git commit: Closes #74

[svet]

Closes #74

XML SpecResolver: use context instead of thread-local storage

As per @neykov 's comments in PR #59


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/43a8816c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/43a8816c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/43a8816c

Branch: refs/heads/master
Commit: 43a8816c8ebfc1060d790bf859e8280ebb962a75
Parents: b8211ed 3a2c4cb
Author: Svetoslav Neykov 
Authored: Wed Mar 23 11:49:08 2016 +0200
Committer: Svetoslav Neykov 
Committed: Wed Mar 23 11:49:08 2016 +0200

--
 .../internal/AbstractBrooklynObjectSpec.java|  2 ++
 .../core/mgmt/persist/XmlMementoSerializer.java | 18 +-
 .../mgmt/persist/XmlMementoSerializerTest.java  | 37 +++-
 3 files changed, 46 insertions(+), 11 deletions(-)
--

[1/2] brooklyn-server git commit: XML SpecResolver: use context instead of thread-local

[svet]

Repository: brooklyn-server
Updated Branches:
  refs/heads/master b8211ed17 -> 43a8816c8


XML SpecResolver: use context instead of thread-local


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/3a2c4cb5
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/3a2c4cb5
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/3a2c4cb5

Branch: refs/heads/master
Commit: 3a2c4cb580ecf368740fe8c52b9aa37339f9cd0e
Parents: b8211ed
Author: Aled Sage 
Authored: Tue Mar 22 18:36:54 2016 +
Committer: Aled Sage 
Committed: Tue Mar 22 18:57:37 2016 +

--
 .../internal/AbstractBrooklynObjectSpec.java|  2 ++
 .../core/mgmt/persist/XmlMementoSerializer.java | 18 +-
 .../mgmt/persist/XmlMementoSerializerTest.java  | 37 +++-
 3 files changed, 46 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3a2c4cb5/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java
--
diff --git 
a/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java
 
b/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java
index 3f95342..ef99a27 100644
--- 
a/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java
+++ 
b/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java
@@ -235,6 +235,8 @@ public abstract class AbstractBrooklynObjectSpec