GitHub user aledsage opened a pull request:
https://github.com/apache/incubator-brooklyn/pull/346
Fix catalog (so config shown when adding app)
I see Alex beat me to fixing this (see
https://github.com/apache/incubator-brooklyn/pull/343).
I didn't know about `getCatalogItemOptionalVersion`, which makes it much
simpler.
There are a couple of things in here that are still relevant and that I
would like reviewed (I'll strip out the others later):
* Fix for Osgis.parseOsgiIdentifier(), so it does what it says.
* Use of 0.0.0_SNAPSHOT as default version is not a valid OSGi version
number. Should we change it to 0.0.0.SNAPSHOT?
* Should we change the .js to use
`/v1/catalog/entities/symbolicname/version`, given that the other method is
deprecated?
@ahgittin @neykov remind me - is the catalog using OSGi version number, or
maven-style version numbering with "-SNAPSHOT" suffix having special meaning
(but using underscores instead)?
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/aledsage/incubator-brooklyn
fix/various-20141118-catalog
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-brooklyn/pull/346.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 #346
----
commit 2e066e5860accae4fd8b967d77250ff556f7546a
Author: Aled Sage <[email protected]>
Date: 2014-11-18T23:18:50Z
Fix + test Osgis.parseOsgiIdentifier
commit d339107e505f3ba7f1874abdf4968b926f99dffd
Author: Aled Sage <[email protected]>
Date: 2014-11-18T23:21:14Z
Fix OSGi no_version, so itâs a valid OSGi version number
- 0.0.0_SNAPSHOT is not a valid OSGi version.
It needs to be 0.0.0.SNAPSHOT.
This is important for when one passes in
âmy.symbolic.name:0.0.0.SNAPSHOTâ, rather than expecting them
to pass an illegal OSGi version.
commit 52b4a5adcfb51728c89dfebfdb46006086584e33
Author: Aled Sage <[email protected]>
Date: 2014-11-18T23:22:00Z
Fix CatalogResource.getEntity(entityId)
- The id could be in the form symbolicName or symbolicName:version
If the latter, then parse it.
commit 140b154d921113f46f9487663b6004c17c2192b7
Author: Aled Sage <[email protected]>
Date: 2014-11-18T23:23:10Z
add-application wizard to use catalog/entities/symbolicName/version
- rather than the deprecated catalog/entities/symbolicName:version
----
---
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.
---
