You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@brooklyn.apache.org by geomacy <gi...@git.apache.org> on 2016/04/21 15:07:58 UTC
[GitHub] brooklyn-server pull request: Add reading of default.catalog.bom.
GitHub user geomacy opened a pull request:
https://github.com/apache/brooklyn-server/pull/120
Add reading of default.catalog.bom.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/geomacy/brooklyn-server default-catalog-bom
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/brooklyn-server/pull/120.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 #120
----
commit 95b0b6b043f543f8bd1401a31532654c4ec945e7
Author: Geoff Macartney <ge...@cloudsoftcorp.com>
Date: 2016-04-21T13:06:54Z
Add reading of default.catalog.bom.
----
---
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] brooklyn-server pull request: Add reading of default.catalog.bom.
Posted by geomacy <gi...@git.apache.org>.
Github user geomacy commented on a diff in the pull request:
https://github.com/apache/brooklyn-server/pull/120#discussion_r60736795
--- Diff: karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/OsgiLauncher.java ---
@@ -38,6 +39,7 @@
public class OsgiLauncher extends BasicLauncher<OsgiLauncher> {
private static final Logger LOG = LoggerFactory.getLogger(OsgiLauncher.class);
+ private static final String DEFAULT_CATALOG_BOM = "file:conf/brooklyn/default.catalog.bom";
--- End diff --
I did think about that and wasn't sure. In the end I plumped for `conf` in order to keep the file location the same as for the classic launcher, but didn't feel very strongly that this was the clear choice. If you think it's probably better to 'go the Karaf way' at the expense of a little backward compatibility then I'll change this. Karaf is already quite different from classic in many ways.
---
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] brooklyn-server pull request: Add reading of default.catalog.bom.
Posted by geomacy <gi...@git.apache.org>.
Github user geomacy commented on the pull request:
https://github.com/apache/brooklyn-server/pull/120#issuecomment-213448877
Changed location of file to etc, squashed and re-pushed.
---
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] brooklyn-server pull request: Add reading of default.catalog.bom.
Posted by neykov <gi...@git.apache.org>.
Github user neykov commented on a diff in the pull request:
https://github.com/apache/brooklyn-server/pull/120#discussion_r60735381
--- Diff: karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/OsgiLauncher.java ---
@@ -38,6 +39,7 @@
public class OsgiLauncher extends BasicLauncher<OsgiLauncher> {
private static final Logger LOG = LoggerFactory.getLogger(OsgiLauncher.class);
+ private static final String DEFAULT_CATALOG_BOM = "file:conf/brooklyn/default.catalog.bom";
--- End diff --
What do you think about moving the file to the `etc` folder?
---
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] brooklyn-server pull request: Add reading of default.catalog.bom.
Posted by geomacy <gi...@git.apache.org>.
Github user geomacy commented on a diff in the pull request:
https://github.com/apache/brooklyn-server/pull/120#discussion_r60589467
--- Diff: karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/OsgiLauncher.java ---
@@ -38,6 +39,7 @@
public class OsgiLauncher extends BasicLauncher<OsgiLauncher> {
private static final Logger LOG = LoggerFactory.getLogger(OsgiLauncher.class);
+ private static final String DEFAULT_CATALOG_BOM = "file:conf/brooklyn/default.catalog.bom";
--- End diff --
It works fine, Karaf must be able to work out its Karaf root on its own.
---
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] brooklyn-server pull request: Add reading of default.catalog.bom.
Posted by neykov <gi...@git.apache.org>.
Github user neykov commented on the pull request:
https://github.com/apache/brooklyn-server/pull/120#issuecomment-214428597
Thanks @geomacy, merging.
---
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] brooklyn-server pull request: Add reading of default.catalog.bom.
Posted by neykov <gi...@git.apache.org>.
Github user neykov commented on a diff in the pull request:
https://github.com/apache/brooklyn-server/pull/120#discussion_r60576593
--- Diff: karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/OsgiLauncher.java ---
@@ -38,6 +39,7 @@
public class OsgiLauncher extends BasicLauncher<OsgiLauncher> {
private static final Logger LOG = LoggerFactory.getLogger(OsgiLauncher.class);
+ private static final String DEFAULT_CATALOG_BOM = "file:conf/brooklyn/default.catalog.bom";
--- End diff --
Will this work if we start karaf from a non-home folder?
---
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] brooklyn-server pull request: Add reading of default.catalog.bom.
Posted by neykov <gi...@git.apache.org>.
Github user neykov commented on the pull request:
https://github.com/apache/brooklyn-server/pull/120#issuecomment-213422553
Looks great, would like to discuss the bom location.
---
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] brooklyn-server pull request: Add reading of default.catalog.bom.
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/brooklyn-server/pull/120
---
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.
---