From a81990375b4d94590020c420bf1c68f6decff804 Mon Sep 17 00:00:00 2001 From: Damian Minkov Date: Tue, 21 May 2013 20:00:20 +0300 Subject: [PATCH] Updates classpath in windows and debian to make jitsi-defaults.properties discoverable. --- resources/install/debian/jitsi.sh.tmpl | 2 +- src/native/windows/run/run.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/install/debian/jitsi.sh.tmpl b/resources/install/debian/jitsi.sh.tmpl index c453ca389..c3d0223ea 100644 --- a/resources/install/debian/jitsi.sh.tmpl +++ b/resources/install/debian/jitsi.sh.tmpl @@ -15,7 +15,7 @@ javabin=`which java` SCDIR=/usr/share/_PACKAGE_NAME_ LIBPATH=$SCDIR/lib -CLASSPATH=/usr/share/java/jdic.jar:/usr/share/java/org.apache.felix.framework.jar:/usr/share/java/org.apache.felix.main.jar:$LIBPATH/bcprovider.jar:$SCDIR/sc-bundles/sc-launcher.jar:$SCDIR/sc-bundles/util.jar/launchutils.jar +CLASSPATH=/usr/share/java/jdic.jar:/usr/share/java/org.apache.felix.framework.jar:/usr/share/java/org.apache.felix.main.jar:$LIBPATH/bcprovider.jar:$SCDIR/sc-bundles/sc-launcher.jar:$SCDIR/sc-bundles/util.jar/launchutils.jar:$SCDIR FELIX_CONFIG=$LIBPATH/felix.client.run.properties LOG_CONFIG=$LIBPATH/logging.properties COMMAND="$javabin $CLIENTARGS -classpath $CLASSPATH -Djna.library.path=/usr/lib/jni -Dfelix.config.properties=file:$FELIX_CONFIG -Djava.util.logging.config.file=$LOG_CONFIG net.java.sip.communicator.launcher.SIPCommunicator" diff --git a/src/native/windows/run/run.c b/src/native/windows/run/run.c index ca129bcc3..ca08aa427 100644 --- a/src/native/windows/run/run.c +++ b/src/native/windows/run/run.c @@ -515,6 +515,7 @@ Run_getJavaVMOptionStrings _T("lib\\bcprovider.jar"), _T("sc-bundles\\sc-launcher.jar"), _T("sc-bundles\\util.jar"), + _T("lib"), NULL }; LPCTSTR properties[]