You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@brooklyn.apache.org by m4rkmckenna <gi...@git.apache.org> on 2017/01/06 14:49:41 UTC
[GitHub] brooklyn-server pull request #507: Makes the default catalog location config...
GitHub user m4rkmckenna opened a pull request:
https://github.com/apache/brooklyn-server/pull/507
Makes the default catalog location configurable
default catalog location can now be configured using the below PID
`org.apache.brooklyn.osgilauncher/default.catalog.location`
default has been set as `${karaf.etc}/default.catalog.bom`
\u26a0\ufe0f Depends on https://github.com/apache/brooklyn-dist/pull/76
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/m4rkmckenna/brooklyn-server bugfix/catlog-location-hardcoded
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/brooklyn-server/pull/507.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 #507
----
commit 9da4b731dde071c598536cea9b64305b871873b2
Author: Mark McKenna <m4...@gmail.com>
Date: 2017-01-06T14:46:11Z
Makes the default catalog location configurable
default catalog location can now be configured using the below PID
`org.apache.brooklyn.osgilauncher/default.catalog.location`
default has been set as `${karaf.etc}/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 #507: Make the default catalog location configu...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/brooklyn-server/pull/507
---
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 #507: Make the default catalog location configu...
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/507#discussion_r95625609
--- Diff: karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/OsgiLauncher.java ---
@@ -41,13 +36,16 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.annotation.Nullable;
+import java.io.IOException;
+import java.util.Map;
+
/**
* Initializer for brooklyn-core when running in an OSGi environment.
*/
public class OsgiLauncher extends BasicLauncher<OsgiLauncher> {
private static final Logger LOG = LoggerFactory.getLogger(OsgiLauncher.class);
- private static final String DEFAULT_CATALOG_BOM = "file:etc/default.catalog.bom";
--- End diff --
Yay, nice to see this gone :)
---
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 issue #507: Make the default catalog location configurable
Posted by geomacy <gi...@git.apache.org>.
Github user geomacy commented on the issue:
https://github.com/apache/brooklyn-server/pull/507
\U0001f44d also tested successfully, looks good, 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 issue #507: Make the default catalog location configurable
Posted by tbouron <gi...@git.apache.org>.
Github user tbouron commented on the issue:
https://github.com/apache/brooklyn-server/pull/507
Tested, LGTM
---
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 #507: Make the default catalog location configu...
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/507#discussion_r95625756
--- Diff: karaf/init/src/main/resources/OSGI-INF/blueprint/blueprint.xml ---
@@ -44,6 +44,7 @@ limitations under the License.
<cm:property name="persistPeriod" value="1s" />
<cm:property name="globalBrooklynPropertiesFile" value="~/.brooklyn/brooklyn.properties" />
<cm:property name="localBrooklynPropertiesFile" value="" /> <!-- used to be settable through cli params -->
+ <cm:property name="default.catalog.location" value="etc/default.catalog.bom" />
--- End diff --
But it still relies on relative path? Would it makes sense to prefix with `${karaf.etc}`? Could see the etc folder relocated for rpm/deb?
---
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.
---