You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@brooklyn.apache.org by ahgittin <gi...@git.apache.org> on 2014/11/04 12:13:23 UTC
[GitHub] incubator-brooklyn pull request: store catalog item id, minor tidi...
GitHub user ahgittin opened a pull request:
https://github.com/apache/incubator-brooklyn/pull/294
store catalog item id, minor tidies and lots of tests including osgi versions
replaces #274 (incorporates it all, with conflicts fixed, and then some tweaks)
@neykov looking forward to your feedback
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/ahgittin/incubator-brooklyn misc2
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-brooklyn/pull/294.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 #294
----
commit b454beb60e0f99a615c082ee3d1366b92b3e1ed7
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Date: 2014-10-27T16:16:55Z
Fix rebinding to entities/policies living in OSGi bundles
When an entity/policy is created from a catalog item we make a note of its related catalog item id. On rebind we use that information to get the class loading context from the corresponding catalog item so that classes from OSGi bundles referenced in the item config are accessible.
commit 405842d20aa11d83fe91734ba61b80106f1383bd
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Date: 2014-10-29T15:34:00Z
Look in parent entities when looking for a context catalog id to load classes from.
commit d716e2fa37ffd4444b304ffcacdcf87be29666a2
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Date: 2014-10-29T16:27:17Z
Use explicit property for context catalog id bookkeeping
Move from using tags to set the context catalog id to explicit properties.
commit b496958d91567abb3a17ceaa84de645cbeeffd85
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Date: 2014-10-30T09:56:50Z
Make a note of the remaining steps needed for reliable rebind + OSGi bundles.
commit d2d4e617f34ac52ae9e8103ed18478aa7335fa0f
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Date: 2014-10-30T11:15:45Z
Set the catalog item id used when creating BOSpecs
commit 246c29d33cc859d160864d46a7385fb929459ae8
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Date: 2014-10-30T12:33:25Z
Fix compile warnings
commit 36ee1e0fcb944fa2a3b6265cdad54de3afb8b889
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Date: 2014-10-30T13:18:38Z
Initialize the context catalog item id when adding items to the BO hierarchy.
commit 0eb67633c168237154134af3028ba4048845efa5
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Date: 2014-10-31T12:41:50Z
Initialize the context catalog item id from the current task's context entity.
commit e832ee462c981ed2b056c0aaa9e39a64e99cc73b
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Date: 2014-11-03T18:56:16Z
Merge remote-tracking branch 'apache-gh/pr/274' into misc4
Conflicts:
utils/common/src/main/java/brooklyn/util/text/Strings.java - unambiguous new methods added at end
commit 72ac1296dde17d5a80a5496d8f81273e07bd3bf1
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Date: 2014-10-31T15:19:57Z
Catalog Item ID field renaming and ApiObjectsFactory tweaks
* catalogItemId rather than contextCatalogItemId
* ApiObjectsFactory moved to internal package, inner class promoted so services file is nicer
* safer initialization of ApiObjectsFactory
commit 642c7ffdd3794ca88dba2e0e8e512881547f948d
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Date: 2014-10-31T23:58:39Z
minor tweaks to catalog item id setting
move catalog-item inferencing based on entity proximity to a helper method with a bit of logging
(did this mainly because i didn't see it in addChild/addEnricher/etc but then i realized you'd
done it in setParent/setEntity ... now it's in both which is superfluous but harmless)
only change of note is putting {get,set}CatalogItemId in the EntityTransientCopyInternal so that
on hot-standby rebind we are allowed to set these. (not sure if that was a problem or not.)
next will test this, but need to grab some osgi items to do that!
commit a76208af1fe0eaa287430515beb0a750f7bfaa2b
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Date: 2014-11-01T11:41:07Z
tidy up osgi test bundles, in prep for writing more bundles and more tests
commit 35fd634154c0248f16ea3f5f09e4229b13f902e2
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Date: 2014-11-03T09:57:13Z
OSGi catalog item test (see full msg for details)
Add some more OSGi test bundles - see OsgiTestResources.
Write lots more tests of OSGi loading and item ID - in OsgiEntitiesTest, and in camp project using YAML e.g. Catalog*Osgi*Test.java .
Also load OSGi on addItem(CatalogItem), and improve OSGi loading error messages when OSGi loading fails.
Better error messages on OSGi failures.
commit e7712656b8504bb3ae736dc3e55b8ffc8d102728
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Date: 2014-11-04T11:11:31Z
Merge branch 'master' into misc6
----
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: store catalog item id, minor tidi...
Posted by ahgittin <gi...@git.apache.org>.
Github user ahgittin commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/294#issuecomment-61636449
failing test is my bad. not sure how that crept through, i did a mvn clean install, but maybe that test was disabled at the time. next push should be better.
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: store catalog item id, minor tidi...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/incubator-brooklyn/pull/294
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: store catalog item id, minor tidi...
Posted by ahgittin <gi...@git.apache.org>.
Github user ahgittin commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/294#issuecomment-61645465
let's plan to remove `setCatalogItemId` as part of the #92 rework
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: store catalog item id, minor tidi...
Posted by neykov <gi...@git.apache.org>.
Github user neykov commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/294#issuecomment-61641324
Good to merge, though I'd be happier if we didn't have setCatalogItemId on catalog items.
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: store catalog item id, minor tidi...
Posted by aledsage <gi...@git.apache.org>.
Github user aledsage commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/294#issuecomment-61632454
Failing test in jenkins sounds related to changes: `brooklyn.management.osgi.OsgiVersionMoreEntityTest.testMoreEntitiesV1Policy`
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---