This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git.
from 7748360 Merge pull request #170 from apache/fix/ignored-mem-settings
new f758e1b add more examples to default brooklyn.cfg file
new 8e9f337 use karaf maven plugin to build feature
new 151265a build a KAR and use that for the assembly
new 5b7804d tweak karaf resources
new e75ce56 Merge branch 'master' into kar
new 02fc68f This closes #171
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
karaf/apache-brooklyn/pom.xml | 73 ++---------
.../src/main/resources/etc/system.properties | 136 ---------------------
karaf/features/pom.xml | 111 ++++++++++-------
.../resources}/etc/branding.properties | 0
.../resources}/etc/org.apache.karaf.features.xml | 4 +
.../src/main/resources}/resources/LICENSE | 0
.../src/main/resources}/resources/NOTICE | 0
.../resources/resources}/bin/generate-password.sh | 0
.../src/main/resources}/resources/bin/runbrooklyn | 0
.../src/main/resources}/resources/bin/setenv | 0
.../src/main/resources}/resources/bin/setenv.bat | 0
.../src/main/resources/resources}/etc/brooklyn.cfg | 12 +-
.../resources}/resources/etc/custom.properties | 0
.../resources/etc/custom.system.properties} | 18 +--
.../resources}/resources/etc/default.catalog.bom | 0
.../resources/etc/org.apache.karaf.shell.cfg | 0
.../resources/etc/org.ops4j.pax.logging.cfg | 0
.../etc/org.ops4j.pax.url.mvn.repositories.cfg | 0
.../resources}/resources/etc/org.ops4j.pax.web.cfg | 0
19 files changed, 104 insertions(+), 250 deletions(-)
delete mode 100644
karaf/apache-brooklyn/src/main/resources/etc/system.properties
rename karaf/{apache-brooklyn/src/main/filtered-resources =>
features/src/main/filtered-resources/resources}/etc/branding.properties (100%)
rename karaf/{apache-brooklyn/src/main/filtered-resources =>
features/src/main/filtered-resources/resources}/etc/org.apache.karaf.features.xml
(90%)
rename karaf/{apache-brooklyn/src/main =>
features/src/main/resources}/resources/LICENSE (100%)
rename karaf/{apache-brooklyn/src/main =>
features/src/main/resources}/resources/NOTICE (100%)
rename karaf/{apache-brooklyn/src/main/filtered-resources =>
features/src/main/resources/resources}/bin/generate-password.sh (100%)
rename karaf/{apache-brooklyn/src/main =>
features/src/main/resources}/resources/bin/runbrooklyn (100%)
rename karaf/{apache-brooklyn/src/main =>
features/src/main/resources}/resources/bin/setenv (100%)
rename karaf/{apache-brooklyn/src/main =>
features/src/main/resources}/resources/bin/setenv.bat (100%)
copy karaf/{apache-brooklyn/src/main/filtered-resources =>
features/src/main/resources/resources}/etc/brooklyn.cfg (66%)
rename karaf/{apache-brooklyn/src/main =>
features/src/main/resources}/resources/etc/custom.properties (100%)
rename karaf/{apache-brooklyn/src/main/filtered-resources/etc/brooklyn.cfg =>
features/src/main/resources/resources/etc/custom.system.properties} (71%)
rename karaf/{apache-brooklyn/src/main =>
features/src/main/resources}/resources/etc/default.catalog.bom (100%)
rename karaf/{apache-brooklyn/src/main =>
features/src/main/resources}/resources/etc/org.apache.karaf.shell.cfg (100%)
rename karaf/{apache-brooklyn/src/main =>
features/src/main/resources}/resources/etc/org.ops4j.pax.logging.cfg (100%)
rename karaf/{apache-brooklyn/src/main =>
features/src/main/resources}/resources/etc/org.ops4j.pax.url.mvn.repositories.cfg
(100%)
rename karaf/{apache-brooklyn/src/main =>
features/src/main/resources}/resources/etc/org.ops4j.pax.web.cfg (100%)
