GitHub user ahgittin opened a pull request:
https://github.com/apache/brooklyn-server/pull/661
fix icon loading
fixes all issues around icons revealed by @geomacy's testing in #645
last commit is worth looking at in detail, pretty sure it's reasonable but
appreciate feedback. see the comment there.
also note
https://github.com/ahgittin/brooklyn-server/commit/b4ecbbb7a751cf2a69155268ab7828cab94e8da8
-- this seems eminently sensible and there may be other places we want to do
it, but this one was caught by a test that failed after the fix in the previous
commit
cc @neykov @aledsage @geomacy
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/ahgittin/brooklyn-server icons
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/brooklyn-server/pull/661.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #661
----
commit b48f49920d0ca00132ff6544b46293b58efc6e19
Author: Alex Heneveld <[email protected]>
Date: 2017-04-28T14:50:11Z
fix but where osgi classpaths didn't load when using embedded framework
commit 4da4021acf91fd1a2e7568183ec762f1b35a74ae
Author: Alex Heneveld <[email protected]>
Date: 2017-04-28T14:55:42Z
fix bug where entity's search path isn't used when retrieving icon url's
commit b4ecbbb7a751cf2a69155268ab7828cab94e8da8
Author: Alex Heneveld <[email protected]>
Date: 2017-04-28T16:20:04Z
fix getResources() so it dedupes URLs, fixing test
(exposed now that we load better things through osgi)
commit 2e26b3e2f8241f089f3bcd7339c84cee420b4fcc
Author: Alex Heneveld <[email protected]>
Date: 2017-04-28T14:57:45Z
change handling of icon url storage
previously we'd set iconUrl from a flag in AbstractEntity, but that field
was never persisted.
now:
* that field is removed (since it wasn't persisted this shouldn't affect
rebind)
* iconUrl is done by looking up the catalog item if nothing special is
found on the object (usual path)
* if a special iconUrl is wanted on an instance, it should be set as a tag;
this means it's persisted, and it can be done for any brooklyn object
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
