diff options
author | Damian Minkov <damencho@jitsi.org> | 2013-11-01 10:11:32 +0200 |
---|---|---|
committer | Damian Minkov <damencho@jitsi.org> | 2013-11-01 17:12:07 +0200 |
commit | 9701f406bd2b165e5d18818cef6c6f5e3a23616c (patch) | |
tree | ae63f3e35b7a959fbdafec1c0050b6275a485ebd | |
parent | 9b94292e57b32c026576eb83c39d298d3143596d (diff) | |
download | jitsi-9701f406bd2b165e5d18818cef6c6f5e3a23616c.zip jitsi-9701f406bd2b165e5d18818cef6c6f5e3a23616c.tar.gz jitsi-9701f406bd2b165e5d18818cef6c6f5e3a23616c.tar.bz2 |
Removes unused bcprovider.jar references.
-rw-r--r-- | resources/install/debian/jitsi.sh.tmpl | 2 | ||||
-rw-r--r-- | resources/install/generic/run.sh | 2 | ||||
-rwxr-xr-x | resources/install/linux/run.sh | 2 | ||||
-rw-r--r-- | src/native/windows/run/run.c | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/resources/install/debian/jitsi.sh.tmpl b/resources/install/debian/jitsi.sh.tmpl index eefa68d..c753a54 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/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:$LIBPATH +CLASSPATH=/usr/share/java/org.apache.felix.framework.jar:/usr/share/java/org.apache.felix.main.jar:$SCDIR/sc-bundles/sc-launcher.jar:$SCDIR/sc-bundles/util.jar/launchutils.jar:$LIBPATH 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/resources/install/generic/run.sh b/resources/install/generic/run.sh index 46b2d9b..a9bf1cc 100644 --- a/resources/install/generic/run.sh +++ b/resources/install/generic/run.sh @@ -12,4 +12,4 @@ then fi export PATH=$PATH:native -java $CLIENTARGS -classpath "lib/felix.jar:lib/bcprovider.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator +java $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator diff --git a/resources/install/linux/run.sh b/resources/install/linux/run.sh index cfe975b..ef3e9ff 100755 --- a/resources/install/linux/run.sh +++ b/resources/install/linux/run.sh @@ -2,4 +2,4 @@ mkdir -p $HOME/.sip-communicator/log export PATH=$PATH:native export JAVA_HOME=jre -${JAVA_HOME}/bin/java -classpath "lib/bcprovider.jar:lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djna.library.path=native -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator +${JAVA_HOME}/bin/java -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djna.library.path=native -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator diff --git a/src/native/windows/run/run.c b/src/native/windows/run/run.c index 6a2393e..854d841 100644 --- a/src/native/windows/run/run.c +++ b/src/native/windows/run/run.c @@ -510,7 +510,6 @@ Run_getJavaVMOptionStrings LPCTSTR classpath[]
= {
_T("lib\\felix.jar"),
- _T("lib\\bcprovider.jar"),
_T("sc-bundles\\sc-launcher.jar"),
_T("sc-bundles\\util.jar"),
_T("lib"),
|