[Winstone-devel] winstone/src/java/winstone LocalStrings.properties,1.37,1.38 Launcher.java,1.17,1.1
Status: Beta
Brought to you by:
rickknowles
From: Rick K. <ric...@us...> - 2006-01-25 10:14:50
|
Update of /cvsroot/winstone/winstone/src/java/winstone In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29353/src/java/winstone Modified Files: LocalStrings.properties Launcher.java HttpListener.java Log Message: Updating to support jdk1.3 Index: LocalStrings.properties =================================================================== RCS file: /cvsroot/winstone/winstone/src/java/winstone/LocalStrings.properties,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** LocalStrings.properties 15 Jan 2006 08:34:53 -0000 1.37 --- LocalStrings.properties 25 Jan 2006 10:14:41 -0000 1.38 *************** *** 305,308 **** --- 305,310 ---- Launcher.EmbeddedWebroot=winstoneEmbeddedWAR Launcher.CopyingEmbeddedWarfile=Extracting embedded warfile to [#0] + Launcher.ListenerStartupError=Error starting listener instance + Launcher.NeedsJDK14=Listener class [#0] needs JDK1.4 support. Disabling Launcher.UsageInstructions=[#0], (c) 2003, 2004, 2005 Rick Knowles\n\ Index: Launcher.java =================================================================== RCS file: /cvsroot/winstone/winstone/src/java/winstone/Launcher.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Launcher.java 15 Jan 2006 08:34:53 -0000 1.17 --- Launcher.java 25 Jan 2006 10:14:41 -0000 1.18 *************** *** 27,30 **** --- 27,31 ---- import java.io.OutputStream; import java.lang.reflect.Constructor; + import java.lang.reflect.InvocationTargetException; import java.net.ServerSocket; import java.net.Socket; *************** *** 206,211 **** this.listeners = new ArrayList(); spawnListener(HTTP_LISTENER_CLASS); - spawnListener(HTTPS_LISTENER_CLASS); spawnListener(AJP_LISTENER_CLASS); this.controlThread = new Thread(this, RESOURCES.getString( --- 207,218 ---- this.listeners = new ArrayList(); spawnListener(HTTP_LISTENER_CLASS); spawnListener(AJP_LISTENER_CLASS); + try { + Class.forName("javax.net.ServerSocketFactory"); + spawnListener(HTTPS_LISTENER_CLASS); + } catch (ClassNotFoundException err) { + Logger.log(Logger.DEBUG, RESOURCES, + "Launcher.NeedsJDK14", HTTPS_LISTENER_CLASS); + } this.controlThread = new Thread(this, RESOURCES.getString( *************** *** 235,240 **** this.listeners.add(listener); } catch (Throwable err) { ! Logger.log(Logger.DEBUG, RESOURCES, ! "Launcher.ListenerNotFound", listenerClassName); } } --- 242,253 ---- this.listeners.add(listener); } catch (Throwable err) { ! if ((err instanceof InvocationTargetException) && ! (err.getCause() instanceof WinstoneException)) { ! Logger.log(Logger.DEBUG, RESOURCES, ! "Launcher.ListenerNotFound", listenerClassName); ! } else { ! Logger.log(Logger.ERROR, RESOURCES, ! "Launcher.ListenerStartupError", listenerClassName, err); ! } } } Index: HttpListener.java =================================================================== RCS file: /cvsroot/winstone/winstone/src/java/winstone/HttpListener.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** HttpListener.java 13 Jan 2006 02:02:58 -0000 1.9 --- HttpListener.java 25 Jan 2006 10:14:41 -0000 1.10 *************** *** 20,23 **** --- 20,24 ---- import java.io.IOException; import java.io.InputStream; + import java.io.InterruptedIOException; import java.io.OutputStream; import java.net.InetAddress; *************** *** 25,29 **** import java.net.Socket; import java.net.SocketException; - import java.net.SocketTimeoutException; import java.util.ArrayList; import java.util.List; --- 26,29 ---- *************** *** 236,240 **** Logger.log(Logger.FULL_DEBUG, Launcher.RESOURCES, "HttpListener.WaitingForURILine"); uriBuffer = inData.readLine(); ! } catch (SocketTimeoutException err) { // keep alive timeout ? ignore if not first if (iAmFirst) { --- 236,240 ---- Logger.log(Logger.FULL_DEBUG, Launcher.RESOURCES, "HttpListener.WaitingForURILine"); uriBuffer = inData.readLine(); ! } catch (InterruptedIOException err) { // keep alive timeout ? ignore if not first if (iAmFirst) { |