Repository: servicemix Updated Branches: refs/heads/servicemix-5.3.x a4327ca73 -> 552239a17
SM-2555: Upgrade to Karaf 2.4.3 Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/552239a1 Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/552239a1 Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/552239a1 Branch: refs/heads/servicemix-5.3.x Commit: 552239a17a315f9c3ca95e936c85e5be566d69af Parents: a4327ca Author: Krzysztof Sobkowiak <[email protected]> Authored: Tue Jul 14 23:30:25 2015 +0200 Committer: Krzysztof Sobkowiak <[email protected]> Committed: Tue Jul 14 23:30:25 2015 +0200 ---------------------------------------------------------------------- .../src/main/resources/etc/system.properties | 21 ++++++++++++++++++++ parent/pom.xml | 4 ++-- 2 files changed, 23 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix/blob/552239a1/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 cd266c5..207b819 100644 --- a/assembly/src/main/resources/etc/system.properties +++ b/assembly/src/main/resources/etc/system.properties @@ -113,6 +113,13 @@ org.apache.aries.proxy.weaving.disabled=org.objectweb.asm.*,org.slf4j.*,org.apac #karaf.secured.services = (&(osgi.command.scope=*)(osgi.command.function=*)) # +# By default, if there's no ACL policy for a certain karaf command, this command is allowed to access +# without the RBAC. We can change this behavior by enable the following property, which means +# if a karaf command has no corresponding ACL then access it must have one of the karaf.secured.command.compulsory.roles +# +#karaf.secured.command.compulsory.roles=admin + +# # Security properties # # To enable OSGi security, uncomment the properties below, @@ -123,6 +130,20 @@ org.apache.aries.proxy.weaving.disabled=org.objectweb.asm.*,org.slf4j.*,org.apac #org.osgi.framework.trust.repositories=${karaf.home}/etc/trustStore.ks # +# HA/Lock configuration +# +# Karaf uses a lock mechanism to know which instance is the master (HA) +# The lock can be on the filesystem (default) or on a database. +# +# See http://karaf.apache.org/manual/latest/users-guide/failover.html for details. +# +# Even using a single instance, Karaf creates the lock file +# You can specify the location of the lock file using the +# karaf.lock.dir=/path/to/the/directory/containing/the/lock +# + + +# # Default port for the OSGI HTTP Service # org.osgi.service.http.port=8181 http://git-wip-us.apache.org/repos/asf/servicemix/blob/552239a1/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index e14ce0e..be4ab6d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -44,11 +44,11 @@ <cxf.codegen-plugin.version>${cxf.version}</cxf.codegen-plugin.version> <felix.bundlerepository.version>2.0.4</felix.bundlerepository.version> - <karaf.version>2.4.2</karaf.version> + <karaf.version>2.4.3</karaf.version> <aries.proxy.version>1.0.4</aries.proxy.version> <aries.util.version>1.1.0</aries.util.version> <aries.blueprint.core.version>1.4.3</aries.blueprint.core.version> - <pax.logging.version>1.8.2</pax.logging.version> + <pax.logging.version>1.8.3</pax.logging.version> <akka.version>2.2.3</akka.version> <scala.version>2.10.4</scala.version>
