You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ks...@apache.org on 2014/05/06 20:41:36 UTC
git commit: SM-2276 Upgrade to Karaf 3.0.1
Repository: servicemix
Updated Branches:
refs/heads/master 337486fd7 -> f55eaf810
SM-2276 Upgrade to Karaf 3.0.1
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/f55eaf81
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/f55eaf81
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/f55eaf81
Branch: refs/heads/master
Commit: f55eaf810c990078e06d0585821d5f645465aa10
Parents: 337486f
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Tue May 6 20:40:49 2014 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Tue May 6 20:40:49 2014 +0200
----------------------------------------------------------------------
.../etc/org.apache.karaf.features.cfg | 16 +++++++++++++++-
.../main/resources/etc/org.ops4j.pax.logging.cfg | 6 +++---
.../src/main/resources/etc/system.properties | 19 ++++++++++++++++++-
3 files changed, 36 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/f55eaf81/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
index df2aac6..1c38848 100644
--- a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
+++ b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
@@ -17,7 +17,21 @@
#
################################################################################
-respectStartLvlDuringFeatureStartup=false
+#
+# Defines if the startlvl should be respected during feature startup. The default value is true. The default
+# behavior for 2.x is false (!) for this property
+#
+# Be aware that this property is deprecated and will be removed in Karaf 4.0. So, if you need to
+# set this to false, please use this only as a temporary solution!
+#
+#respectStartLvlDuringFeatureStartup=true
+
+
+#
+# Defines if the startlvl should be respected during feature uninstall. The default value is true.
+# If true, means stop bundles respecting the descend order of start level in a certain feature.
+#
+#respectStartLvlDuringFeatureUninstall=true
#
# Comma separated list of features repositories to register by default
http://git-wip-us.apache.org/repos/asf/servicemix/blob/f55eaf81/assembly/src/main/resources/etc/org.ops4j.pax.logging.cfg
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/etc/org.ops4j.pax.logging.cfg b/assembly/src/main/resources/etc/org.ops4j.pax.logging.cfg
index 61414fc..4c94b0f 100644
--- a/assembly/src/main/resources/etc/org.ops4j.pax.logging.cfg
+++ b/assembly/src/main/resources/etc/org.ops4j.pax.logging.cfg
@@ -27,12 +27,12 @@ log4j.logger.org.apache.sshd.server.channel.ChannelSession = INFO
# 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 | %-16.16t | %-32.32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
+log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
# 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 | %-16.16t | %-32.32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
+log4j.appender.out.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
log4j.appender.out.file=${karaf.data}/log/servicemix.log
log4j.appender.out.append=true
log4j.appender.out.maxFileSize=1MB
@@ -44,6 +44,6 @@ log4j.appender.sift.key=bundle.name
log4j.appender.sift.default=servicemix
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 | %-16.16t | %-32.32c{1} | %m%n
+log4j.appender.sift.appender.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %m%n
log4j.appender.sift.appender.file=${karaf.data}/log/$\\{bundle.name\\}.log
log4j.appender.sift.appender.append=true
http://git-wip-us.apache.org/repos/asf/servicemix/blob/f55eaf81/assembly/src/main/resources/etc/system.properties
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/etc/system.properties b/assembly/src/main/resources/etc/system.properties
index 1b043e3..1aac6bd 100644
--- a/assembly/src/main/resources/etc/system.properties
+++ b/assembly/src/main/resources/etc/system.properties
@@ -66,7 +66,8 @@ karaf.clean.all = false
karaf.clean.cache = false
-# Default role names used for console authorization (JMX, SSH and WEB)
+#
+# Roles to use when logging into a local Karaf console.
#
# The syntax is the following:
# [classname:]principal
@@ -148,3 +149,19 @@ org.apache.cxf.Logger=org.apache.cxf.common.logging.Slf4jLogger
org.apache.aries.proxy.weaving.enabled=none
# Classes not to weave - Aries default + Xerces which is known to have issues.
org.apache.aries.proxy.weaving.disabled=org.objectweb.asm.*,org.slf4j.*,org.apache.log4j.*,javax.*,org.apache.xerces.*
+
+#
+# By default, only Karaf shell commands are secured, but additional services can be
+# secured by expanding this filter
+#
+#karaf.secured.services = (&(osgi.command.scope=*)(osgi.command.function=*))
+
+#
+# Security properties
+#
+# To enable OSGi security, uncomment the properties below,
+# install the framework-security feature and restart.
+#
+#java.security.policy=${karaf.etc}/all.policy
+#org.osgi.framework.security=osgi
+#org.osgi.framework.trust.repositories=${karaf.etc}/trustStore.ks