svn commit: r1438979 - in /karaf/trunk: assemblies/features/framework/src/main/resources/resources/etc/system.properties instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties

[jb...@apache.org]

Author: jbonofre
Date: Sat Jan 26 22:35:55 2013
New Revision: 1438979

URL: http://svn.apache.org/viewvc?rev=1438979&view=rev
Log:
[KARAF-2115] Update weaving configuration in system.properties of child instances

Modified:
    karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/system.properties
    karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties

Modified: karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/system.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/system.properties?rev=1438979&r1=1438978&r2=1438979&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/system.properties (original)
+++ karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/system.properties Sat Jan 26 22:35:55 2013
@@ -50,6 +50,16 @@ karaf.default.repository=system
 karaf.shell.init.script=${karaf.home}/etc/shell.init.script
 
 #
+# Deletes the entire karaf.data directory at every start
+#
+karaf.clean.all=false
+
+#
+# Deletes the karaf.data/cache directory at every start
+#
+karaf.clean.cache=false
+
+#
 # Default role name used for console authorization (JMX, SSH and WEB)
 # The syntax is the following:
 #   [classname:]principal
@@ -74,15 +84,8 @@ xml.catalog.files=
 #
 jline.nobell=true
 
-#
-# Deletes the entire karaf.data directory at every start
-#
-karaf.clean.all=false
-
-#
-# Deletes the karaf.data/cache directory at every start
-#
-karaf.clean.cache=false
+# Workaround for KARAF-1117: Jetty will use a JUL logger.
+org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.JavaUtilLog
 
 #
 # ServiceMix specs options

Modified: karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties?rev=1438979&r1=1438978&r2=1438979&view=diff
==============================================================================
--- karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties (original)
+++ karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties Sat Jan 26 22:35:55 2013
@@ -92,3 +92,12 @@ org.eclipse.jetty.util.log.class=org.ecl
 #
 org.apache.servicemix.specs.debug=false
 org.apache.servicemix.specs.timeout=0
+
+#
+# Settings for the OSGi 4.3 Weaving
+# By default, we will not weave any classes. Change this setting to include classes
+# that you application needs to have woven.
+#
+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.*