You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2010/10/13 22:36:21 UTC
svn commit: r1022284 - in /servicemix/smx4/features/trunk: ./
assembly/src/main/distribution/text/etc/
assembly/src/main/filtered-resources/etc/
Author: jbonofre
Date: Wed Oct 13 20:36:20 2010
New Revision: 1022284
URL: http://svn.apache.org/viewvc?rev=1022284&view=rev
Log:
[SMX4-602] Fix jre.properties to properly load the JRE packages.
Added:
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg
Removed:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg
Modified:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/custom.properties
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/jre.properties
servicemix/smx4/features/trunk/pom.xml
Added: servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg?rev=1022284&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg (added)
+++ servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg Wed Oct 13 20:36:20 2010
@@ -0,0 +1,46 @@
+################################################################################
+#
+# 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.
+#
+################################################################################
+
+# Root logger
+log4j.rootLogger=INFO, out, 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 | %-16.16t | %-32.32c{1} | %-32.32C %4L | %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} | %-32.32C %4L | %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
+log4j.appender.out.maxBackupIndex=10
+
+# Sift appender
+log4j.appender.sift=org.apache.log4j.sift.MDCSiftingAppender
+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} | %-32.32C %4L | %m%n
+log4j.appender.sift.appender.file=${karaf.data}/log/$\\{bundle.name\\}.log
+log4j.appender.sift.appender.append=true
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/custom.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/custom.properties?rev=1022284&r1=1022283&r2=1022284&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/custom.properties (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/custom.properties Wed Oct 13 20:36:20 2010
@@ -22,6 +22,8 @@
# All the values specified here will override the default value.
#
+karaf.systemBundlesStartLevel=50
+
obr.repository.url=http://svn.apache.org/repos/asf/servicemix/smx4/obr-repo/repository.xml
org.osgi.framework.system.packages.extra = \
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/jre.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/jre.properties?rev=1022284&r1=1022283&r2=1022284&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/jre.properties (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/jre.properties Wed Oct 13 20:36:20 2010
@@ -24,7 +24,7 @@
# Standard package set. Note that:
# - javax.transaction* is exported with a mandatory attribute
-jre-1.5=, \
+jre-1.5= \
javax.accessibility, \
javax.activity, \
javax.crypto, \
@@ -151,7 +151,7 @@ jre-1.5=, \
# Standard package set. Note that:
# - javax.transaction* is exported with a mandatory attribute
# - javax.activation, javax.annotation*, javax.jws*, javax.script*, javax.xml.bind*, javax.xml.soap, javax.xml.ws* packages are not exported
-jre-1.6=, \
+jre-1.6= \
com.sun.org.apache.xalan.internal.xsltc.trax, \
com.sun.org.apache.xerces.internal.dom, \
com.sun.org.apache.xerces.internal.jaxp, \
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=1022284&r1=1022283&r2=1022284&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Wed Oct 13 20:36:20 2010
@@ -107,7 +107,7 @@
<aries.transaction.version>0.2-incubating</aries.transaction.version>
<felix.fileinstall.version>3.0.2</felix.fileinstall.version>
<felix.prefs.version>1.0.4</felix.prefs.version>
- <karaf.version>2.0.0</karaf.version>
+ <karaf.version>2.1.0</karaf.version>
<osgi.compendium.version>4.2.0</osgi.compendium.version>
<osgi.core.version>4.2.0</osgi.core.version>