sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Move to last CVS version of BrowserLauncher2 and added support for Iceweasel

Browse Source
cusax-fix
Damian Minkov 19 years ago
parent ae88c21a11
commit fad975b8af
7 changed files with 28 additions and 49 deletions
Show Stats Download Patch File Download Diff File

BIN
lib/BrowserLauncher2-10rc4.jar
View File

Binary file not shown.

BIN
lib/BrowserLauncher2.jar
View File

Binary file not shown.

2
resources/install/debian/sip-communicator.sh
Unescape View File

@ -25,6 +25,6 @@ cd $SCDIR
if [ -f $javabin ]
then
$javabin -classpath "$LIBPATH/BrowserLauncher2-10rc4.jar:$LIBPATH/JainSipApi1.2.jar:$LIBPATH/JainSipRi1.2.jar:$LIBPATH/Stun4J.jar:$LIBPATH/cindy.jar:$LIBPATH/commons-logging.jar:$LIBPATH/concurrent.jar:$LIBPATH/felix.jar:$LIBPATH/jml-1.0a3.jar:$LIBPATH/joscar-0.9.4-cvs-bin.jar:$LIBPATH/kxml-min.jar:$LIBPATH/nist-sdp-1.0.jar:$LIBPATH/oscar-aim.jar:$LIBPATH/retroweaver-rt.jar:$LIBPATH/retroweaver.jar:$LIBPATH/servicebinder.jar:$LIBPATH/sip-sdp.jar:$LIBPATH/smack.jar:$LIBPATH/smackx.jar" -Dicq.custom.message.charset=windows-1251 -Dfelix.config.properties=file:$LIBPATH/felix.client.run.properties -Djava.util.logging.config.file=$LIBPATH/logging.properties org.apache.felix.main.Main
$javabin -classpath "$LIBPATH/BrowserLauncher2.jar:$LIBPATH/JainSipApi1.2.jar:$LIBPATH/JainSipRi1.2.jar:$LIBPATH/Stun4J.jar:$LIBPATH/cindy.jar:$LIBPATH/commons-logging.jar:$LIBPATH/concurrent.jar:$LIBPATH/felix.jar:$LIBPATH/jml-1.0a3.jar:$LIBPATH/joscar-0.9.4-cvs-bin.jar:$LIBPATH/kxml-min.jar:$LIBPATH/nist-sdp-1.0.jar:$LIBPATH/oscar-aim.jar:$LIBPATH/retroweaver-rt.jar:$LIBPATH/retroweaver.jar:$LIBPATH/servicebinder.jar:$LIBPATH/sip-sdp.jar:$LIBPATH/smack.jar:$LIBPATH/smackx.jar" -Dicq.custom.message.charset=windows-1251 -Dfelix.config.properties=file:$LIBPATH/felix.client.run.properties -Djava.util.logging.config.file=$LIBPATH/logging.properties org.apache.felix.main.Main
exit $?
fi

2
resources/install/linux/run.sh
Unescape View File

@ -1,3 +1,3 @@
export PATH=$PATH:native
export JAVA_HOME=jre
${JAVA_HOME}/bin/java -classpath "lib/JainSipApi1.1.jar:lib/Stun4J.jar:lib/architectureviewer1.1.jar:lib/bcprov-jdk14-130.jar:lib/joscar-0.9.4-cvs-bin.jar:lib/nist-sdp-1.0.jar:lib/nist-sip-1.2.jar:lib/oscar-aim.jar:lib/felix.jar:lib/kxml-min.jar:lib/retroweaver-rt.jar:lib/retroweaver.jar:lib/servicebinder.jar:lib/BrowserLauncher2-10rc4.jar:lib/sip-sdp.jar:lib/cindy.jar:lib/commons-logging.jar:lib/jml-1.0a3.jar" -Dicq.custom.message.charset=windows-1251 -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties org.apache.felix.main.Main
${JAVA_HOME}/bin/java -classpath "lib/JainSipApi1.1.jar:lib/Stun4J.jar:lib/architectureviewer1.1.jar:lib/bcprov-jdk14-130.jar:lib/joscar-0.9.4-cvs-bin.jar:lib/nist-sdp-1.0.jar:lib/nist-sip-1.2.jar:lib/oscar-aim.jar:lib/felix.jar:lib/kxml-min.jar:lib/retroweaver-rt.jar:lib/retroweaver.jar:lib/servicebinder.jar:lib/BrowserLauncher2.jar:lib/sip-sdp.jar:lib/cindy.jar:lib/commons-logging.jar:lib/jml-1.0a3.jar" -Dicq.custom.message.charset=windows-1251 -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties org.apache.felix.main.Main

2
resources/install/windows/run.bat
Unescape View File

@ -1,2 +1,2 @@
set PATH=%PATH%;native
start javaw -classpath "lib/JainSipApi1.1.jar;lib/Stun4J.jar;lib/architectureviewer1.1.jar;lib/bcprov-jdk14-130.jar;lib/joscar-0.9.4-cvs-bin.jar;lib/nist-sdp-1.0.jar;lib/nist-sip-1.2.jar;lib/oscar-aim.jar;lib/felix.jar;lib/kxml-min.jar;lib/retroweaver-rt.jar;lib/retroweaver.jar;lib/servicebinder.jar;lib/BrowserLauncher2-10rc4.jar;lib/sip-sdp.jar;lib/cindy.jar;lib/commons-logging.jar;lib/jml-1.0a3.jar" -Dicq.custom.message.charset=windows-1251 -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties org.apache.felix.main.Main
start javaw -classpath "lib/JainSipApi1.1.jar;lib/Stun4J.jar;lib/architectureviewer1.1.jar;lib/bcprov-jdk14-130.jar;lib/joscar-0.9.4-cvs-bin.jar;lib/nist-sdp-1.0.jar;lib/nist-sip-1.2.jar;lib/oscar-aim.jar;lib/felix.jar;lib/kxml-min.jar;lib/retroweaver-rt.jar;lib/retroweaver.jar;lib/servicebinder.jar;lib/BrowserLauncher2.jar;lib/sip-sdp.jar;lib/cindy.jar;lib/commons-logging.jar;lib/jml-1.0a3.jar" -Dicq.custom.message.charset=windows-1251 -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties org.apache.felix.main.Main

44
src/net/java/sip/communicator/impl/gui/utils/CrossPlatformBrowserLauncher.java
Unescape View File

@ -7,54 +7,42 @@
package net.java.sip.communicator.impl.gui.utils;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.*;
import net.java.sip.communicator.impl.gui.main.message.ChatWindow;
import net.java.sip.communicator.util.Logger;
import edu.stanford.ejalbert.BrowserLauncher;
import edu.stanford.ejalbert.BrowserLauncherRunner;
import edu.stanford.ejalbert.exception.BrowserLaunchingInitializingException;
import edu.stanford.ejalbert.exception.UnsupportedOperatingSystemException;
import edu.stanford.ejalbert.exceptionhandler.BrowserLauncherErrorHandler;
import edu.stanford.ejalbert.*;
import edu.stanford.ejalbert.exception.*;
import edu.stanford.ejalbert.exceptionhandler.*;
import net.java.sip.communicator.util.*;
/**
* Launches a browser, depending on the operation system and the browsers
* available.
*
*
* @author Yana Stamcheva
*/
public class CrossPlatformBrowserLauncher {
private static Logger logger = Logger.getLogger(ChatWindow.class.getName());
private static Logger logger = Logger.getLogger(CrossPlatformBrowserLauncher.class.getName());
private static BrowserLauncher launcher;
/**
* Launches a browser for the given url, depending on the operation system
* and the browsers available.
*
*
* @param urlString The url to open in the browser.
*/
public static void openURL(String urlString) {
try {
launcher = new BrowserLauncher(null);
if (urlString == null || urlString.trim().length() == 0) {
throw new MalformedURLException("You must specify a url.");
}
logger.debug("Creating browser launcher...");
BrowserLauncherRunner runner = new BrowserLauncherRunner(
launcher,
urlString,
null);
logger.debug("Browser launcher created...");
Thread launcherThread = new Thread(runner);
logger.debug("Run browser in a different thread...");
launcherThread.start();
launcher.openURLinBrowser(urlString);
}
catch (BrowserLaunchingInitializingException e) {
logger.error("Failed to initialize browser launcher : " + e);
@ -67,13 +55,13 @@ public static void openURL(String urlString) {
logger.error("The URL string could not be parsed : " + e);
}
}
/**
* The error handler to be passed to the browser launcher runner.
*/
private static class BrowserErrorHandler
implements BrowserLauncherErrorHandler {
public void handleException(Exception ex) {
logger.error(ex);
}

27
src/net/java/sip/communicator/plugin/icqaccregwizz/CrossPlatformBrowserLauncher.java
Unescape View File

@ -17,41 +17,32 @@
/**
* Launches a browser, depending on the operation system and the browsers
* available.
*
*
* @author Yana Stamcheva
*/
public class CrossPlatformBrowserLauncher {
private static Logger logger = Logger.getLogger(
CrossPlatformBrowserLauncher.class.getName());
private static BrowserLauncher launcher;
/**
* Launches a browser for the given url, depending on the operation system
* and the browsers available.
*
*
* @param urlString The url to open in the browser.
*/
public static void openURL(String urlString) {
try {
launcher = new BrowserLauncher(null);
if (urlString == null || urlString.trim().length() == 0) {
throw new MalformedURLException("You must specify a url.");
}
new URL(urlString); // may throw MalformedURLException
BrowserLauncherErrorHandler errorHandler = new BrowserErrorHandler();
String targetBrowser = launcher.getBrowserList().get(0).toString();
BrowserLauncherRunner runner = new BrowserLauncherRunner(
launcher,
targetBrowser,
urlString,
errorHandler);
Thread launcherThread = new Thread(runner);
launcherThread.start();
launcher.openURLinBrowser(urlString);
}
catch (BrowserLaunchingInitializingException e) {
logger.error("Failed to initialize browser launcher : " + e);
@ -64,13 +55,13 @@ public static void openURL(String urlString) {
logger.error("The URL string could not be parsed : " + e);
}
}
/**
* The error handler to be passed to the browser launcher runner.
*/
private static class BrowserErrorHandler
implements BrowserLauncherErrorHandler {
public void handleException(Exception ex) {
logger.error(ex);
}

Write Preview
Loading…
Cancel
Save