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/04/14 23:28:58 UTC
[4/4] git commit: SM-2281 Upgrade to Karaf 2.3.5
SM-2281 Upgrade to Karaf 2.3.5
(cherry picked from the commit 5b901cadd5b2531250b316cccae8cf685983b040)
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/4ca3c680
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/4ca3c680
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/4ca3c680
Branch: refs/heads/master
Commit: 4ca3c6802d956509d4d54cd6787dd43a2fd2cd51
Parents: 78f9aea
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Mon Apr 14 22:50:24 2014 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Mon Apr 14 22:53:29 2014 +0200
----------------------------------------------------------------------
.../etc/org.apache.karaf.features.cfg | 2 +
assembly/src/main/resources/etc/jre.properties | 161 +++++++++++++++++++
.../etc/org.apache.karaf.features.obr.cfg | 10 ++
.../resources/etc/org.ops4j.pax.logging.cfg | 3 +
.../src/main/resources/etc/system.properties | 8 +-
.../itests/IntegrationTestConfigurations.scala | 2 +-
parent/pom.xml | 4 +-
pom.xml | 6 +-
8 files changed, 184 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/4ca3c680/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 9bedf60..29d4ebd 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,6 +17,8 @@
#
################################################################################
+respectStartLvlDuringFeatureStartup=false
+
#
# Comma separated list of features repositories to register by default
#
http://git-wip-us.apache.org/repos/asf/servicemix/blob/4ca3c680/assembly/src/main/resources/etc/jre.properties
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/etc/jre.properties b/assembly/src/main/resources/etc/jre.properties
index 458a9a2..12d0002 100644
--- a/assembly/src/main/resources/etc/jre.properties
+++ b/assembly/src/main/resources/etc/jre.properties
@@ -346,3 +346,164 @@ jre-1.7= \
org.xml.sax, \
org.xml.sax.ext, \
org.xml.sax.helpers
+
+jre-1.8= \
+ javax.accessibility, \
+ javax.activation;version="1.1", \
+ javax.activity, \
+ javax.annotation;version="1.2", \
+ javax.annotation.processing;version="1.2", \
+ javax.crypto, \
+ javax.crypto.interfaces, \
+ javax.crypto.spec, \
+ javax.imageio, \
+ javax.imageio.event, \
+ javax.imageio.metadata, \
+ javax.imageio.plugins.bmp, \
+ javax.imageio.plugins.jpeg, \
+ javax.imageio.spi, \
+ javax.imageio.stream, \
+ javax.jws;version="2.0", \
+ javax.jws.soap;version="2.0", \
+ javax.lang.model, \
+ javax.lang.model.element, \
+ javax.lang.model.type, \
+ javax.lang.model.util, \
+ javax.management, \
+ javax.management.loading, \
+ javax.management.modelmbean, \
+ javax.management.monitor, \
+ javax.management.openmbean, \
+ javax.management.relation, \
+ javax.management.remote, \
+ javax.management.remote.rmi, \
+ javax.management.timer, \
+ javax.naming, \
+ javax.naming.directory, \
+ javax.naming.event, \
+ javax.naming.ldap, \
+ javax.naming.spi, \
+ javax.net, \
+ javax.net.ssl, \
+ javax.print, \
+ javax.print.attribute, \
+ javax.print.attribute.standard, \
+ javax.print.event, \
+ javax.rmi, \
+ javax.rmi.CORBA, \
+ javax.rmi.ssl, \
+ javax.script, \
+ javax.security.auth, \
+ javax.security.auth.callback, \
+ javax.security.auth.kerberos, \
+ javax.security.auth.login, \
+ javax.security.auth.spi, \
+ javax.security.auth.x500, \
+ javax.security.cert, \
+ javax.security.sasl, \
+ javax.sound.midi, \
+ javax.sound.midi.spi, \
+ javax.sound.sampled, \
+ javax.sound.sampled.spi, \
+ javax.sql, \
+ javax.sql.rowset, \
+ javax.sql.rowset.serial, \
+ javax.sql.rowset.spi, \
+ javax.swing, \
+ javax.swing.border, \
+ javax.swing.colorchooser, \
+ javax.swing.event, \
+ javax.swing.filechooser, \
+ javax.swing.plaf, \
+ javax.swing.plaf.basic, \
+ javax.swing.plaf.metal, \
+ javax.swing.plaf.multi, \
+ javax.swing.plaf.synth, \
+ javax.swing.table, \
+ javax.swing.text, \
+ javax.swing.text.html, \
+ javax.swing.text.html.parser, \
+ javax.swing.text.rtf, \
+ javax.swing.tree, \
+ javax.swing.undo, \
+ javax.tools, \
+ javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \
+ javax.xml, \
+ javax.xml.bind;version="2.2.1", \
+ javax.xml.bind.annotation;version="2.2.1", \
+ javax.xml.bind.annotation.adapters;version="2.2.1", \
+ javax.xml.bind.attachment;version="2.2.1", \
+ javax.xml.bind.helpers;version="2.2.1", \
+ javax.xml.bind.util;version="2.2.1", \
+ javax.xml.crypto, \
+ javax.xml.crypto.dom, \
+ javax.xml.crypto.dsig, \
+ javax.xml.crypto.dsig.dom, \
+ javax.xml.crypto.dsig.keyinfo, \
+ javax.xml.crypto.dsig.spec, \
+ javax.xml.datatype, \
+ javax.xml.namespace, \
+ javax.xml.parsers, \
+ javax.xml.soap;version="1.3", \
+ javax.xml.stream;version="1.2", \
+ javax.xml.stream.events;version="1.2", \
+ javax.xml.stream.util;version="1.2", \
+ javax.xml.transform, \
+ javax.xml.transform.dom, \
+ javax.xml.transform.sax, \
+ javax.xml.transform.stax, \
+ javax.xml.transform.stream, \
+ javax.xml.validation, \
+ javax.xml.ws;version="2.2", \
+ javax.xml.ws.handler;version="2.2", \
+ javax.xml.ws.handler.soap;version="2.2", \
+ javax.xml.ws.http;version="2.2", \
+ javax.xml.ws.soap;version="2.2", \
+ javax.xml.ws.spi;version="2.2", \
+ javax.xml.ws.wsaddressing;version="2.2", \
+ javax.xml.ws.spi.http;version="2.2", \
+ javax.xml.xpath, \
+ org.ietf.jgss, \
+ org.omg.CORBA, \
+ org.omg.CORBA_2_3, \
+ org.omg.CORBA_2_3.portable, \
+ org.omg.CORBA.DynAnyPackage, \
+ org.omg.CORBA.ORBPackage, \
+ org.omg.CORBA.portable, \
+ org.omg.CORBA.TypeCodePackage, \
+ org.omg.CosNaming, \
+ org.omg.CosNaming.NamingContextExtPackage, \
+ org.omg.CosNaming.NamingContextPackage, \
+ org.omg.Dynamic, \
+ org.omg.DynamicAny, \
+ org.omg.DynamicAny.DynAnyFactoryPackage, \
+ org.omg.DynamicAny.DynAnyPackage, \
+ org.omg.IOP, \
+ org.omg.IOP.CodecFactoryPackage, \
+ org.omg.IOP.CodecPackage, \
+ org.omg.Messaging, \
+ org.omg.PortableInterceptor, \
+ org.omg.PortableInterceptor.ORBInitInfoPackage, \
+ org.omg.PortableServer, \
+ org.omg.PortableServer.CurrentPackage, \
+ org.omg.PortableServer.POAManagerPackage, \
+ org.omg.PortableServer.POAPackage, \
+ org.omg.PortableServer.portable, \
+ org.omg.PortableServer.ServantLocatorPackage, \
+ org.omg.SendingContext, \
+ org.omg.stub.java.rmi, \
+ org.omg.stub.javax.management.remote.rmi, \
+ org.w3c.dom, \
+ org.w3c.dom.bootstrap, \
+ org.w3c.dom.css, \
+ org.w3c.dom.events, \
+ org.w3c.dom.html, \
+ org.w3c.dom.ls, \
+ org.w3c.dom.ranges, \
+ org.w3c.dom.stylesheets, \
+ org.w3c.dom.traversal, \
+ org.w3c.dom.views, \
+ org.w3c.dom.xpath, \
+ org.xml.sax, \
+ org.xml.sax.ext, \
+ org.xml.sax.helpers
http://git-wip-us.apache.org/repos/asf/servicemix/blob/4ca3c680/assembly/src/main/resources/etc/org.apache.karaf.features.obr.cfg
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/etc/org.apache.karaf.features.obr.cfg b/assembly/src/main/resources/etc/org.apache.karaf.features.obr.cfg
index ec72283..bb459b2 100644
--- a/assembly/src/main/resources/etc/org.apache.karaf.features.obr.cfg
+++ b/assembly/src/main/resources/etc/org.apache.karaf.features.obr.cfg
@@ -26,3 +26,13 @@
# false (do not attempt to resolve optional imports).
#
resolveOptionalImports = true
+
+#
+# Defines whether resolved bundles should be started by default. The default is true.
+#
+startByDefault = true
+
+#
+# Defines the start level for resolved bundles. The default is 80.
+#
+startLevel = 80
http://git-wip-us.apache.org/repos/asf/servicemix/blob/4ca3c680/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 515fdc8..61414fc 100644
--- a/assembly/src/main/resources/etc/org.ops4j.pax.logging.cfg
+++ b/assembly/src/main/resources/etc/org.ops4j.pax.logging.cfg
@@ -21,6 +21,9 @@
log4j.rootLogger=INFO, out, osgi:VmLogAppender
log4j.throwableRenderer=org.apache.log4j.OsgiThrowableRenderer
+# To avoid flooding the log when using DEBUG level on an ssh connection and doing log:tail
+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
http://git-wip-us.apache.org/repos/asf/servicemix/blob/4ca3c680/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 e34c95b..d0f5e07 100644
--- a/assembly/src/main/resources/etc/system.properties
+++ b/assembly/src/main/resources/etc/system.properties
@@ -49,6 +49,7 @@ karaf.default.repository=system
#
karaf.shell.init.script=${karaf.home}/etc/shell.init.script
+#
# Sets the maximum size of the shell command history. If not set,
# defaults to 500 entries. Setting to 0 will disable history.
#
@@ -68,8 +69,6 @@ karaf.shell.init.script=${karaf.home}/etc/shell.init.script
#
karaf.admin.role=admin
-
-
#
# Set this empty property to avoid errors when validating xml documents.
#
@@ -85,7 +84,7 @@ jline.nobell=true
# ServiceMix specs options
#
org.apache.servicemix.specs.debug=false
-org.apache.servicemix.specs.timeout=100
+org.apache.servicemix.specs.timeout=0
#
# Default port for the OSGI HTTP Service
@@ -130,9 +129,6 @@ javax.xml.transform.TransformerFactory=org.apache.xalan.processor.TransformerFac
#
org.apache.cxf.Logger=org.apache.cxf.common.logging.Slf4jLogger
-# Workaround for KARAF-1117: Jetty will use a JUL logger.
-org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.JavaUtilLog
-
#
# Settings for the OSGi 4.3 Weaving
# By default, we will not weave any classes. Change this setting to include classes
http://git-wip-us.apache.org/repos/asf/servicemix/blob/4ca3c680/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala
----------------------------------------------------------------------
diff --git a/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala b/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala
index 06e899a..c4479e5 100644
--- a/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala
+++ b/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala
@@ -51,7 +51,7 @@ trait IntegrationTestConfigurations {
karafDistributionConfiguration().
frameworkUrl(
maven().groupId("org.apache.servicemix").artifactId(artifact).`type`("zip").versionAsInProject()).
- karafVersion("2.3.4").name("Apache ServiceMix (${name})").
+ karafVersion("2.3.5").name("Apache ServiceMix (${name})").
unpackDirectory(new File(s"target/pax-exam/${artifact}")).
useDeployFolder(false),
keepRuntimeFolder(),
http://git-wip-us.apache.org/repos/asf/servicemix/blob/4ca3c680/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index f085757..f5da2aa 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -42,10 +42,10 @@
<camel.version>2.13.0</camel.version>
<cxf.version>2.7.10</cxf.version>
<felix.obr.version>1.6.6</felix.obr.version>
- <karaf.version>2.3.4</karaf.version>
+ <karaf.version>2.3.5</karaf.version>
<aries.proxy.version>1.0.2</aries.proxy.version>
<aries.util.version>1.1.0</aries.util.version>
- <aries.blueprint.core.version>1.3.0</aries.blueprint.core.version>
+ <aries.blueprint.core.version>1.4.0</aries.blueprint.core.version>
<aries.transaction.version>1.0.1</aries.transaction.version>
<pax.logging.version>1.7.2</pax.logging.version>
<akka.version>2.2.3</akka.version>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/4ca3c680/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b6ab23e..0156517 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,7 +75,7 @@
<geronimo-atinject.version>1.0</geronimo-atinject.version>
<!-- ServiceMix Bundles -->
- <commons-codec.bundle.version>1.8</commons-codec.bundle.version>
+ <commons-codec.bundle.version>1.9</commons-codec.bundle.version>
<commons-dbcp.bundle.version>1.4_3</commons-dbcp.bundle.version>
<commons-httpclient.bundle.version>3.1_7</commons-httpclient.bundle.version>
<commons-io.version>2.4</commons-io.version>
@@ -121,9 +121,9 @@
<xml.api.version>2.11.0-20110622</xml.api.version>
<xalan.version>2.7.1</xalan.version>
<pax.exam.version>3.4.0</pax.exam.version>
- <pax.url.version>1.3.6</pax.url.version>
+ <pax.url.version>1.3.7</pax.url.version>
<postgresql.version>9.1-901</postgresql.version>
- <slf4j.version>1.6.6</slf4j.version>
+ <slf4j.version>1.7.5</slf4j.version>
<spring.version>3.2.4.RELEASE</spring.version>
<wss4j.version>1.6.7</wss4j.version>
</properties>