brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From geom...@apache.org
Subject [1/2] brooklyn-dist git commit: Makes the default catalog location configurable
Date Mon, 09 Jan 2017 09:37:55 GMT
Repository: brooklyn-dist
Updated Branches:
  refs/heads/master c35e5a9bc -> c181d595a


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`


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/bd124c7b
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/bd124c7b
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/bd124c7b

Branch: refs/heads/master
Commit: bd124c7b8276ab6419c69bb88e5349189f2ef14c
Parents: f2ee384
Author: Mark McKenna <m4rkmckenna@gmail.com>
Authored: Fri Jan 6 14:30:27 2017 +0000
Committer: Mark McKenna <m4rkmckenna@gmail.com>
Committed: Fri Jan 6 14:30:27 2017 +0000

----------------------------------------------------------------------
 .../src/main/resources/etc/org.apache.brooklyn.osgilauncher.cfg   | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/bd124c7b/karaf/apache-brooklyn/src/main/resources/etc/org.apache.brooklyn.osgilauncher.cfg
----------------------------------------------------------------------
diff --git a/karaf/apache-brooklyn/src/main/resources/etc/org.apache.brooklyn.osgilauncher.cfg
b/karaf/apache-brooklyn/src/main/resources/etc/org.apache.brooklyn.osgilauncher.cfg
index 0f56566..dfc2adb 100644
--- a/karaf/apache-brooklyn/src/main/resources/etc/org.apache.brooklyn.osgilauncher.cfg
+++ b/karaf/apache-brooklyn/src/main/resources/etc/org.apache.brooklyn.osgilauncher.cfg
@@ -27,6 +27,9 @@
 # Location of the global brooklyn.properties file
 #globalBrooklynPropertiesFile=~/.brooklyn/brooklyn.properties
 
+# Location of the default catalog.bom
+default.catalog.location=${karaf.etc}/default.catalog.bom
+
 # Location of the local brooklyn.properties file, normally specified at the cli. Overrides
properties from the global set.
 #localBrooklynPropertiesFile=
 


Mime
View raw message