jukebox4-cvs Mailing List for Jukebox
Brought to you by:
vtt
Menu
▾
▴
jukebox4-cvs
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
(48) |
Apr
(33) |
May
(23) |
Jun
(55) |
Jul
(79) |
Aug
(48) |
Sep
(12) |
Oct
(23) |
Nov
(23) |
Dec
(4) |
|---|
|
From: CVS B. <vt...@fr...> - 2000-12-07 03:45:21
|
User: vt Date: 00/12/06 20:41:15 J5/src/scripts/test - New directory |
|
From: CVS B. <vt...@fr...> - 2000-12-07 03:45:21
|
User: vt Date: 00/12/06 20:41:04 J5/src/scripts - New directory |
|
From: CVS B. <vt...@fr...> - 2000-12-07 03:45:21
|
User: vt Date: 00/12/06 20:41:14 J5/src/scripts/install - New directory |
|
From: CVS B. <vt...@fr...> - 2000-12-07 03:45:21
|
User: vt Date: 00/12/06 20:41:14 J5/src/scripts/run - New directory |
User: vt
Date: 00/11/01 23:57:44
Modified: src/java/gnu/j4/examples Base64Example.java
ChunkedClientTest.java ClientTest.java
ConfigTest.java ServerTest.java SimpleService.java
TelnetTest.java XmlConfigTest.java
Log:
Checkpoint on the way to implement a shutdown(Throwable failureCause) call,
as opposed to no-argument shutdown(). Point is, I want to know why the
execute() died, if it did.
Revision Changes Path
1.4 +2 -2 J4/src/java/gnu/j4/examples/Base64Example.java
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/Base64Example.java?annotate=1.4&cvsroot=jukebox4
CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/Base64Example.java?rev=1.4&content-type=text/x-cvsweb-markup&cvsroot=jukebox4
CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/Base64Example.java.diff?r1=1.4&r2=1.3&cvsroot=jukebox4
-----------------------------------
Index: Base64Example.java
===================================================================
RCS file: /usr/local/cvs/J4/src/java/gnu/j4/examples/Base64Example.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Base64Example.java 2000/10/25 06:54:52 1.3
+++ Base64Example.java 2000/11/02 06:57:43 1.4
@@ -15,7 +15,7 @@
* MIME Base64 encoding/decoding example.
*
* @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1995-1998
- * @version $Id: Base64Example.java,v 1.3 2000/10/25 06:54:52 vt Exp $
+ * @version $Id: Base64Example.java,v 1.4 2000/11/02 06:57:43 vt Exp $
*/
public class Base64Example extends ActiveService {
@@ -75,7 +75,7 @@
* @exception InterruptedException if this thread was interrupted by
* another thread.
*/
- protected void shutdown() throws InterruptedException { complain(
+ protected void shutdown(Throwable failureCause) throws InterruptedException { complain(
LOG_NOTICE,CH_BASE64,"shutdown: cleaning up" );
}
1.5 +2 -2 J4/src/java/gnu/j4/examples/ChunkedClientTest.java
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/ChunkedClientTest.java?annotate=1.5&cvsroot=jukebox4
CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/ChunkedClientTest.java?rev=1.5&content-type=text/x-cvsweb-markup&cvsroot=jukebox4
CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/ChunkedClientTest.java.diff?r1=1.5&r2=1.4&cvsroot=jukebox4
-----------------------------------
Index: ChunkedClientTest.java
===================================================================
RCS file: /usr/local/cvs/J4/src/java/gnu/j4/examples/ChunkedClientTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ChunkedClientTest.java 2000/03/03 04:20:16 1.4
+++ ChunkedClientTest.java 2000/11/02 06:57:43 1.5
@@ -13,7 +13,7 @@
/**
* This is a test that allows to determine if your servlet engine (or any other URL, for that matter) supports the requests using "<code>Transfer-Encoding: chunked</code>".
*
- * @version $Id: ChunkedClientTest.java,v 1.4 2000/03/03 04:20:16 vt Exp $
+ * @version $Id: ChunkedClientTest.java,v 1.5 2000/11/02 06:57:43 vt Exp $
*/
public class ChunkedClientTest extends ActiveService {
@@ -71,7 +71,7 @@
}
}
- protected void shutdown() throws InterruptedException {
+ protected void shutdown(Throwable failureCause) throws InterruptedException {
pool.close();
}
1.7 +2 -2 J4/src/java/gnu/j4/examples/ClientTest.java
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/ClientTest.java?annotate=1.7&cvsroot=jukebox4
CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/ClientTest.java?rev=1.7&content-type=text/x-cvsweb-markup&cvsroot=jukebox4
CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/ClientTest.java.diff?r1=1.7&r2=1.6&cvsroot=jukebox4
-----------------------------------
Index: ClientTest.java
===================================================================
RCS file: /usr/local/cvs/J4/src/java/gnu/j4/examples/ClientTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ClientTest.java 2000/03/03 04:20:16 1.6
+++ ClientTest.java 2000/11/02 06:57:43 1.7
@@ -26,7 +26,7 @@
*
* @since Jukebox v2
* @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1995-1998
- * @version $Id: ClientTest.java,v 1.6 2000/03/03 04:20:16 vt Exp $
+ * @version $Id: ClientTest.java,v 1.7 2000/11/02 06:57:43 vt Exp $
*/
public class ClientTest extends ActiveService {
@@ -89,7 +89,7 @@
* @exception InterruptedException if this thread was interrupted by
* another thread.
*/
- protected void shutdown() throws InterruptedException {
+ protected void shutdown(Throwable failureCause) throws InterruptedException {
ta.stop().waitFor();
}
1.10 +2 -2 J4/src/java/gnu/j4/examples/ConfigTest.java
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/ConfigTest.java?annotate=1.10&cvsroot=jukebox4
CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/ConfigTest.java?rev=1.10&content-type=text/x-cvsweb-markup&cvsroot=jukebox4
CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/ConfigTest.java.diff?r1=1.10&r2=1.9&cvsroot=jukebox4
-----------------------------------
Index: ConfigTest.java
===================================================================
RCS file: /usr/local/cvs/J4/src/java/gnu/j4/examples/ConfigTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ConfigTest.java 2000/03/03 04:20:16 1.9
+++ ConfigTest.java 2000/11/02 06:57:43 1.10
@@ -42,7 +42,7 @@
*
* @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1998
- * @version $Id: ConfigTest.java,v 1.9 2000/03/03 04:20:16 vt Exp $
+ * @version $Id: ConfigTest.java,v 1.10 2000/11/02 06:57:43 vt Exp $
*/
public class ConfigTest extends ActiveService {
@@ -79,7 +79,7 @@
* @exception InterruptedException if this thread was interrupted by
* another thread.
*/
- protected void shutdown() throws InterruptedException {
+ protected void shutdown(Throwable failureCause) throws InterruptedException {
}
/**
1.8 +2 -2 J4/src/java/gnu/j4/examples/ServerTest.java
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/ServerTest.java?annotate=1.8&cvsroot=jukebox4
CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/ServerTest.java?rev=1.8&content-type=text/x-cvsweb-markup&cvsroot=jukebox4
CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/ServerTest.java.diff?r1=1.8&r2=1.7&cvsroot=jukebox4
-----------------------------------
Index: ServerTest.java
===================================================================
RCS file: /usr/local/cvs/J4/src/java/gnu/j4/examples/ServerTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ServerTest.java 2000/03/03 04:20:16 1.7
+++ ServerTest.java 2000/11/02 06:57:43 1.8
@@ -17,7 +17,7 @@
* business logic.
*
* @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1995-1998
- * @version $Id: ServerTest.java,v 1.7 2000/03/03 04:20:16 vt Exp $
+ * @version $Id: ServerTest.java,v 1.8 2000/11/02 06:57:43 vt Exp $
*/
public class ServerTest extends Server {
/**
@@ -85,7 +85,7 @@
* @exception InterruptedException if this thread was interrupted by
* another thread.
*/
- protected void shutdown() throws InterruptedException {
+ protected void shutdown(Throwable failureCause) throws InterruptedException {
}
/**
1.5 +10 -4 J4/src/java/gnu/j4/examples/SimpleService.java
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/SimpleService.java?annotate=1.5&cvsroot=jukebox4
CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/SimpleService.java?rev=1.5&content-type=text/x-cvsweb-markup&cvsroot=jukebox4
CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/SimpleService.java.diff?r1=1.5&r2=1.4&cvsroot=jukebox4
-----------------------------------
Index: SimpleService.java
===================================================================
RCS file: /usr/local/cvs/J4/src/java/gnu/j4/examples/SimpleService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SimpleService.java 2000/06/06 18:46:25 1.4
+++ SimpleService.java 2000/11/02 06:57:43 1.5
@@ -11,9 +11,10 @@
* <li>Log a message on execution, fake successful execution.
* </ol>
* @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1995-1998
- * @version $Id: SimpleService.java,v 1.4 2000/06/06 18:46:25 vt Exp $
+ * @version $Id: SimpleService.java,v 1.5 2000/11/02 06:57:43 vt Exp $
*/
public class SimpleService extends ActiveService {
+
/**
* Log facility to use for this class.
*/
@@ -29,7 +30,7 @@
* another thread.
*/
protected void startup() throws InterruptedException {
- complain( LOG_NOTICE,LOG_SS,"startup: checking preconditions" );
+ complain(LOG_NOTICE, LOG_SS, "startup: checking preconditions");
}
/**
@@ -42,8 +43,12 @@
* another thread.
*/
protected void execute() throws InterruptedException {
+
complain( LOG_NOTICE,LOG_SS,"execute: doing the stuff (sleeping 5 seconds)" );
+
Thread.sleep(5000);
+
+ throw new Error("This exception is thrown to illustrate how to clean up abnormal termination");
}
/**
@@ -55,8 +60,9 @@
* @exception InterruptedException if this thread was interrupted by
* another thread.
*/
- protected void shutdown() throws InterruptedException {
- complain( LOG_NOTICE,LOG_SS,"shutdown: cleaning up" );
+ protected void shutdown(Throwable failureCause) throws InterruptedException {
+
+ complain(LOG_NOTICE, LOG_SS, "shutdown: cleaning up the exception:", failureCause);
}
}
1.4 +2 -2 J4/src/java/gnu/j4/examples/TelnetTest.java
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/TelnetTest.java?annotate=1.4&cvsroot=jukebox4
CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/TelnetTest.java?rev=1.4&content-type=text/x-cvsweb-markup&cvsroot=jukebox4
CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/TelnetTest.java.diff?r1=1.4&r2=1.3&cvsroot=jukebox4
-----------------------------------
Index: TelnetTest.java
===================================================================
RCS file: /usr/local/cvs/J4/src/java/gnu/j4/examples/TelnetTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TelnetTest.java 2000/04/06 07:30:41 1.3
+++ TelnetTest.java 2000/11/02 06:57:43 1.4
@@ -25,7 +25,7 @@
* By that, it echoes all the input and output in the log.
*
* @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1995, 2000
- * @version $Id: TelnetTest.java,v 1.3 2000/04/06 07:30:41 vt Exp $
+ * @version $Id: TelnetTest.java,v 1.4 2000/11/02 06:57:43 vt Exp $
*/
public class TelnetTest extends ActiveService {
@@ -53,7 +53,7 @@
}
}
- protected void shutdown() throws Throwable {
+ protected void shutdown(Throwable failureCause) throws Throwable {
complain(LOG_INFO, CH_TT, "Shutting down");
}
1.3 +1 -1 J4/src/java/gnu/j4/examples/XmlConfigTest.java
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/XmlConfigTest.java?annotate=1.3&cvsroot=jukebox4
CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/XmlConfigTest.java?rev=1.3&content-type=text/x-cvsweb-markup&cvsroot=jukebox4
CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/XmlConfigTest.java.diff?r1=1.3&r2=1.2&cvsroot=jukebox4
-----------------------------------
Index: XmlConfigTest.java
===================================================================
RCS file: /usr/local/cvs/J4/src/java/gnu/j4/examples/XmlConfigTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XmlConfigTest.java 2000/08/24 20:35:50 1.2
+++ XmlConfigTest.java 2000/11/02 06:57:43 1.3
@@ -71,7 +71,7 @@
protected void execute() {
}
- protected void shutdown() {
+ protected void shutdown(Throwable failureCause) {
}
public String toString(Document source) throws Throwable {
|
|
From: CVS B. <vt...@fr...> - 2000-11-02 08:51:00
|
User: vt
Date: 00/11/01 23:57:47
Modified: src/java/gnu/j4/service Idle.java MBeanServerWrapper.java
PassiveService.java ResourcePool.java
Log:
Checkpoint on the way to implement a shutdown(Throwable failureCause) call,
as opposed to no-argument shutdown(). Point is, I want to know why the
execute() died, if it did.
Revision Changes Path
1.7 +4 -4 J4/src/java/gnu/j4/service/Idle.java
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/service/Idle.java?annotate=1.7&cvsroot=jukebox4
CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/service/Idle.java?rev=1.7&content-type=text/x-cvsweb-markup&cvsroot=jukebox4
CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/service/Idle.java.diff?r1=1.7&r2=1.6&cvsroot=jukebox4
-----------------------------------
Index: Idle.java
===================================================================
RCS file: /usr/local/cvs/J4/src/java/gnu/j4/service/Idle.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Idle.java 2000/03/03 04:20:22 1.6
+++ Idle.java 2000/11/02 06:57:47 1.7
@@ -27,10 +27,10 @@
* </dl>
*
* @author <a href="mailto:vt...@fr...">Vadim Tkachenko</a>
- * @version $Id: Idle.java,v 1.6 2000/03/03 04:20:22 vt Exp $
+ * @version $Id: Idle.java,v 1.7 2000/11/02 06:57:47 vt Exp $
*/
-public final class Idle extends PassiveService implements EventListener
-{
+public final class Idle extends PassiveService implements EventListener {
+
/**
* Running instance.
*
@@ -142,7 +142,7 @@
* Clear the <code>instance</code> variable so we can start over.
* @exception InterruptedException if the call had been interrupted.
*/
- protected void shutdown() throws InterruptedException {
+ protected void shutdown(Throwable failureCause) throws InterruptedException {
instance = null;
// complain( LOG_DEBUG,LOG_SERVICE,"shutting down" );
1.3 +1 -1 J4/src/java/gnu/j4/service/MBeanServerWrapper.java
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/service/MBeanServerWrapper.java?annotate=1.3&cvsroot=jukebox4
CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/service/MBeanServerWrapper.java?rev=1.3&content-type=text/x-cvsweb-markup&cvsroot=jukebox4
CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/service/MBeanServerWrapper.java.diff?r1=1.3&r2=1.2&cvsroot=jukebox4
-----------------------------------
Index: MBeanServerWrapper.java
===================================================================
RCS file: /usr/local/cvs/J4/src/java/gnu/j4/service/MBeanServerWrapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MBeanServerWrapper.java 2000/06/06 18:46:26 1.2
+++ MBeanServerWrapper.java 2000/11/02 06:57:47 1.3
@@ -120,7 +120,7 @@
complain(LOG_INFO, CH_MW, "initialized");
}
- protected void shutdown() throws InterruptedException, Throwable {
+ protected void shutdown(Throwable failureCause) throws InterruptedException, Throwable {
if ( server == null ) {
1.17 +22 -4 J4/src/java/gnu/j4/service/PassiveService.java
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/service/PassiveService.java?annotate=1.17&cvsroot=jukebox4
CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/service/PassiveService.java?rev=1.17&content-type=text/x-cvsweb-markup&cvsroot=jukebox4
CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/service/PassiveService.java.diff?r1=1.17&r2=1.16&cvsroot=jukebox4
-----------------------------------
Index: PassiveService.java
===================================================================
RCS file: /usr/local/cvs/J4/src/java/gnu/j4/service/PassiveService.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- PassiveService.java 2000/08/31 23:42:38 1.16
+++ PassiveService.java 2000/11/02 06:57:47 1.17
@@ -50,7 +50,7 @@
* target="_top">$500 million mistake</a>.
*
* @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1995-2000
- * @version $Id: PassiveService.java,v 1.16 2000/08/31 23:42:38 vt Exp $
+ * @version $Id: PassiveService.java,v 1.17 2000/11/02 06:57:47 vt Exp $
* @see ActiveService
*/
public abstract class PassiveService extends LogAware implements RunnableService {
@@ -77,13 +77,31 @@
/**
* Execute the shutdown sequence.
*
+ * @param failureCause <code>null</code> if the {@link
+ * ActiveService#execute ActiveService#execute()} method has completed
+ * successfully. Otherwise, the exception that had caused it to
+ * interrupt.
+ *
+ * <p>
+ *
+ * This allows the shutdown procedure to react to the execution
+ * interruption cause accurately, because there's no other way to tell
+ * it <strong>why</strong> the execution has ended.
+ *
+ * <p>
+ *
+ * This is actually not applicable to this class, but since
+ * <code>shutdown()</code> is a basic method used by all descendants, it
+ * does belong here, where it is called with <code>null</code>
+ * parameter.
+ *
* @return true if all the post-conditions are met.
* @exception InterruptedException if this thread was interrupted.
*
* @exception Throwable to indicate the shutdown failure. Possibly
* propagated from implementation.
*/
- protected abstract void shutdown() throws InterruptedException, Throwable;
+ protected abstract void shutdown(Throwable failureCause) throws InterruptedException, Throwable;
/**
* Clean up.
@@ -100,7 +118,7 @@
complain(LOG_NOTICE, LOG_SERVICE, "finalizing enabled?");
try {
- shutdown();
+ shutdown(null);
} catch (Throwable t) {
complain(LOG_ERR, LOG_SERVICE, "Uncaught exception on shutdown():", t);
}
@@ -540,7 +558,7 @@
Throwable cause = null;
try {
- ((PassiveService)target).shutdown();
+ ((PassiveService)target).shutdown(null);
} catch (Throwable t) {
cause = t;
}
1.15 +2 -2 J4/src/java/gnu/j4/service/ResourcePool.java
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/service/ResourcePool.java?annotate=1.15&cvsroot=jukebox4
CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/service/ResourcePool.java?rev=1.15&content-type=text/x-cvsweb-markup&cvsroot=jukebox4
CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/service/ResourcePool.java.diff?r1=1.15&r2=1.14&cvsroot=jukebox4
-----------------------------------
Index: ResourcePool.java
===================================================================
RCS file: /usr/local/cvs/J4/src/java/gnu/j4/service/ResourcePool.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ResourcePool.java 2000/03/19 09:33:54 1.14
+++ ResourcePool.java 2000/11/02 06:57:47 1.15
@@ -58,7 +58,7 @@
* some time. Will be implemented later, if it turns out to be reasonable.
*
* @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1999
- * @version $Id: ResourcePool.java,v 1.14 2000/03/19 09:33:54 vt Exp $
+ * @version $Id: ResourcePool.java,v 1.15 2000/11/02 06:57:47 vt Exp $
*/
abstract public class ResourcePool extends PassiveService {
@@ -466,7 +466,7 @@
* @exception InterruptedException if this thread was interrupted by
* another thread.
*/
- protected void shutdown() throws InterruptedException {
+ protected void shutdown(Throwable failureCause) throws InterruptedException {
}
public String toString() {
|
|
From: CVS B. <vt...@fr...> - 2000-11-02 08:51:00
|
User: vt Date: 00/11/01 23:55:50 Modified: src/java/gnu/j4/test/unit Makefile.am Added: src/java/gnu/j4/test/unit MultipleConfigurationElements.java Log: Added the test case for checking the proper handling of the multiple value configuration elements. Revision Changes Path 1.2 +2 -1 J4/src/java/gnu/j4/test/unit/Makefile.am CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/test/unit/Makefile.am?annotate=1.2&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/test/unit/Makefile.am?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=jukebox4 CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/test/unit/Makefile.am.diff?r1=1.2&r2=1.1&cvsroot=jukebox4 ----------------------------------- Index: Makefile.am =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/test/unit/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.am 2000/10/25 06:56:48 1.1 +++ Makefile.am 2000/11/02 06:55:50 1.2 @@ -1,9 +1,10 @@ -# $Id: Makefile.am,v 1.1 2000/10/25 06:56:48 vt Exp $ +# $Id: Makefile.am,v 1.2 2000/11/02 06:55:50 vt Exp $ EXTRA_DIST = package.html noinst_PROGRAMS = package package_SOURCES = Http11ChunkedOutputStream.java \ LruCache.java \ + MultipleConfigurationElements.java \ RWLock.java \ SemaphoreGroup.java \ ServerSocket.java \ 1.1 J4/src/java/gnu/j4/test/unit/MultipleConfigurationElements.java CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/test/unit/MultipleConfigurationElements.java?annotate=1.1&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/test/unit/MultipleConfigurationElements.java?rev=1.1&content-type=text/x-cvsweb-markup&cvsroot=jukebox4 ----------------------------------- Index: MultipleConfigurationElements.java =================================================================== package gnu.j4.test.unit; import java.util.Vector; import gnu.j4.core.LogAware; import gnu.j4.config.Configuration; /** * Once upon a time, there was a problem with the {@link * gnu.j4.config.Configuration Configuration} class being unable to read the * mixed style configuration properly. Please take a look at * <code>${INST_DIR}/test/etc/multi.conf</code> for further comments. * * @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 2000 * @version $Id: MultipleConfigurationElements.java,v 1.1 2000/11/02 06:55:50 vt Exp $ */ public class MultipleConfigurationElements extends LogAware { public static final String CH_MULTI = "MultiConf"; public static void main(String args[]) { (new MultipleConfigurationElements()).run(); gnu.j4.core.Logger.close(); } public void run() { Configuration conf = Configuration.createChain("multi.conf"); String test[] = { "test1", "test2", "test3", "test4", "test5", "test6" }; for ( int idx = 0; idx < test.length; idx++ ) { String asString = conf.getString(test[idx]); complain(LOG_NOTICE, CH_MULTI, test[idx] + " as String: " + asString); Vector asVector = conf.getVector(test[idx]); for ( int v = 0; v < asVector.size(); v++ ) { complain(LOG_NOTICE, CH_MULTI, test[idx] + " as Vector[" + v + "]:" + asVector.elementAt(v)); } } } } |
|
From: CVS B. <vt...@fr...> - 2000-11-02 08:51:00
|
User: vt Date: 00/11/01 23:55:50 Modified: src/scripts/test Makefile.am Added: src/scripts/test MultipleConfigurationElements.in Log: Added the test case for checking the proper handling of the multiple value configuration elements. Revision Changes Path 1.2 +5 -1 J4/src/scripts/test/Makefile.am CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/scripts/test/Makefile.am?annotate=1.2&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/scripts/test/Makefile.am?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=jukebox4 CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/scripts/test/Makefile.am.diff?r1=1.2&r2=1.1&cvsroot=jukebox4 ----------------------------------- Index: Makefile.am =================================================================== RCS file: /usr/local/cvs/J4/src/scripts/test/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.am 2000/10/25 06:56:50 1.1 +++ Makefile.am 2000/11/02 06:55:50 1.2 @@ -1,12 +1,14 @@ -# $Id: Makefile.am,v 1.1 2000/10/25 06:56:50 vt Exp $ +# $Id: Makefile.am,v 1.2 2000/11/02 06:55:50 vt Exp $ bin_PROGRAMS = LruCache \ + MultipleConfigurationElements \ SemaphoreGroup \ RWLock bindir = ${prefix}/test/bin LruCache_SOURCES = LruCache +MultipleConfigurationElements_SOURCES = MultipleConfigurationElements SemaphoreGroup_SOURCES = SemaphoreGroup RWLock_SOURCES = RWLock @@ -17,6 +19,8 @@ ${RM} -f *~ .*~ LruCache: + +MultipleConfigurationElements: SemaphoreGroup: 1.1 J4/src/scripts/test/MultipleConfigurationElements.in CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/scripts/test/MultipleConfigurationElements.in?annotate=1.1&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/scripts/test/MultipleConfigurationElements.in?rev=1.1&content-type=text/x-cvsweb-markup&cvsroot=jukebox4 ----------------------------------- Index: MultipleConfigurationElements.in =================================================================== #! /bin/sh # # $Id: MultipleConfigurationElements.in,v 1.1 2000/11/02 06:55:50 vt Exp $ TARGET_CLASSPATH=@prefix@/lib/@PACKAGE@.jar:\ @JMX_CLASSES@:\ @JMXTOOLS_CLASSES@:\ @XERCES_CLASSES@:\ ${CLASSPATH} JAVA_OPT="@JAVA_OPT@" @JAVAX@ ${J4WRAPPER} -Djukebox.confpath="@prefix@/test/etc" gnu.j4.test.unit.MultipleConfigurationElements |
|
From: CVS B. <vt...@fr...> - 2000-11-02 08:49:40
|
User: vt
Date: 00/11/01 23:57:50
Modified: src/java/gnu/j4/test/unit LruCache.java RWLock.java
SemaphoreGroup.java ServerSocket.java
ThreadTest.java
Log:
Checkpoint on the way to implement a shutdown(Throwable failureCause) call,
as opposed to no-argument shutdown(). Point is, I want to know why the
execute() died, if it did.
Revision Changes Path
1.2 +2 -2 J4/src/java/gnu/j4/test/unit/LruCache.java
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/test/unit/LruCache.java?annotate=1.2&cvsroot=jukebox4
CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/test/unit/LruCache.java?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=jukebox4
CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/test/unit/LruCache.java.diff?r1=1.2&r2=1.1&cvsroot=jukebox4
-----------------------------------
Index: LruCache.java
===================================================================
RCS file: /usr/local/cvs/J4/src/java/gnu/j4/test/unit/LruCache.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LruCache.java 2000/10/25 06:56:48 1.1
+++ LruCache.java 2000/11/02 06:57:50 1.2
@@ -10,7 +10,7 @@
* Test for {@link gnu.j4.cache.LruCache LRU Cache}.
*
* @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1999
- * @version $Id: LruCache.java,v 1.1 2000/10/25 06:56:48 vt Exp $
+ * @version $Id: LruCache.java,v 1.2 2000/11/02 06:57:50 vt Exp $
*/
public class LruCache extends ActiveService {
@@ -106,7 +106,7 @@
* @exception InterruptedException if this thread was interrupted by
* another thread.
*/
- protected void shutdown() throws InterruptedException {
+ protected void shutdown(Throwable failureCause) throws InterruptedException {
int total = hits + misses;
1.2 +3 -3 J4/src/java/gnu/j4/test/unit/RWLock.java
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/test/unit/RWLock.java?annotate=1.2&cvsroot=jukebox4
CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/test/unit/RWLock.java?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=jukebox4
CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/test/unit/RWLock.java.diff?r1=1.2&r2=1.1&cvsroot=jukebox4
-----------------------------------
Index: RWLock.java
===================================================================
RCS file: /usr/local/cvs/J4/src/java/gnu/j4/test/unit/RWLock.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RWLock.java 2000/10/25 06:56:48 1.1
+++ RWLock.java 2000/11/02 06:57:50 1.2
@@ -9,7 +9,7 @@
* {@link gnu.j4.sem.RWLock Multiple readers, single writer} test case.
*
* @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 2000
- * @version $Id: RWLock.java,v 1.1 2000/10/25 06:56:48 vt Exp $
+ * @version $Id: RWLock.java,v 1.2 2000/11/02 06:57:50 vt Exp $
*/
public class RWLock extends ActiveService {
@@ -52,7 +52,7 @@
Thread.sleep(180000);
}
- protected void shutdown() throws InterruptedException {
+ protected void shutdown(Throwable failureCause) throws InterruptedException {
complain(LOG_INFO, "RWLock", "Shut down.");
}
@@ -103,7 +103,7 @@
*
* @return true.
*/
- protected void shutdown() throws InterruptedException {
+ protected void shutdown(Throwable failureCause) throws InterruptedException {
complain(LOG_INFO, "Consumer", "[" + id + "] Shut down.");
}
1.2 +11 -4 J4/src/java/gnu/j4/test/unit/SemaphoreGroup.java
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/test/unit/SemaphoreGroup.java?annotate=1.2&cvsroot=jukebox4
CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/test/unit/SemaphoreGroup.java?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=jukebox4
CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/test/unit/SemaphoreGroup.java.diff?r1=1.2&r2=1.1&cvsroot=jukebox4
-----------------------------------
Index: SemaphoreGroup.java
===================================================================
RCS file: /usr/local/cvs/J4/src/java/gnu/j4/test/unit/SemaphoreGroup.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SemaphoreGroup.java 2000/10/25 06:56:48 1.1
+++ SemaphoreGroup.java 2000/11/02 06:57:50 1.2
@@ -28,6 +28,11 @@
*
* <pre>
* $Log: SemaphoreGroup.java,v $
+ * Revision 1.2 2000/11/02 06:57:50 vt
+ * Checkpoint on the way to implement a shutdown(Throwable failureCause) call,
+ * as opposed to no-argument shutdown(). Point is, I want to know why the
+ * execute() died, if it did.
+ *
* Revision 1.1 2000/10/25 06:56:48 vt
* Moved the files from gnu.j4.examples to gnu.j4.test.unit and
* gnu.j4.test.integration, where they belong.
@@ -66,7 +71,7 @@
*
* </pre>
* @author <a href="mailto:vt...@fr...">Vadim Tkachenko</a>
- * @version $Id: SemaphoreGroup.java,v 1.1 2000/10/25 06:56:48 vt Exp $
+ * @version $Id: SemaphoreGroup.java,v 1.2 2000/11/02 06:57:50 vt Exp $
*/
public class SemaphoreGroup extends PassiveService implements TimerClient {
@@ -189,7 +194,8 @@
* @exception InterruptedException if this thread was interrupted by
* another thread.
*/
- protected void shutdown() throws InterruptedException {
+ protected void shutdown(Throwable failureCause) throws InterruptedException {
+
complain( LOG_INFO,LOG_SGT,"stopping callback: "+timerCallback_A.toString() );
TimerCallback.stopCallback( timerCallback_A );
timerCallback_A = null;
@@ -238,7 +244,7 @@
*
* @return true.
*/
- protected void shutdown() throws InterruptedException {
+ protected void shutdown(Throwable failureCause) throws InterruptedException {
}
}
1.2 +2 -2 J4/src/java/gnu/j4/test/unit/ServerSocket.java
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/test/unit/ServerSocket.java?annotate=1.2&cvsroot=jukebox4
CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/test/unit/ServerSocket.java?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=jukebox4
CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/test/unit/ServerSocket.java.diff?r1=1.2&r2=1.1&cvsroot=jukebox4
-----------------------------------
Index: ServerSocket.java
===================================================================
RCS file: /usr/local/cvs/J4/src/java/gnu/j4/test/unit/ServerSocket.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServerSocket.java 2000/10/25 06:56:48 1.1
+++ ServerSocket.java 2000/11/02 06:57:50 1.2
@@ -13,7 +13,7 @@
* this test is going to pass, unless you have a really old or weird JVM.
*
* @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1995-2000
- * @version $Id: ServerSocket.java,v 1.1 2000/10/25 06:56:48 vt Exp $
+ * @version $Id: ServerSocket.java,v 1.2 2000/11/02 06:57:50 vt Exp $
*/
public class ServerSocket extends ActiveService {
@@ -59,7 +59,7 @@
}
}
- protected void shutdown() throws InterruptedException {
+ protected void shutdown(Throwable failureCause) throws InterruptedException {
if ( acceptor.isActive() ) {
1.2 +2 -2 J4/src/java/gnu/j4/test/unit/ThreadTest.java
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/test/unit/ThreadTest.java?annotate=1.2&cvsroot=jukebox4
CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/test/unit/ThreadTest.java?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=jukebox4
CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/test/unit/ThreadTest.java.diff?r1=1.2&r2=1.1&cvsroot=jukebox4
-----------------------------------
Index: ThreadTest.java
===================================================================
RCS file: /usr/local/cvs/J4/src/java/gnu/j4/test/unit/ThreadTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ThreadTest.java 2000/10/25 06:56:48 1.1
+++ ThreadTest.java 2000/11/02 06:57:50 1.2
@@ -8,7 +8,7 @@
*
* @since Jukebox 3
* @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1005-1998
- * @version $Id: ThreadTest.java,v 1.1 2000/10/25 06:56:48 vt Exp $
+ * @version $Id: ThreadTest.java,v 1.2 2000/11/02 06:57:50 vt Exp $
*/
public class ThreadTest extends ActiveService {
@@ -23,7 +23,7 @@
protected void startup() throws InterruptedException {
}
- protected void shutdown() throws InterruptedException {
+ protected void shutdown(Throwable failureCause) throws InterruptedException {
}
protected void execute() throws InterruptedException {
|
|
From: CVS B. <vt...@fr...> - 2000-11-02 08:49:39
|
User: vt
Date: 00/11/01 23:57:50
Modified: src/java/gnu/j4/test/integration ResourcePool.java
ResourcePoolFailure.java
Log:
Checkpoint on the way to implement a shutdown(Throwable failureCause) call,
as opposed to no-argument shutdown(). Point is, I want to know why the
execute() died, if it did.
Revision Changes Path
1.2 +5 -5 J4/src/java/gnu/j4/test/integration/ResourcePool.java
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/test/integration/ResourcePool.java?annotate=1.2&cvsroot=jukebox4
CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/test/integration/ResourcePool.java?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=jukebox4
CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/test/integration/ResourcePool.java.diff?r1=1.2&r2=1.1&cvsroot=jukebox4
-----------------------------------
Index: ResourcePool.java
===================================================================
RCS file: /usr/local/cvs/J4/src/java/gnu/j4/test/integration/ResourcePool.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ResourcePool.java 2000/10/25 06:56:48 1.1
+++ ResourcePool.java 2000/11/02 06:57:50 1.2
@@ -1,4 +1,4 @@
-package gnu.j4.examples;
+package gnu.j4.test.integration;
import java.util.Random;
@@ -25,7 +25,7 @@
*
* </ol>
* @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1995-1998
- * @version $Id: ResourcePool.java,v 1.1 2000/10/25 06:56:48 vt Exp $
+ * @version $Id: ResourcePool.java,v 1.2 2000/11/02 06:57:50 vt Exp $
*/
public class ResourcePool extends ActiveService {
@@ -196,7 +196,7 @@
* @exception InterruptedException if this thread was interrupted by
* another thread.
*/
- protected void shutdown() throws InterruptedException {
+ protected void shutdown(Throwable failureCause) throws InterruptedException {
complain( LOG_NOTICE,LOG_RPT,"shutdown: cleaning up" );
}
@@ -239,7 +239,7 @@
}
}
- protected void shutdown() throws InterruptedException {
+ protected void shutdown(Throwable failureCause) throws InterruptedException {
}
}
@@ -269,7 +269,7 @@
}
}
- protected void shutdown() throws InterruptedException {
+ protected void shutdown(Throwable failureCause) throws InterruptedException {
this.complain(LOG_INFO, LOG_SR, "shutting down");
resourceInstanceCount--;
1.2 +4 -4 J4/src/java/gnu/j4/test/integration/ResourcePoolFailure.java
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/test/integration/ResourcePoolFailure.java?annotate=1.2&cvsroot=jukebox4
CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/test/integration/ResourcePoolFailure.java?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=jukebox4
CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/test/integration/ResourcePoolFailure.java.diff?r1=1.2&r2=1.1&cvsroot=jukebox4
-----------------------------------
Index: ResourcePoolFailure.java
===================================================================
RCS file: /usr/local/cvs/J4/src/java/gnu/j4/test/integration/ResourcePoolFailure.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ResourcePoolFailure.java 2000/10/25 06:56:48 1.1
+++ ResourcePoolFailure.java 2000/11/02 06:57:50 1.2
@@ -1,4 +1,4 @@
-package gnu.j4.examples;
+package gnu.j4.test.integration;
import gnu.j4.service.ActiveService;
import gnu.j4.service.PassiveService;
@@ -18,7 +18,7 @@
* be paranoid.
*
* @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 2000
- * @version $Id: ResourcePoolFailure.java,v 1.1 2000/10/25 06:56:48 vt Exp $
+ * @version $Id: ResourcePoolFailure.java,v 1.2 2000/11/02 06:57:50 vt Exp $
*/
public class ResourcePoolFailure extends ActiveService {
@@ -112,7 +112,7 @@
/**
* Do nothing.
*/
- protected void shutdown() {
+ protected void shutdown(Throwable failureCause) {
}
protected class Pool extends gnu.j4.service.ResourcePool {
@@ -147,7 +147,7 @@
}
}
- protected void shutdown() {
+ protected void shutdown(Throwable failureCause) {
complain(LOG_INFO, "Failer", "shut down.");
}
|
|
From: CVS B. <vt...@fr...> - 2000-11-02 08:48:31
|
User: vt Date: 00/11/02 01:48:25 Modified: src/java/gnu/j4/config Configuration.java Log: Updated the test case and fixed the bug. Not completely, though: the commas cannot be used in the values for now, until I get time to fix it. Revision Changes Path 1.32 +52 -2 J4/src/java/gnu/j4/config/Configuration.java CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/config/Configuration.java?annotate=1.32&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/config/Configuration.java?rev=1.32&content-type=text/x-cvsweb-markup&cvsroot=jukebox4 CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/config/Configuration.java.diff?r1=1.32&r2=1.31&cvsroot=jukebox4 ----------------------------------- Index: Configuration.java =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/config/Configuration.java,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- Configuration.java 2000/08/24 20:35:49 1.31 +++ Configuration.java 2000/11/02 08:48:25 1.32 @@ -25,7 +25,7 @@ * target=_top>Java-Apache Project</a> in general and code written by <a * href="mailto:st...@ap...">Stefano Mazzocchi</a> in particular. * - * @version $Id: Configuration.java,v 1.31 2000/08/24 20:35:49 vt Exp $ + * @version $Id: Configuration.java,v 1.32 2000/11/02 08:48:25 vt Exp $ */ public class Configuration extends Hashtable { @@ -532,6 +532,34 @@ */ public void put(String key, Object value) { + // Preprocess the value. It may turn out that the value is a comma + // separated string, which will embarrass us a little. + + boolean split = false; + + if ( value instanceof String && ((String)value).indexOf(",") != -1 ) { + + split = true; + + //System.err.println(key + " split: '" + value + "'"); + + String valueAsString = (String)value; + Vector valueAsVector = new Vector(); + + // VT: FIXME: This way, it's impossible to have a comma in the + // value. Have to process the escape with a backslash. + + for ( StringTokenizer st = new StringTokenizer(valueAsString, ","); st.hasMoreTokens(); ) { + + String element = st.nextToken().trim(); + + //System.err.println(key + " element: '" + element + "'"); + valueAsVector.addElement(element); + } + + value = valueAsVector; + } + Object found = super.get(key); if ( found == null ) { @@ -543,6 +571,18 @@ } + if ( found instanceof String ) { + + //System.err.println(key + " restructure: '" + found + "'"); + Object first = found; + Vector set = new Vector(); + + super.remove(key); + set.addElement(first); + super.put(key, set); + found = set; + } + if ( found instanceof Vector ) { // OK, there's existing sequence already. @@ -551,7 +591,17 @@ if ( vFound.indexOf(value) == -1 ) { - vFound.addElement(value); + if ( split ) { + + for ( Enumeration e = ((Vector)value).elements(); e.hasMoreElements(); ) { + + vFound.addElement(e.nextElement()); + } + + } else { + + vFound.addElement(value); + } return; } else { |
|
From: CVS B. <vt...@fr...> - 2000-11-02 08:48:28
|
User: vt Date: 00/11/02 01:48:25 Modified: src/java/gnu/j4/test/unit MultipleConfigurationElements.java Log: Updated the test case and fixed the bug. Not completely, though: the commas cannot be used in the values for now, until I get time to fix it. Revision Changes Path 1.2 +2 -2 J4/src/java/gnu/j4/test/unit/MultipleConfigurationElements.java CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/test/unit/MultipleConfigurationElements.java?annotate=1.2&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/test/unit/MultipleConfigurationElements.java?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=jukebox4 CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/test/unit/MultipleConfigurationElements.java.diff?r1=1.2&r2=1.1&cvsroot=jukebox4 ----------------------------------- Index: MultipleConfigurationElements.java =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/test/unit/MultipleConfigurationElements.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- MultipleConfigurationElements.java 2000/11/02 06:55:50 1.1 +++ MultipleConfigurationElements.java 2000/11/02 08:48:25 1.2 @@ -12,7 +12,7 @@ * <code>${INST_DIR}/test/etc/multi.conf</code> for further comments. * * @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 2000 - * @version $Id: MultipleConfigurationElements.java,v 1.1 2000/11/02 06:55:50 vt Exp $ + * @version $Id: MultipleConfigurationElements.java,v 1.2 2000/11/02 08:48:25 vt Exp $ */ public class MultipleConfigurationElements extends LogAware { @@ -28,7 +28,7 @@ Configuration conf = Configuration.createChain("multi.conf"); - String test[] = { "test1", "test2", "test3", "test4", "test5", "test6" }; + String test[] = { "test1", "test2", "test3", "test4", "test5", "test6", "string_with_comma" }; for ( int idx = 0; idx < test.length; idx++ ) { |
|
From: CVS B. <vt...@fr...> - 2000-11-02 08:48:26
|
User: vt Date: 00/11/02 01:48:24 Modified: etc multi.conf Log: Updated the test case and fixed the bug. Not completely, though: the commas cannot be used in the values for now, until I get time to fix it. Revision Changes Path 1.2 +2 -0 J4/etc/multi.conf CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/etc/multi.conf?annotate=1.2&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/etc/multi.conf?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=jukebox4 CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/etc/multi.conf.diff?r1=1.2&r2=1.1&cvsroot=jukebox4 ----------------------------------- Index: multi.conf =================================================================== RCS file: /usr/local/cvs/J4/etc/multi.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- multi.conf 2000/11/02 06:55:50 1.1 +++ multi.conf 2000/11/02 08:48:24 1.2 @@ -21,3 +21,5 @@ test6 = a test6 = b,c + +string_with_comma = Hello\, world. This is supposed to be a single line value with no backslashes and spaces after commas\, stupid. |
|
From: CVS B. <vt...@fr...> - 2000-11-02 08:38:28
|
User: vt Date: 00/11/01 23:57:47 Modified: src/java/gnu/j4/net/telnet Telnet.java Log: Checkpoint on the way to implement a shutdown(Throwable failureCause) call, as opposed to no-argument shutdown(). Point is, I want to know why the execute() died, if it did. Revision Changes Path 1.7 +9 -4 J4/src/java/gnu/j4/net/telnet/Telnet.java CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/net/telnet/Telnet.java?annotate=1.7&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/net/telnet/Telnet.java?rev=1.7&content-type=text/x-cvsweb-markup&cvsroot=jukebox4 CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/net/telnet/Telnet.java.diff?r1=1.7&r2=1.6&cvsroot=jukebox4 ----------------------------------- Index: Telnet.java =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/net/telnet/Telnet.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Telnet.java 2000/05/05 02:51:58 1.6 +++ Telnet.java 2000/11/02 06:57:47 1.7 @@ -37,7 +37,7 @@ * 854</a> for details. * * @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1995, 2000 - * @version $Id: Telnet.java,v 1.6 2000/05/05 02:51:58 vt Exp $ + * @version $Id: Telnet.java,v 1.7 2000/11/02 06:57:47 vt Exp $ */ public class Telnet extends SocketService implements TelnetConstants, TelnetOptionConstants { @@ -261,10 +261,15 @@ * Don't kill the sockets, as the parent does, in case when this * service is a dependant. */ - protected void shutdown() throws InterruptedException, Throwable { + protected void shutdown(Throwable failureCause) throws InterruptedException, Throwable { complain(LOG_DEBUG, CH_TELNET, "Shutting down"); + if ( failureCause != null ) { + + complain(LOG_ERR, CH_TELNET, "FIXME: execute() failure cause not processed:", failureCause); + } + if ( reader.isEnabled() ) { complain(LOG_DEBUG, CH_TELNET, "Stopping reader"); reader.stop().waitFor(); @@ -275,7 +280,7 @@ // if ( dependsOn == null && alive ) { - super.shutdown(); + super.shutdown(failureCause); // } } @@ -774,7 +779,7 @@ } } - protected void shutdown() throws InterruptedException { + protected void shutdown(Throwable failureCause) throws InterruptedException { complain(LOG_DEBUG, CH_TR, "Shutting down"); flush(); |
|
From: CVS B. <vt...@fr...> - 2000-11-02 08:38:25
|
User: vt Date: 00/11/01 23:55:50 Modified: etc Makefile.am Added: etc multi.conf Log: Added the test case for checking the proper handling of the multiple value configuration elements. Revision Changes Path 1.7 +2 -2 J4/etc/Makefile.am CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/etc/Makefile.am?annotate=1.7&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/etc/Makefile.am?rev=1.7&content-type=text/x-cvsweb-markup&cvsroot=jukebox4 CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/etc/Makefile.am.diff?r1=1.7&r2=1.6&cvsroot=jukebox4 ----------------------------------- Index: Makefile.am =================================================================== RCS file: /usr/local/cvs/J4/etc/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile.am 2000/10/25 06:56:47 1.6 +++ Makefile.am 2000/11/02 06:55:50 1.7 @@ -1,10 +1,10 @@ -# $Id: Makefile.am,v 1.6 2000/10/25 06:56:47 vt Exp $ +# $Id: Makefile.am,v 1.7 2000/11/02 06:55:50 vt Exp $ etcdir = ${prefix}/etc etc_DATA = log.conf management.conf jukebox.conf.xml jukebox.conf.dtd test_etcdir = ${prefix}/test/etc -test_etc_DATA = test.conf test.resource.pool.conf +test_etc_DATA = test.conf test.resource.pool.conf multi.conf RM = @RM@ 1.1 J4/etc/multi.conf CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/etc/multi.conf?annotate=1.1&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/etc/multi.conf?rev=1.1&content-type=text/x-cvsweb-markup&cvsroot=jukebox4 ----------------------------------- Index: multi.conf =================================================================== # This is a test case to check if the gnu.j4.config.Configuration correctly # processes the multiple values spread accross the lines. # All the values below must be correctly recognized as separate entities # when the configuration value is read as Vector. test1 = a, b, c test2 = a test2 = b test2 = c test3 = a test3 = b, c test4 = a, b test4 = c test5 = a,b test5 = c test6 = a test6 = b,c |
|
From: CVS B. <vt...@fr...> - 2000-11-02 08:38:23
|
User: vt Date: 00/11/01 23:57:46 Modified: src/java/gnu/j4/framework/server/net SocketAcceptor.java Log: Checkpoint on the way to implement a shutdown(Throwable failureCause) call, as opposed to no-argument shutdown(). Point is, I want to know why the execute() died, if it did. Revision Changes Path 1.10 +3 -3 J4/src/java/gnu/j4/framework/server/net/SocketAcceptor.java CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/framework/server/net/SocketAcceptor.java?annotate=1.10&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/framework/server/net/SocketAcceptor.java?rev=1.10&content-type=text/x-cvsweb-markup&cvsroot=jukebox4 CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/framework/server/net/SocketAcceptor.java.diff?r1=1.10&r2=1.9&cvsroot=jukebox4 ----------------------------------- Index: SocketAcceptor.java =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/framework/server/net/SocketAcceptor.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- SocketAcceptor.java 2000/10/25 03:12:06 1.9 +++ SocketAcceptor.java 2000/11/02 06:57:46 1.10 @@ -62,7 +62,7 @@ * @see gnu.j4.framework.server.Acceptor * @see SocketStreamAdapter * @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1995-1998 - * @version $Id: SocketAcceptor.java,v 1.9 2000/10/25 03:12:06 vt Exp $ + * @version $Id: SocketAcceptor.java,v 1.10 2000/11/02 06:57:46 vt Exp $ */ public class SocketAcceptor extends ActiveService implements Acceptor, LogFacility { /** @@ -339,7 +339,7 @@ * @exception InterruptedException if this thread was interrupted by * another thread. */ - public void shutdown() throws InterruptedException { + public void shutdown(Throwable failureCause) throws InterruptedException { complain(LOG_DEBUG, LOG_PKG, "Shut down."); } @@ -352,7 +352,7 @@ * @exception Throwable JDK 1.2 requirement. */ public void finalize() throws Throwable { - shutdown(); + shutdown(null); super.finalize(); } } |
|
From: CVS B. <vt...@fr...> - 2000-11-02 08:38:23
|
User: vt Date: 00/11/01 23:57:44 Modified: src/java/gnu/j4/framework/server TransactionAdapterImpl.java Log: Checkpoint on the way to implement a shutdown(Throwable failureCause) call, as opposed to no-argument shutdown(). Point is, I want to know why the execute() died, if it did. Revision Changes Path 1.7 +2 -2 J4/src/java/gnu/j4/framework/server/TransactionAdapterImpl.java CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/framework/server/TransactionAdapterImpl.java?annotate=1.7&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/framework/server/TransactionAdapterImpl.java?rev=1.7&content-type=text/x-cvsweb-markup&cvsroot=jukebox4 CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/framework/server/TransactionAdapterImpl.java.diff?r1=1.7&r2=1.6&cvsroot=jukebox4 ----------------------------------- Index: TransactionAdapterImpl.java =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/framework/server/TransactionAdapterImpl.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- TransactionAdapterImpl.java 2000/10/25 03:44:22 1.6 +++ TransactionAdapterImpl.java 2000/11/02 06:57:44 1.7 @@ -54,7 +54,7 @@ * never get a chance to initialize the object stream. * * @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1995-1998 - * @version $Id: TransactionAdapterImpl.java,v 1.6 2000/10/25 03:44:22 vt Exp $ + * @version $Id: TransactionAdapterImpl.java,v 1.7 2000/11/02 06:57:44 vt Exp $ */ public class TransactionAdapterImpl extends ActiveService implements TransactionAdapter, LogFacility { @@ -315,7 +315,7 @@ * @exception InterruptedException if this thread was interrupted by * another thread. */ - protected void shutdown() throws InterruptedException { + protected void shutdown(Throwable failureCause) throws InterruptedException { if ( conn instanceof PassiveService ) { |
|
From: CVS B. <vt...@fr...> - 2000-11-02 08:38:20
|
User: vt Date: 00/11/01 23:57:44 Modified: src/java/gnu/j4/framework/client TransactionAdapterImpl.java Log: Checkpoint on the way to implement a shutdown(Throwable failureCause) call, as opposed to no-argument shutdown(). Point is, I want to know why the execute() died, if it did. Revision Changes Path 1.5 +3 -2 J4/src/java/gnu/j4/framework/client/TransactionAdapterImpl.java CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/framework/client/TransactionAdapterImpl.java?annotate=1.5&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/framework/client/TransactionAdapterImpl.java?rev=1.5&content-type=text/x-cvsweb-markup&cvsroot=jukebox4 CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/framework/client/TransactionAdapterImpl.java.diff?r1=1.5&r2=1.4&cvsroot=jukebox4 ----------------------------------- Index: TransactionAdapterImpl.java =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/framework/client/TransactionAdapterImpl.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- TransactionAdapterImpl.java 2000/03/03 04:20:16 1.4 +++ TransactionAdapterImpl.java 2000/11/02 06:57:44 1.5 @@ -13,7 +13,7 @@ * Transaction adapter using underlying {@link StreamAdapter StreamAdapter}. * * @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1995-2000 - * @version $Id: TransactionAdapterImpl.java,v 1.4 2000/03/03 04:20:16 vt Exp $ + * @version $Id: TransactionAdapterImpl.java,v 1.5 2000/11/02 06:57:44 vt Exp $ */ public class TransactionAdapterImpl extends TransactionAdapter { @@ -64,7 +64,8 @@ /** * @exception InterruptedException if this thread was interrupted. */ - protected void shutdown() throws InterruptedException, Throwable { + protected void shutdown(Throwable failureCause) throws InterruptedException, Throwable { + try { oOut.flush(); } finally { |
|
From: CVS B. <vt...@fr...> - 2000-11-02 08:38:20
|
User: vt Date: 00/11/01 23:57:46 Modified: src/java/gnu/j4/io/storage DispatcherStorageSystem.java Log: Checkpoint on the way to implement a shutdown(Throwable failureCause) call, as opposed to no-argument shutdown(). Point is, I want to know why the execute() died, if it did. Revision Changes Path 1.2 +2 -2 J4/src/java/gnu/j4/io/storage/DispatcherStorageSystem.java CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/io/storage/DispatcherStorageSystem.java?annotate=1.2&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/io/storage/DispatcherStorageSystem.java?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=jukebox4 CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/io/storage/DispatcherStorageSystem.java.diff?r1=1.2&r2=1.1&cvsroot=jukebox4 ----------------------------------- Index: DispatcherStorageSystem.java =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/io/storage/DispatcherStorageSystem.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DispatcherStorageSystem.java 2000/03/07 00:18:32 1.1 +++ DispatcherStorageSystem.java 2000/11/02 06:57:46 1.2 @@ -14,7 +14,7 @@ * This implementation uses the <strong>Dispatcher</strong> pattern. * * @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 2000 - * @version $Id: DispatcherStorageSystem.java,v 1.1 2000/03/07 00:18:32 vt Exp $ + * @version $Id: DispatcherStorageSystem.java,v 1.2 2000/11/02 06:57:46 vt Exp $ */ abstract public class DispatcherStorageSystem extends PassiveService implements StorageSystem { @@ -261,7 +261,7 @@ * * @return true on clean shutdown, false if something went wrong. */ - protected void shutdown() throws InterruptedException { + protected void shutdown(Throwable failureCause) throws InterruptedException { complain(LOG_INFO, CH_SSI, "shutting down"); } |
|
From: CVS B. <vt...@fr...> - 2000-11-02 08:38:17
|
User: vt
Date: 00/11/01 23:57:44
Modified: src/java/gnu/j4/framework/client/net
HttpTransactionAdapter.java
Log:
Checkpoint on the way to implement a shutdown(Throwable failureCause) call,
as opposed to no-argument shutdown(). Point is, I want to know why the
execute() died, if it did.
Revision Changes Path
1.13 +2 -2 J4/src/java/gnu/j4/framework/client/net/HttpTransactionAdapter.java
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/framework/client/net/HttpTransactionAdapter.java?annotate=1.13&cvsroot=jukebox4
CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/framework/client/net/HttpTransactionAdapter.java?rev=1.13&content-type=text/x-cvsweb-markup&cvsroot=jukebox4
CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/framework/client/net/HttpTransactionAdapter.java.diff?r1=1.13&r2=1.12&cvsroot=jukebox4
-----------------------------------
Index: HttpTransactionAdapter.java
===================================================================
RCS file: /usr/local/cvs/J4/src/java/gnu/j4/framework/client/net/HttpTransactionAdapter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- HttpTransactionAdapter.java 2000/03/03 04:20:17 1.12
+++ HttpTransactionAdapter.java 2000/11/02 06:57:44 1.13
@@ -56,7 +56,7 @@
*
* @since Jukebox v3
* @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1995-1998
- * @version $Id: HttpTransactionAdapter.java,v 1.12 2000/03/03 04:20:17 vt Exp $
+ * @version $Id: HttpTransactionAdapter.java,v 1.13 2000/11/02 06:57:44 vt Exp $
*/
public class HttpTransactionAdapter extends TransactionAdapter {
@@ -178,7 +178,7 @@
cookie = getCookies( check );
}
- protected void shutdown() throws InterruptedException {
+ protected void shutdown(Throwable failureCause) throws InterruptedException {
}
public InputStream getInputStream() throws IOException {
|
|
From: CVS B. <vt...@fr...> - 2000-11-02 08:38:15
|
User: vt Date: 00/11/01 23:57:49 Modified: src/java/gnu/j4/service/net SocketService.java Log: Checkpoint on the way to implement a shutdown(Throwable failureCause) call, as opposed to no-argument shutdown(). Point is, I want to know why the execute() died, if it did. Revision Changes Path 1.12 +2 -2 J4/src/java/gnu/j4/service/net/SocketService.java CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/service/net/SocketService.java?annotate=1.12&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/service/net/SocketService.java?rev=1.12&content-type=text/x-cvsweb-markup&cvsroot=jukebox4 CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/service/net/SocketService.java.diff?r1=1.12&r2=1.11&cvsroot=jukebox4 ----------------------------------- Index: SocketService.java =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/service/net/SocketService.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- SocketService.java 2000/05/05 02:51:59 1.11 +++ SocketService.java 2000/11/02 06:57:47 1.12 @@ -39,7 +39,7 @@ * </dl> * * @since Jukebox v3 - * @version $Id: SocketService.java,v 1.11 2000/05/05 02:51:59 vt Exp $ + * @version $Id: SocketService.java,v 1.12 2000/11/02 06:57:47 vt Exp $ * @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1995-1998 */ public class SocketService extends ActiveService { @@ -243,7 +243,7 @@ * @exception InterruptedException when this thread was interrupted by * another thread. */ - protected void shutdown() throws InterruptedException, Throwable { + protected void shutdown(Throwable failureCause) throws InterruptedException, Throwable { complain( LOG_DEBUG,LOG_SS,"shutting down" ); |
|
From: CVS B. <vt...@fr...> - 2000-11-02 08:38:14
|
User: vt Date: 00/11/01 23:57:43 Modified: . ChangeLog Log: Checkpoint on the way to implement a shutdown(Throwable failureCause) call, as opposed to no-argument shutdown(). Point is, I want to know why the execute() died, if it did. Revision Changes Path 1.23 +9 -4 J4/ChangeLog CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/ChangeLog?annotate=1.23&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/ChangeLog?rev=1.23&content-type=text/x-cvsweb-markup&cvsroot=jukebox4 CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/ChangeLog.diff?r1=1.23&r2=1.22&cvsroot=jukebox4 ----------------------------------- Index: ChangeLog =================================================================== RCS file: /usr/local/cvs/J4/ChangeLog,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- ChangeLog 2000/09/13 20:14:29 1.22 +++ ChangeLog 2000/11/02 06:57:42 1.23 @@ -1,4 +1,4 @@ -$Id: ChangeLog,v 1.22 2000/09/13 20:14:29 vt Exp $ +$Id: ChangeLog,v 1.23 2000/11/02 06:57:42 vt Exp $ CURRENT RELEASE NOTES @@ -21,11 +21,16 @@ --- 2.1p0 Minor version bump (as opposed to patchlevel) caused by the total reimplementation of the configuration and logging - system. Actually, it was rather shuffling of the pieces of - code back and forth, so the reliability is not likely to - suffer, though the functionality has changed a lot. + system, as well as changing the method signature in + PassiveService allowing the shutdown procedure to be aware + of the reason execution has ended. + + Actually, it was rather shuffling of the pieces of code back + and forth, so the reliability is not likely to suffer, + though the functionality has changed a lot. A lot of dead code eliminated, a lot of code optimized. + --- 2.0p9 Jakarta Regexp support added; XML configuration added, minor fixes. It is now possible to use both global and local |
|
From: CVS B. <vt...@fr...> - 2000-11-02 08:38:11
|
User: vt Date: 00/11/01 23:57:47 Modified: src/java/gnu/j4/net Http11URLConnection.java Log: Checkpoint on the way to implement a shutdown(Throwable failureCause) call, as opposed to no-argument shutdown(). Point is, I want to know why the execute() died, if it did. Revision Changes Path 1.7 +2 -2 J4/src/java/gnu/j4/net/Http11URLConnection.java CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/net/Http11URLConnection.java?annotate=1.7&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/net/Http11URLConnection.java?rev=1.7&content-type=text/x-cvsweb-markup&cvsroot=jukebox4 CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/net/Http11URLConnection.java.diff?r1=1.7&r2=1.6&cvsroot=jukebox4 ----------------------------------- Index: Http11URLConnection.java =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/net/Http11URLConnection.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Http11URLConnection.java 2000/03/03 04:20:19 1.6 +++ Http11URLConnection.java 2000/11/02 06:57:46 1.7 @@ -35,7 +35,7 @@ * * @since Jukebox 4 * @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1995-1998 - * @version $Id: Http11URLConnection.java,v 1.6 2000/03/03 04:20:19 vt Exp $ + * @version $Id: Http11URLConnection.java,v 1.7 2000/11/02 06:57:46 vt Exp $ */ public class Http11URLConnection extends PassiveService { @@ -115,7 +115,7 @@ } } - protected void shutdown() throws InterruptedException, Throwable { + protected void shutdown(Throwable failureCause) throws InterruptedException, Throwable { throw new Error("Not Implemented"); } |
|
From: CVS B. <vt...@fr...> - 2000-11-02 08:38:10
|
User: vt Date: 00/11/01 23:57:51 Modified: src/java/gnu/j4/util TimerCallback.java Log: Checkpoint on the way to implement a shutdown(Throwable failureCause) call, as opposed to no-argument shutdown(). Point is, I want to know why the execute() died, if it did. Revision Changes Path 1.5 +2 -2 J4/src/java/gnu/j4/util/TimerCallback.java CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/util/TimerCallback.java?annotate=1.5&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/util/TimerCallback.java?rev=1.5&content-type=text/x-cvsweb-markup&cvsroot=jukebox4 CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/util/TimerCallback.java.diff?r1=1.5&r2=1.4&cvsroot=jukebox4 ----------------------------------- Index: TimerCallback.java =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/util/TimerCallback.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- TimerCallback.java 2000/03/03 04:20:23 1.4 +++ TimerCallback.java 2000/11/02 06:57:50 1.5 @@ -22,7 +22,7 @@ * expect, so don't expect. Probably the best way to do that will be the timed out * <code>EventSemaphore</code> * @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1995-1998 - * @version $Id: TimerCallback.java,v 1.4 2000/03/03 04:20:23 vt Exp $ + * @version $Id: TimerCallback.java,v 1.5 2000/11/02 06:57:50 vt Exp $ * @see TimerClient */ public class TimerCallback extends ActiveService { @@ -106,7 +106,7 @@ * @exception InterruptedException if this thread is interrupted by * another thread. */ - protected void shutdown() throws InterruptedException { + protected void shutdown(Throwable failureCause) throws InterruptedException { } /** |
|
From: CVS B. <vt...@fr...> - 2000-11-02 08:38:10
|
User: vt Date: 00/11/02 00:05:38 Modified: src/java/gnu/j4/config PropertiesReader.java Log: Oh well, a little more detailed exception trace. Revision Changes Path 1.8 +2 -2 J4/src/java/gnu/j4/config/PropertiesReader.java CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/config/PropertiesReader.java?annotate=1.8&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/config/PropertiesReader.java?rev=1.8&content-type=text/x-cvsweb-markup&cvsroot=jukebox4 CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/config/PropertiesReader.java.diff?r1=1.8&r2=1.7&cvsroot=jukebox4 ----------------------------------- Index: PropertiesReader.java =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/config/PropertiesReader.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- PropertiesReader.java 2000/09/14 23:01:46 1.7 +++ PropertiesReader.java 2000/11/02 07:05:38 1.8 @@ -14,7 +14,7 @@ * Project</a> in general and code written by <a * href="mailto:maz...@sy...">Stefano Mazzocchi</a> in particular. * - * @version $Id: PropertiesReader.java,v 1.7 2000/09/14 23:01:46 vt Exp $ + * @version $Id: PropertiesReader.java,v 1.8 2000/11/02 07:05:38 vt Exp $ */ public class PropertiesReader extends ConfigReader { @@ -155,7 +155,7 @@ if ( escaped ) { - throw new IOException("Unbalanced double quote: '" + source + "'"); + throw new IOException(Integer.toString(getLineNumber()) + ": Unbalanced double quote: '" + source + "'"); } String result = target.toString(); |