You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2017/03/16 09:26:06 UTC
[4/4] brooklyn-server git commit: Closes #598
Closes #598
BROOKLYN-453: Fix rebind for classrename with bundle prefix
The historic persisted state added here for testing comes from a clocker.io blueprint.
The "Fix classRenames for SshPollConfig anonymous classes" is me playing it safe, to re-add the anonymous inner classes that might be referenced by customers out there. As the comment in the code says, we can't just use `deserializingClassRenames.properties`, because persistence format for a static versus anonymous (non-static) inner class is different.
For the "Fix xstream deserialising osgi class renames", I discussed this with @neykov first. We both agreed that we don't particularly like the fix, but that at least it's localised and it fixes the problem (which is causing rebind to older versions of Brooklyn to fail). We'd like to revisit this, and see about pushing the calls to the class-renames into `ClassLoaderUtils` perhaps. But that's a separate discussion, not for this PR.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/b95932a7
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/b95932a7
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/b95932a7
Branch: refs/heads/master
Commit: b95932a7c2d7e278d0de2847c3ca7ecc22f0809a
Parents: 37c3747 7ea207f
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Thu Mar 16 11:25:57 2017 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Thu Mar 16 11:25:57 2017 +0200
----------------------------------------------------------------------
.../core/mgmt/persist/OsgiClassPrefixer.java | 2 +-
.../apache/brooklyn/feed/CommandPollConfig.java | 16 +-
.../apache/brooklyn/feed/ssh/SshPollConfig.java | 43 +++
.../util/core/xstream/ClassRenamingMapper.java | 144 +++++++++-
.../util/core/xstream/XmlSerializer.java | 8 +-
.../deserializingClassRenames.properties | 4 +-
.../mgmt/persist/XmlMementoSerializerTest.java | 99 ++++++-
.../mgmt/rebind/RebindHistoricSshFeedTest.java | 95 +++++++
.../ssh-feed-no-bundle-prefixes-zv7t8bim62 | 268 +++++++++++++++++++
.../core/mgmt/rebind/ssh-feed-zv7t8bim62 | 268 +++++++++++++++++++
10 files changed, 936 insertions(+), 11 deletions(-)
----------------------------------------------------------------------