You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ge...@apache.org on 2010/09/30 11:58:12 UTC
svn commit: r1002983 - in /karaf/trunk/assembly: pom.xml
src/main/filtered-resources/bin/client
src/main/filtered-resources/bin/client.bat
src/main/filtered-resources/etc/config.properties
Author: gertv
Date: Thu Sep 30 09:58:12 2010
New Revision: 1002983
URL: http://svn.apache.org/viewvc?rev=1002983&view=rev
Log:
KARAF-238: SLF4J Duplicate bindings warning when using Equinox
Modified:
karaf/trunk/assembly/pom.xml
karaf/trunk/assembly/src/main/filtered-resources/bin/client
karaf/trunk/assembly/src/main/filtered-resources/bin/client.bat
karaf/trunk/assembly/src/main/filtered-resources/etc/config.properties
Modified: karaf/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/pom.xml?rev=1002983&r1=1002982&r2=1002983&view=diff
==============================================================================
--- karaf/trunk/assembly/pom.xml (original)
+++ karaf/trunk/assembly/pom.xml Thu Sep 30 09:58:12 2010
@@ -367,7 +367,7 @@
<artifactItem>
<groupId>org.apache.karaf</groupId>
<artifactId>org.apache.karaf.client</artifactId>
- <outputDirectory>target/dependencies/lib</outputDirectory>
+ <outputDirectory>target/dependencies/lib/bin</outputDirectory>
<destFileName>karaf-client.jar</destFileName>
</artifactItem>
<artifactItem>
Modified: karaf/trunk/assembly/src/main/filtered-resources/bin/client
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/bin/client?rev=1002983&r1=1002982&r2=1002983&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/bin/client (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/bin/client Thu Sep 30 09:58:12 2010
@@ -245,7 +245,7 @@ setupDefaults() {
fi
# Add the jars in the lib dir
- CLASSPATH="$KARAF_HOME/lib/karaf-client.jar"
+ CLASSPATH="$KARAF_HOME/lib/bin/karaf-client.jar"
CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/apache/sshd/sshd-core/${sshd.version}/sshd-core-${sshd.version}.jar"
CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/apache/mina/mina-core/${mina.version}/mina-core-${mina.version}.jar"
CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/apache/karaf/shell/org.apache.karaf.shell.console/${project.version}/org.apache.karaf.shell.console-${project.version}.jar"
Modified: karaf/trunk/assembly/src/main/filtered-resources/bin/client.bat
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/bin/client.bat?rev=1002983&r1=1002982&r2=1002983&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/bin/client.bat (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/bin/client.bat Thu Sep 30 09:58:12 2010
@@ -81,7 +81,7 @@ if "%KARAF_DEBUG%" == "" goto :KARAF_DEB
call :warn Enabling Java debug options: %JAVA_DEBUG_OPTS%
:KARAF_DEBUG_END
-set CLASSPATH=%KARAF_HOME%\lib\karaf-client.jar
+set CLASSPATH=%KARAF_HOME%\lib\bin\karaf-client.jar
set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\apache\sshd\sshd-core\${sshd.version}\sshd-core-${sshd.version}.jar
set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\apache\mina\mina-core\${mina.version}\mina-core-${mina.version}.jar
set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\apache\karaf\shell\org.apache.karaf.shell.console\${project.version}\org.apache.karaf.shell.console-${project.version}.jar
Modified: karaf/trunk/assembly/src/main/filtered-resources/etc/config.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/etc/config.properties?rev=1002983&r1=1002982&r2=1002983&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/etc/config.properties (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/etc/config.properties Thu Sep 30 09:58:12 2010
@@ -56,6 +56,9 @@ org.osgi.framework.bootdelegation=sun.*,
# OSGi Execution Environment
org.osgi.framework.executionenvironment=J2SE-1.5,J2SE-1.4,J2SE-1.3
+# Set the parent classloader for the bundle to the classloader that loads the Framework (i.e. everything in lib/*.jar)
+org.osgi.framework.bundle.parent=framework
+
# To enable the use of the startup.properties file to control the start level:
karaf.auto.start=startup.properties
@@ -79,11 +82,6 @@ felix.fileinstall.noInitialDelay = true
eclipse.stateSaveDelayInterval = 1000
#
-# equinox boot classloader configuration
-#
-osgi.parentClassloader = fwk
-
-#
# OBR Repository list
# This property will be modified by the obr:addUrl and obr:removeUrl commands.
#