You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2016/10/26 06:28:23 UTC
[1/9] brooklyn-dist git commit: Silence Karaf dist brooklyn.info.log
Repository: brooklyn-dist
Updated Branches:
refs/heads/master 3cf8519cf -> 1a1eae724
Silence Karaf dist brooklyn.info.log
Also fix missing or invalid log4j.logger prefixes to packages, change the logging layout to be more compact (no fixed widths)
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/5565732f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/5565732f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/5565732f
Branch: refs/heads/master
Commit: 5565732f131160077034c677797c15d9e7884edf
Parents: 8c2294a
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Thu Aug 25 15:48:28 2016 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Thu Aug 25 16:07:13 2016 +0300
----------------------------------------------------------------------
.../resources/etc/org.ops4j.pax.logging.cfg | 107 ++++++++++++-------
1 file changed, 70 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/5565732f/karaf/apache-brooklyn/src/main/resources/etc/org.ops4j.pax.logging.cfg
----------------------------------------------------------------------
diff --git a/karaf/apache-brooklyn/src/main/resources/etc/org.ops4j.pax.logging.cfg b/karaf/apache-brooklyn/src/main/resources/etc/org.ops4j.pax.logging.cfg
index acd2aea..bbd241c 100755
--- a/karaf/apache-brooklyn/src/main/resources/etc/org.ops4j.pax.logging.cfg
+++ b/karaf/apache-brooklyn/src/main/resources/etc/org.ops4j.pax.logging.cfg
@@ -18,40 +18,44 @@
################################################################################
# Root logger
-log4j.rootLogger=INFO, out, debugFile, osgi:VmLogAppender
+log4j.rootLogger=INFO, info, debug, osgi:VmLogAppender
log4j.throwableRenderer=org.apache.log4j.OsgiThrowableRenderer
# CONSOLE appender not used by default
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %-5.5p %3.3X{bundle.id} %-30.30c{2} [%-16.16t] %m%n
+log4j.appender.stdout.layout=org.apache.log4j.EnhancedPatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5.5p %3X{bundle.id} %c{1.} [%.16t] %m%n
# Info file appender
-log4j.appender.out=org.apache.log4j.RollingFileAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=%d{ABSOLUTE} %-5.5p %3.3X{bundle.id} %-30.30c{2} [%-16.16t] %m%n
-log4j.appender.out.file=${karaf.home}/log/brooklyn.info.log
-log4j.appender.out.Threshold=INFO
-log4j.appender.out.append=true
-log4j.appender.out.maxFileSize=100MB
-log4j.appender.out.maxBackupIndex=10
+log4j.appender.info=org.apache.log4j.RollingFileAppender
+log4j.appender.info.layout=org.apache.log4j.EnhancedPatternLayout
+log4j.appender.info.layout.ConversionPattern=%d{ISO8601} %-5.5p %3X{bundle.id} %c{1.} [%.16t] %m%n
+log4j.appender.info.file=${karaf.home}/log/brooklyn.info.log
+log4j.appender.info.Threshold=INFO
+log4j.appender.info.append=true
+log4j.appender.info.maxFileSize=100MB
+log4j.appender.info.maxBackupIndex=10
+
+log4j.appender.infoWarn=org.apache.log4j.AsyncAppender
+log4j.appender.infoWarn.appenders=info
+log4j.appender.infoWarn.Threshold=WARN
# Debug file appender
-log4j.appender.debugFile=org.apache.log4j.RollingFileAppender
-log4j.appender.debugFile.layout=org.apache.log4j.PatternLayout
-log4j.appender.debugFile.layout.ConversionPattern=%d{ABSOLUTE} %-5.5p %3.3X{bundle.id} %-30.30c{2} [%-16.16t] %m%n
-log4j.appender.debugFile.file=${karaf.home}/log/brooklyn.debug.log
-log4j.appender.debugFile.append=true
-log4j.appender.debugFile.maxFileSize=100MB
-log4j.appender.debugFile.maxBackupIndex=10
+log4j.appender.debug=org.apache.log4j.RollingFileAppender
+log4j.appender.debug.layout=org.apache.log4j.EnhancedPatternLayout
+log4j.appender.debug.layout.ConversionPattern=%d{ISO8601} %-5.5p %3X{bundle.id} %c{1.} [%.16t] %m%n
+log4j.appender.debug.file=${karaf.home}/log/brooklyn.debug.log
+log4j.appender.debug.append=true
+log4j.appender.debug.maxFileSize=100MB
+log4j.appender.debug.maxBackupIndex=10
# Sift appender
log4j.appender.sift=org.apache.log4j.sift.MDCSiftingAppender
log4j.appender.sift.key=bundle.name
log4j.appender.sift.default=brooklyn
log4j.appender.sift.appender=org.apache.log4j.FileAppender
-log4j.appender.sift.appender.layout=org.apache.log4j.PatternLayout
-log4j.appender.sift.appender.layout.ConversionPattern=%d{ABSOLUTE} %-5.5p %3.3X{bundle.id} %-30.30c{2} [%-16.16t] %m%n
+log4j.appender.sift.appender.layout=org.apache.log4j.EnhancedPatternLayout
+log4j.appender.sift.appender.layout.ConversionPattern=%d{ISO8601} %-5.5p %3X{bundle.id} %c{1.} [%.16t] %m%n
log4j.appender.sift.appender.file=${karaf.data}/log/$\\{bundle.name\\}.log
log4j.appender.sift.appender.append=true
@@ -59,37 +63,66 @@ log4j.appender.sift.appender.append=true
# Logger configuration
# The following properties turn on quite verbose DEBUG logging for Brooklyn-relevant loggers
-log4j.logger.brooklyn=DEBUG
log4j.logger.org.apache.brooklyn=DEBUG
log4j.logger.org.jclouds=DEBUG
log4j.logger.jclouds=DEBUG
-io.cloudsoft.winrm4j.winrm.WinRmTool=DEBUG
+log4j.io.cloudsoft.winrm4j.winrm.WinRmTool=DEBUG
# If you're just going to have a few debug categories these are recommended;
# comment out the loggers above and leave these as-is
-log4.logger.brooklyn.SSH=DEBUG
-log4.logger.brooklyn.location.basic.jclouds=DEBUG
-log4.logger.brooklyn.util.internal.ssh=DEBUG
-log4.logger.org.apache.brooklyn.SSH=DEBUG
-log4.logger.org.apache.brooklyn.location.basic.jclouds=DEBUG
-log4.logger.org.apache.brooklyn.util.internal.ssh=DEBUG
+log4j.logger.org.apache.brooklyn.SSH=DEBUG
+log4j.logger.org.apache.brooklyn.location.basic.jclouds=DEBUG
+log4j.logger.org.apache.brooklyn.util.internal.ssh=DEBUG
# a bit noisy at INFO, but still, poss interesting
-log4j.logger.org.reflections.Reflections=INFO
-log4j.logger.com.sun.jersey.server.impl.application=INFO
-log4j.logger.org.apache.whirr.service.ComputeCache=INFO
-log4j.logger.jclouds.ssh=INFO
-log4j.logger.org.apache.http.impl.client=INFO
-log4j.logger.javax.management.remote=INFO
+log4j.additivity.org.reflections.Reflections=false
+log4j.logger.org.reflections.Reflections=INFO, infoWarn, debug
+
+log4j.additivity.com.sun.jersey.server.impl.application=false
+log4j.logger.com.sun.jersey.server.impl.application=INFO, infoWarn, debug
+
+log4j.additivity.org.apache.whirr.service.ComputeCache=false
+log4j.logger.org.apache.whirr.service.ComputeCache=INFO, infoWarn, debug
+
+log4j.additivity.jclouds.ssh=false
+log4j.logger.jclouds.ssh=INFO, infoWarn, debug
+
+log4j.additivity.org.apache.http.impl.client=false
+log4j.logger.org.apache.http.impl.client=INFO, infoWarn, debug
+
+log4j.additivity.javax.management.remote=false
+log4j.logger.javax.management.remote=INFO, debug
# some loggers are very noisy however, exclude them
-log4j.logger.org.apache.cxf=WARN
-log4j.logger.net.schmizz=WARN
+log4j.additivity.org.apache.cxf=false
+log4j.logger.org.apache.cxf=ERROR
+
log4j.logger.org.eclipse.jetty=WARN
-log4j.logger.org.mongodb.driver=WARN
+
+log4j.additivity.net.schmizz=false
+log4j.logger.net.schmizz=WARN, debug
+
+log4j.additivity.org.mongodb.driver=false
+log4j.logger.org.mongodb.driver=WARN, debug
# Wordnik logs errors in a few places which aren't errors at all; ignore them altogether
# (Turn them back on if you need to see how API-doc gets generated, and also
# see https://github.com/wordnik/swagger-core/issues/58)
log4j.logger.com.wordnik.swagger=OFF
+# TODO Figure out why spi-fly is activated, we don't need it
+log4j.additivity.org.apache.aries.spifly.dynamic.bundle=false
+log4j.logger.org.apache.aries.spifly.dynamic.bundle=INFO, debug
+
+# Karaf specific
+log4j.additivity.org.apache.felix=false
+log4j.logger.org.apache.felix=INFO, infoWarn, debug
+
+log4j.additivity.org.apache.karaf=false
+log4j.logger.org.apache.karaf=INFO, infoWarn, debug
+
+log4j.additivity.org.ops4j.pax.web=false
+log4j.logger.org.ops4j.pax.web=INFO, infoWarn, debug
+
+log4j.additivity.org.apache.aries=false
+log4j.logger.org.apache.aries=INFO, infoWarn, debug
[4/9] brooklyn-dist git commit: added setenv script which sets
default memory settings,
checks if java is installed and sets the local loopback
Posted by sv...@apache.org.
added setenv script which sets default memory settings, checks if java is installed and sets the local loopback
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/9dbc43d3
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/9dbc43d3
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/9dbc43d3
Branch: refs/heads/master
Commit: 9dbc43d37542ba2195c41556d66f0565c894207d
Parents: 3cf8519
Author: Justin Thompson <ju...@cloudsoftcorp.com>
Authored: Wed Oct 19 12:10:47 2016 +0100
Committer: Justin Thompson <ju...@cloudsoftcorp.com>
Committed: Wed Oct 19 12:10:47 2016 +0100
----------------------------------------------------------------------
.../src/main/resources/bin/setenv | 51 ++++++++++++++++++++
1 file changed, 51 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/9dbc43d3/karaf/apache-brooklyn/src/main/resources/bin/setenv
----------------------------------------------------------------------
diff --git a/karaf/apache-brooklyn/src/main/resources/bin/setenv b/karaf/apache-brooklyn/src/main/resources/bin/setenv
new file mode 100644
index 0000000..b424f28
--- /dev/null
+++ b/karaf/apache-brooklyn/src/main/resources/bin/setenv
@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# Brooklyn
+#
+
+# use default memory settings, if not specified
+if [ -z "${JAVA_MAX_MEM}" ] ; then
+ export JAVA_MAX_MEM="2G"
+fi
+if [ -z "${JAVA_MAX_PERM_MEM}" ] ; then
+ export JAVA_MAX_PERM_MEM="256m"
+fi
+
+# abort if java is not installed
+if [ "x$JAVA" = "x" ]; then
+ if [ "x$JAVA_HOME" != "x" ]; then
+ if [ ! -d "$JAVA_HOME" ]; then
+ echo "Aborting: JAVA_HOME is not valid: $JAVA_HOME"
+ exit 1
+ fi
+ JAVA="$JAVA_HOME/bin/java"
+ else
+ echo "JAVA_HOME not set; results may vary"
+ JAVA=`type java`
+ JAVA=`expr "$JAVA" : '.* \(/.*\)$'`
+ if [ "x$JAVA" = "x" ]; then
+ echo "Aborting: java command not found"
+ exit 1
+ fi
+ fi
+fi
+
+# force resolution of localhost to be loopback
+export EXTRA_JAVA_OPTS="-Dbrooklyn.location.localhost.address=127.0.0.1 ${EXTRA_JAVA_OPTS}"
\ No newline at end of file
[2/9] brooklyn-dist git commit: Update pom SCM & Jenkins URLs
Posted by sv...@apache.org.
Update pom SCM & Jenkins URLs
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/2d6bfc5c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/2d6bfc5c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/2d6bfc5c
Branch: refs/heads/master
Commit: 2d6bfc5c3ddb06506069f4285f2edea84406a731
Parents: 77cad55
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Tue Sep 13 17:49:12 2016 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Tue Sep 13 17:49:12 2016 +0300
----------------------------------------------------------------------
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/2d6bfc5c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 471f662..61a51e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,9 +44,9 @@
</developers>
<scm>
- <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-brooklyn.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-brooklyn.git</developerConnection>
- <url>https://git-wip-us.apache.org/repos/asf?p=incubator-brooklyn.git</url>
+ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/brooklyn-dist.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/brooklyn-dist.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf?p=brooklyn-dist.git</url>
<tag>HEAD</tag>
</scm>
@@ -56,7 +56,7 @@
</issueManagement>
<ciManagement>
<system>Jenkins</system>
- <url>https://builds.apache.org/job/incubator-brooklyn-master-build/</url>
+ <url>https://builds.apache.org/view/Brooklyn/job/brooklyn-dist-master/</url>
</ciManagement>
<mailingLists>
<mailingList>
[7/9] brooklyn-dist git commit: Closes #46
Posted by sv...@apache.org.
Closes #46
Update pom SCM & Jenkins URLs
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/07140561
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/07140561
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/07140561
Branch: refs/heads/master
Commit: 07140561385636fbe2be6db015c9639cda182976
Parents: c54434b 2d6bfc5
Author: Svetoslav Neykov <sv...@neykov.name>
Authored: Wed Oct 26 09:19:58 2016 +0300
Committer: Svetoslav Neykov <sv...@neykov.name>
Committed: Wed Oct 26 09:19:58 2016 +0300
----------------------------------------------------------------------
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[3/9] brooklyn-dist git commit: Update tests following changes in
files.preinstall inheritance
Posted by sv...@apache.org.
Update tests following changes in files.preinstall inheritance
Need to update the tests following changes in inheritance
of files.preinstall, see https://github.com/apache/brooklyn-server/pull/281
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/728ab331
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/728ab331
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/728ab331
Branch: refs/heads/master
Commit: 728ab331f59257f3c4ca11d7ff2f2009917cadfb
Parents: 77cad55
Author: Geoff Macartney <ge...@cloudsoftcorp.com>
Authored: Tue Sep 13 15:40:15 2016 +0100
Committer: Geoff Macartney <ge...@cloudsoftcorp.com>
Committed: Tue Sep 13 18:02:01 2016 +0100
----------------------------------------------------------------------
shared-packaging/src/test/yaml/Vagrantfile | 51 ++++++++++++++++
.../src/test/yaml/package-apps.yaml | 42 ++-----------
shared-packaging/src/test/yaml/package.bom | 63 ++++++++++++++------
3 files changed, 99 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/728ab331/shared-packaging/src/test/yaml/Vagrantfile
----------------------------------------------------------------------
diff --git a/shared-packaging/src/test/yaml/Vagrantfile b/shared-packaging/src/test/yaml/Vagrantfile
new file mode 100644
index 0000000..dfded96
--- /dev/null
+++ b/shared-packaging/src/test/yaml/Vagrantfile
@@ -0,0 +1,51 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Example Vagrantfile for testing RPM/DEB installation on a
+# convenient Vagrant box.
+# Maps your public key to 'authorized_keys' on the vagrant.
+# see note on 'source below'.
+
+Vagrant.configure(2) do |config|
+ config.vm.provider "virtualbox" do |vb|
+ vb.memory = "1024"
+ vb.customize ["modifyvm", :id, "--nictype1", "virtio"]
+ vb.customize ["modifyvm", :id, "--nictype2", "virtio"]
+ end
+
+ # change the 'source' below if necessary to match your public key file path
+ config.vm.provision "file", source: "~/.ssh/id_rsa.pub", destination: "~/.ssh/authorized_keys"
+ config.vm.provision "shell", name:"set key permissions", privileged:false, inline: "chmod 400 ~/.ssh/authorized_keys"
+
+ config.vm.define "apt-systemd" do |config|
+ config.vm.box = "ubuntu/wily64"
+ config.vm.network "private_network", ip: "172.28.128.3"
+ end
+ config.vm.define "apt-upstart" do |config|
+ config.vm.box = "ubuntu/trusty64"
+ config.vm.network "private_network", ip: "172.28.128.4"
+ end
+ config.vm.define "yum-systemd" do |config|
+ config.vm.box = "centos/7"
+ config.vm.network "private_network", ip: "172.28.128.5"
+ end
+ config.vm.define "yum-upstart" do |config|
+ config.vm.box = "nrel/CentOS-6.5-x86_64"
+ config.vm.network "private_network", ip: "172.28.128.6"
+ end
+end
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/728ab331/shared-packaging/src/test/yaml/package-apps.yaml
----------------------------------------------------------------------
diff --git a/shared-packaging/src/test/yaml/package-apps.yaml b/shared-packaging/src/test/yaml/package-apps.yaml
index 5009e56..cf09f1b 100644
--- a/shared-packaging/src/test/yaml/package-apps.yaml
+++ b/shared-packaging/src/test/yaml/package-apps.yaml
@@ -25,8 +25,7 @@ services:
# privateKeyFile: ~/.ssh/<private key>
user: vagrant
brooklyn.config:
- files.preinstall:
- ~/.m2/repository/org/apache/brooklyn/deb-packaging/0.10.0-SNAPSHOT/deb-packaging-0.10.0-SNAPSHOT.deb: brooklyn-package.deb # BROOKLYN_VERSION
+ package.file: ~/.m2/repository/org/apache/brooklyn/deb-packaging/0.10.0-SNAPSHOT/deb-packaging-0.10.0-SNAPSHOT.deb # BROOKLYN_VERSION
---
@@ -39,8 +38,7 @@ services:
# privateKeyFile: ~/.ssh/<private key>
user: vagrant
brooklyn.config:
- files.preinstall:
- ~/.m2/repository/org/apache/brooklyn/deb-packaging/0.10.0-SNAPSHOT/deb-packaging-0.10.0-SNAPSHOT.deb: brooklyn-package.deb # BROOKLYN_VERSION
+ package.file: ~/.m2/repository/org/apache/brooklyn/deb-packaging/0.10.0-SNAPSHOT/deb-packaging-0.10.0-SNAPSHOT.deb # BROOKLYN_VERSION
---
@@ -53,8 +51,7 @@ services:
# privateKeyFile: ~/.ssh/<private key>
user: vagrant
brooklyn.config:
- files.preinstall:
- ~/.m2/repository/org/apache/brooklyn/rpm-packaging/0.10.0-SNAPSHOT/rpm-packaging-0.10.0-SNAPSHOT.rpm: brooklyn-package.rpm # BROOKLYN_VERSION
+ package.file: ~/.m2/repository/org/apache/brooklyn/rpm-packaging/0.10.0-SNAPSHOT/rpm-packaging-0.10.0-SNAPSHOT.rpm # BROOKLYN_VERSION
---
@@ -67,37 +64,6 @@ services:
# privateKeyFile: ~/.ssh/<private key>
user: vagrant
brooklyn.config:
- files.preinstall:
- ~/.m2/repository/org/apache/brooklyn/rpm-packaging/0.10.0-SNAPSHOT/rpm-packaging-0.10.0-SNAPSHOT.rpm: brooklyn-package.rpm # BROOKLYN_VERSION
+ package.file: ~/.m2/repository/org/apache/brooklyn/rpm-packaging/0.10.0-SNAPSHOT/rpm-packaging-0.10.0-SNAPSHOT.rpm # BROOKLYN_VERSION
----
-
-# Vagrantfile
-Vagrant.configure(2) do |config|
- config.vm.provider "virtualbox" do |vb|
- vb.memory = "1024"
- vb.customize ["modifyvm", :id, "--nictype1", "virtio"]
- vb.customize ["modifyvm", :id, "--nictype2", "virtio"]
- end
- config.vm.provision "shell", privileged: false, inline: <<-SHELL
- echo "<REPLACE public key fingerprint>" >> ~/.ssh/authorized_keys
- SHELL
-
- config.vm.define "apt-systemd" do |config|
- config.vm.box = "ubuntu/wily64"
- config.vm.network "private_network", ip: "172.28.128.3"
- end
- config.vm.define "apt-upstart" do |config|
- config.vm.box = "ubuntu/trusty64"
- config.vm.network "private_network", ip: "172.28.128.4"
- end
- config.vm.define "yum-systemd" do |config|
- config.vm.box = "centos/7"
- config.vm.network "private_network", ip: "172.28.128.5"
- end
- config.vm.define "yum-upstart" do |config|
- config.vm.box = "nrel/CentOS-6.5-x86_64"
- config.vm.network "private_network", ip: "172.28.128.6"
- end
-end
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/728ab331/shared-packaging/src/test/yaml/package.bom
----------------------------------------------------------------------
diff --git a/shared-packaging/src/test/yaml/package.bom b/shared-packaging/src/test/yaml/package.bom
index e050ed6..f4370d8 100644
--- a/shared-packaging/src/test/yaml/package.bom
+++ b/shared-packaging/src/test/yaml/package.bom
@@ -18,22 +18,8 @@
#
brooklyn.catalog:
version: "0.10.0-SNAPSHOT" # BROOKLYN_VERSION
-### brooklyn install entities ###
- apt-config: &apt-config
- install.command: |
- sudo apt-get update
- sudo apt-get install -y default-jre-headless
- sudo dpkg -i brooklyn-package.deb
- yum-config: &yum-config
- install.command: |
- if sudo iptables -L | grep REJECT; then
- # Only for CentOS 6
- sudo iptables -I INPUT -p tcp -m tcp --dport 8081 -j ACCEPT
- sudo service iptables save
- fi
- sudo yum -y install java-1.7.0-openjdk.x86_64
- sudo yum -y install brooklyn-package.rpm
items:
+
- id: systemd-brooklyn
item:
type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess
@@ -44,6 +30,7 @@ brooklyn.catalog:
sudo systemctl status brooklyn
stop.command: |
sudo systemctl stop brooklyn
+
- id: upstart-brooklyn
item:
type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess
@@ -54,26 +41,64 @@ brooklyn.catalog:
sudo status brooklyn | grep running
stop.command: |
sudo stop brooklyn
+
- id: apt-systemd-brooklyn
item:
type: systemd-brooklyn
id: brooklyn
- brooklyn.config: *apt-config
+ brooklyn.config:
+ files.preinstall:
+ $brooklyn:config("package.file") : brooklyn-package.deb
+ install.command: |
+ sudo apt-get update
+ sudo apt-get install -y default-jre-headless
+ sudo dpkg -i brooklyn-package.deb
+
- id: apt-upstart-brooklyn
item:
type: upstart-brooklyn
id: brooklyn
- brooklyn.config: *apt-config
+ brooklyn.config:
+ files.preinstall:
+ $brooklyn:config("package.file"): brooklyn-package.deb
+ install.command: |
+ sudo apt-get update
+ sudo apt-get install -y default-jre-headless
+ sudo dpkg -i brooklyn-package.deb
+
- id: yum-systemd-brooklyn
item:
type: systemd-brooklyn
id: brooklyn
- brooklyn.config: *yum-config
+ brooklyn.config:
+ files.preinstall:
+ $brooklyn:config("package.file"): brooklyn-package.rpm
+ install.command: |
+ if sudo iptables -L | grep REJECT; then
+ # Only for CentOS 6
+ sudo iptables -I INPUT -p tcp -m tcp --dport 8081 -j ACCEPT
+ sudo service iptables save
+ fi
+ sudo yum -y install java-1.7.0-openjdk.x86_64
+ sudo yum -y install brooklyn-package.rpm
+
- id: yum-upstart-brooklyn
item:
type: upstart-brooklyn
id: brooklyn
- brooklyn.config: *yum-config
+ brooklyn.config:
+ files.preinstall:
+ $brooklyn:config("package.file") : brooklyn-package.rpm
+ install.command: |
+ if sudo iptables -L | grep REJECT; then
+ # Only for CentOS 6
+ sudo iptables -I INPUT -p tcp -m tcp --dport 8081 -j ACCEPT
+ sudo service iptables save
+ fi
+ sudo yum -y install java-1.7.0-openjdk.x86_64
+ sudo yum -y install brooklyn-package.rpm
+
+
### Tests ###
- id: test-is-up
item:
[8/9] brooklyn-dist git commit: Closes #47
Posted by sv...@apache.org.
Closes #47
Update tests following changes in files.preinstall inheritance
Need to update the tests following changes in inheritance
of files.preinstall, see apache/brooklyn-server#281.
This allows the tests defined in package-apps.yaml to work again.
Caveat: in the apt-upstart test on my machine, the 13. restart machine
step happens so quickly that Brooklyn doesn't even notice that the Vanilla
Software Process has gone down, so the step `14. check not running while
restarting' fails. Not sure what to do about that; however I have manually
tested that Brooklyn comes up again after the restart.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/cf24ac6e
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/cf24ac6e
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/cf24ac6e
Branch: refs/heads/master
Commit: cf24ac6e9725e52a19facea0f58715378e2a18ab
Parents: 0714056 728ab33
Author: Svetoslav Neykov <sv...@neykov.name>
Authored: Wed Oct 26 09:24:56 2016 +0300
Committer: Svetoslav Neykov <sv...@neykov.name>
Committed: Wed Oct 26 09:24:56 2016 +0300
----------------------------------------------------------------------
shared-packaging/src/test/yaml/Vagrantfile | 51 ++++++++++++++++
.../src/test/yaml/package-apps.yaml | 42 ++-----------
shared-packaging/src/test/yaml/package.bom | 63 ++++++++++++++------
3 files changed, 99 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
[5/9] brooklyn-dist git commit: updated licence
Posted by sv...@apache.org.
updated licence
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/f61cea90
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/f61cea90
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/f61cea90
Branch: refs/heads/master
Commit: f61cea902006623b92164017e2aec8165e9dcae2
Parents: 9dbc43d
Author: Justin Thompson <ju...@cloudsoftcorp.com>
Authored: Wed Oct 19 12:15:35 2016 +0100
Committer: Justin Thompson <ju...@cloudsoftcorp.com>
Committed: Wed Oct 19 12:15:35 2016 +0100
----------------------------------------------------------------------
.../src/main/resources/bin/setenv | 30 +++++++++-----------
1 file changed, 13 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/f61cea90/karaf/apache-brooklyn/src/main/resources/bin/setenv
----------------------------------------------------------------------
diff --git a/karaf/apache-brooklyn/src/main/resources/bin/setenv b/karaf/apache-brooklyn/src/main/resources/bin/setenv
index b424f28..16e5c70 100644
--- a/karaf/apache-brooklyn/src/main/resources/bin/setenv
+++ b/karaf/apache-brooklyn/src/main/resources/bin/setenv
@@ -1,23 +1,19 @@
-#!/usr/bin/env bash
+#!/bin/sh
#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# Brooklyn
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
#
# use default memory settings, if not specified
[6/9] brooklyn-dist git commit: Closes #44
Posted by sv...@apache.org.
Closes #44
Silence Karaf dist brooklyn.info.log
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/c54434b6
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/c54434b6
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/c54434b6
Branch: refs/heads/master
Commit: c54434b66fee37860bb0850c6e46b483d4b3595b
Parents: 3cf8519 5565732
Author: Svetoslav Neykov <sv...@neykov.name>
Authored: Wed Oct 26 09:19:28 2016 +0300
Committer: Svetoslav Neykov <sv...@neykov.name>
Committed: Wed Oct 26 09:19:28 2016 +0300
----------------------------------------------------------------------
.../resources/etc/org.ops4j.pax.logging.cfg | 107 ++++++++++++-------
1 file changed, 70 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
[9/9] brooklyn-dist git commit: Closes #54
Posted by sv...@apache.org.
Closes #54
Added setenv script to karaf bin
This PR does the following:
* adds a setenv script
* sets default memory settings
* checks if java is installed
* sets the local loopback
This PR addresses the following issue
https://issues.apache.org/jira/browse/BROOKLYN-348
and ensures karaf scripts don't fail silently if java is
not installed.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/1a1eae72
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/1a1eae72
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/1a1eae72
Branch: refs/heads/master
Commit: 1a1eae724387ac87049a5ddc71107b07fb36bd4e
Parents: cf24ac6 f61cea9
Author: Svetoslav Neykov <sv...@neykov.name>
Authored: Wed Oct 26 09:27:21 2016 +0300
Committer: Svetoslav Neykov <sv...@neykov.name>
Committed: Wed Oct 26 09:27:21 2016 +0300
----------------------------------------------------------------------
.../src/main/resources/bin/setenv | 47 ++++++++++++++++++++
1 file changed, 47 insertions(+)
----------------------------------------------------------------------