jukebox4-cvs Mailing List for Jukebox (Page 5)
Brought to you by:
vtt
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-08-08 23:26:59
|
User: vt Date: 00/08/08 16:26:44 Modified: etc Tag: JAXP .cvsignore Makefile.am Added: etc Tag: JAXP jukebox.conf.xml.in Log: Added the XML configuration template. This is not a working configuration file yet, rather a development tool. It will change several times before it becomes stable. Revision Changes Path No revision No revision 1.1.16.1 +1 -0 J4/etc/.cvsignore CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/etc/.cvsignore?annotate=1.1.16.1&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/etc/.cvsignore?rev=1.1.16.1&content-type=text/x-cvsweb-markup&cvsroot=jukebox4 CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/etc/.cvsignore.diff?r1=1.1.16.1&r2=1.0&cvsroot=jukebox4 ----------------------------------- Index: .cvsignore =================================================================== RCS file: /usr/local/cvs/J4/etc/.cvsignore,v retrieving revision 1.1 retrieving revision 1.1.16.1 diff -u -r1.1 -r1.1.16.1 --- .cvsignore 1999/03/08 22:03:46 1.1 +++ .cvsignore 2000/08/08 23:26:44 1.1.16.1 @@ -1,3 +1,4 @@ Makefile Makefile.in *.conf +*.conf.xml 1.4.2.1 +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.4.2.1&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/etc/Makefile.am?rev=1.4.2.1&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.4.2.1&r2=1.3&cvsroot=jukebox4 ----------------------------------- Index: Makefile.am =================================================================== RCS file: /usr/local/cvs/J4/etc/Makefile.am,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- Makefile.am 2000/07/06 10:47:00 1.4 +++ Makefile.am 2000/08/08 23:26:44 1.4.2.1 @@ -1,7 +1,7 @@ -# $Id: Makefile.am,v 1.4 2000/07/06 10:47:00 vt Exp $ +# $Id: Makefile.am,v 1.4.2.1 2000/08/08 23:26:44 vt Exp $ etcdir = ${prefix}/etc -etc_DATA = log.conf test.conf test.resource.pool.conf management.conf +etc_DATA = log.conf test.conf test.resource.pool.conf management.conf jukebox.conf.xml RM = @RM@ No revision No revision 1.1.2.1 +125 -0 J4/etc/Attic/jukebox.conf.xml.in CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/etc/Attic/jukebox.conf.xml.in?annotate=1.1.2.1&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/etc/Attic/jukebox.conf.xml.in?rev=1.1.2.1&content-type=text/x-cvsweb-markup&cvsroot=jukebox4 CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/etc/Attic/jukebox.conf.xml.in.diff?r1=1.1.2.1&r2=1.0&cvsroot=jukebox4 ----------------------------------- |
From: CVS B. <vt...@fr...> - 2000-08-08 00:19:16
|
User: vt Date: 00/08/07 17:19:04 Modified: src/java/gnu/j4/config Tag: JAXP XmlConfiguration.java Log: Checkpoint Revision Changes Path No revision No revision 1.1.2.2 +36 -1 J4/src/java/gnu/j4/config/Attic/XmlConfiguration.java CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/config/Attic/XmlConfiguration.java?annotate=1.1.2.2&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/config/Attic/XmlConfiguration.java?rev=1.1.2.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/config/Attic/XmlConfiguration.java.diff?r1=1.1.2.2&r2=1.0&cvsroot=jukebox4 ----------------------------------- Index: XmlConfiguration.java =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/config/Attic/XmlConfiguration.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- XmlConfiguration.java 2000/08/07 15:46:09 1.1.2.1 +++ XmlConfiguration.java 2000/08/08 00:19:04 1.1.2.2 @@ -1,13 +1,17 @@ package gnu.j4.config; +import java.util.NoSuchElementException; +import java.util.Vector; + import org.w3c.dom.Document; +import org.w3c.dom.Element; /** * Successor to the classical {@link Configuration Configuration} that * supports the XML configuration files and objects. * * @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1998-2000 - * @version $Id: XmlConfiguration.java,v 1.1.2.1 2000/08/07 15:46:09 vt Exp $ + * @version $Id: XmlConfiguration.java,v 1.1.2.2 2000/08/08 00:19:04 vt Exp $ */ public class XmlConfiguration extends Configuration { @@ -15,4 +19,35 @@ * The XML configuration object. */ private Document theConfiguration; + + + /** + * Get the configuration element. + * + * @param path Dot delimited path to the elements. + * + * @return The element located at the end of this path. + * + * @exception NoSuchElementException if there was no element + * corresponding to the given path. + */ + public Element getElement(String path) { + + throw new Error("Not Implemented"); + } + + /** + * Get the configuration elements. + * + * @param path Dot delimited path to the element. + * + * @return A collection of the elements with the same path. + * + * @exception NoSuchElementException if there were no elements + * corresponding to the given path. + */ + public Vector getElements(String path) { + + throw new Error("Not Implemented"); + } } |
From: CVS B. <vt...@fr...> - 2000-08-08 00:19:16
|
User: vt Date: 00/08/07 17:19:05 Modified: src/java/gnu/j4/examples Tag: JAXP Makefile.am Added: src/java/gnu/j4/examples Tag: JAXP XmlConfigTest.java Log: Checkpoint Revision Changes Path No revision No revision 1.22.2.1 +12 -9 J4/src/java/gnu/j4/examples/Makefile.am CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/Makefile.am?annotate=1.22.2.1&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/Makefile.am?rev=1.22.2.1&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/Makefile.am.diff?r1=1.22.2.1&r2=1.21&cvsroot=jukebox4 ----------------------------------- Index: Makefile.am =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/examples/Makefile.am,v retrieving revision 1.22 retrieving revision 1.22.2.1 diff -u -r1.22 -r1.22.2.1 --- Makefile.am 2000/07/25 09:22:17 1.22 +++ Makefile.am 2000/08/08 00:19:04 1.22.2.1 @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.22 2000/07/25 09:22:17 vt Exp $ +# $Id: Makefile.am,v 1.22.2.1 2000/08/08 00:19:04 vt Exp $ noinst_PROGRAMS = package @@ -24,28 +24,31 @@ JAVA2_FILES = LogTest.java \ RWLockTest.java +JAXP_FILES = XmlConfigTest.java + EJB_FILES = EXTRA_DIST = package.html ${JAVA2_FILES} ${EJB_FILES} if EJB - -if JAVA2 -package_SOURCES = ${BASE_FILES} ${JAVA2_FILES} ${EJB_FILES} +EJB_SUBSET = ${EJB_FILES} else -package_SOURCES = ${BASE_FILES} ${EJB_FILES} +EJB_SUBSET = endif -else - if JAVA2 -package_SOURCES = ${BASE_FILES} ${JAVA2_FILES} +JAVA2_SUBSET = ${JAVA2_FILES} else -package_SOURCES = ${BASE_FILES} +JAVA2_SUBSET = endif +if JAXP +JAXP_SUBSET = ${JAXP_FILES} +else +JAXP_SUBSET endif +package_SOURCES = ${BASE_FILES} ${JAVA2_SUBSET} ${EJB_SUBSET} ${JAXP_SUBSET} ECHO = @ECHO@ JAVACX = @JAVACX@ No revision No revision 1.1.2.1 +9 -0 J4/src/java/gnu/j4/examples/Attic/XmlConfigTest.java CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/Attic/XmlConfigTest.java?annotate=1.1.2.1&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/Attic/XmlConfigTest.java?rev=1.1.2.1&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/Attic/XmlConfigTest.java.diff?r1=1.1.2.1&r2=1.0&cvsroot=jukebox4 ----------------------------------- |
From: CVS B. <vt...@fr...> - 2000-08-08 00:19:16
|
User: vt Date: 00/08/07 17:19:04 Modified: . Tag: JAXP configure.in Log: Checkpoint Revision Changes Path No revision No revision 1.63.2.2 +2 -2 J4/configure.in CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/configure.in?annotate=1.63.2.2&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/configure.in?rev=1.63.2.2&content-type=text/x-cvsweb-markup&cvsroot=jukebox4 CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/configure.in.diff?r1=1.63.2.2&r2=1.62&cvsroot=jukebox4 ----------------------------------- Index: configure.in =================================================================== RCS file: /usr/local/cvs/J4/configure.in,v retrieving revision 1.63.2.1 retrieving revision 1.63.2.2 diff -u -r1.63.2.1 -r1.63.2.2 --- configure.in 2000/08/07 05:31:56 1.63.2.1 +++ configure.in 2000/08/08 00:19:04 1.63.2.2 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_REVISION($Id: configure.in,v 1.63.2.1 2000/08/07 05:31:56 vt Exp $)dnl +AC_REVISION($Id: configure.in,v 1.63.2.2 2000/08/08 00:19:04 vt Exp $)dnl dnl I'd like it to read the ./configure-options to allow both the basic set dnl of options, as well as the local set. @@ -303,7 +303,7 @@ AC_PATH_EXTRA(JTS) AC_PATH_EXTRA(JMX) AC_PATH_EXTRA(JAXP) -AC_PATH_EXTRA(JAXP_CLASSES) +AC_PATH_EXTRA(JAXP_PARSER) dnl FIXME: Ugly hack |
From: CVS B. <vt...@fr...> - 2000-08-07 15:46:31
|
User: vt Date: 00/08/07 08:46:09 Modified: src/java/gnu/j4/config Tag: JAXP Makefile.am Added: src/java/gnu/j4/config Tag: JAXP XmlConfiguration.java Log: Checkpoint Revision Changes Path No revision No revision 1.8.2.1 +14 -6 J4/src/java/gnu/j4/config/Makefile.am CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/config/Makefile.am?annotate=1.8.2.1&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/config/Makefile.am?rev=1.8.2.1&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/Makefile.am.diff?r1=1.8.2.1&r2=1.7&cvsroot=jukebox4 ----------------------------------- Index: Makefile.am =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/config/Makefile.am,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -r1.8 -r1.8.2.1 --- Makefile.am 2000/07/06 10:47:03 1.8 +++ Makefile.am 2000/08/07 15:46:09 1.8.2.1 @@ -1,23 +1,31 @@ -# $Id: Makefile.am,v 1.8 2000/07/06 10:47:03 vt Exp $ +# $Id: Makefile.am,v 1.8.2.1 2000/08/07 15:46:09 vt Exp $ BASE_FILES = ConfigReader.java \ Configuration.java \ PropertiesReader.java -if JSDK - JSDK_FILES = ServletConfigReader.java +JAXP_FILES = XmlConfiguration.java +if JSDK +JSDK_SUBSET = ${JSDK_FILES} else +JSDK_SUBSET = +endif -JSDK_FILES = +## This depends on the presence of *BOTH* JAXP and JAXP_PARSER subsets. +## FIXME: implement the check in configure.in. +if JAXP +JAXP_SUBSET = ${JAXP_FILES} +else +JAXP_SUBSET = endif -EXTRA_DIST = package.html ServletConfigReader.java +EXTRA_DIST = package.html ${JSDK_FILES} ${JAXP_FILES} noinst_PROGRAMS = package -package_SOURCES = ${BASE_FILES} ${JSDK_FILES} +package_SOURCES = ${BASE_FILES} ${JSDK_FILES} ${JAXP_SUBSET} ECHO = @ECHO@ JAVACX = @JAVACX@ No revision No revision 1.1.2.1 +18 -0 J4/src/java/gnu/j4/config/Attic/XmlConfiguration.java CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/config/Attic/XmlConfiguration.java?annotate=1.1.2.1&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/config/Attic/XmlConfiguration.java?rev=1.1.2.1&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/Attic/XmlConfiguration.java.diff?r1=1.1.2.1&r2=1.0&cvsroot=jukebox4 ----------------------------------- |
From: CVS B. <vt...@fr...> - 2000-08-07 05:32:11
|
User: vt Date: 00/08/06 22:31:56 Modified: . Tag: JAXP configure.in acinclude.m4 Log: Adjusted to accomodate the JAXP classes. As a side effect, a bug fixed: now the directory for the AC_PATH_JAVACLASS will be searched even if it is a symlink. Revision Changes Path No revision No revision 1.63.2.1 +21 -2 J4/configure.in CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/configure.in?annotate=1.63.2.1&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/configure.in?rev=1.63.2.1&content-type=text/x-cvsweb-markup&cvsroot=jukebox4 CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/configure.in.diff?r1=1.63.2.1&r2=1.62&cvsroot=jukebox4 ----------------------------------- Index: configure.in =================================================================== RCS file: /usr/local/cvs/J4/configure.in,v retrieving revision 1.63 retrieving revision 1.63.2.1 diff -u -r1.63 -r1.63.2.1 --- configure.in 2000/07/19 04:53:19 1.63 +++ configure.in 2000/08/07 05:31:56 1.63.2.1 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_REVISION($Id: configure.in,v 1.63 2000/07/19 04:53:19 vt Exp $)dnl +AC_REVISION($Id: configure.in,v 1.63.2.1 2000/08/07 05:31:56 vt Exp $)dnl dnl I'd like it to read the ./configure-options to allow both the basic set dnl of options, as well as the local set. @@ -85,6 +85,8 @@ AC_PATH_PROG_VERIFY(CP,cp,$PATH)dnl AC_PATH_PROG_VERIFY(MV,mv,$PATH)dnl AC_PATH_PROG_VERIFY(HEAD,head,$PATH)dnl +AC_PATH_PROG_VERIFY(TR,tr,$PATH)dnl +AC_PATH_PROG_VERIFY(GREP,grep,$PATH)dnl HOST=`${UNAME} -n` AC_SUBST(HOST) @@ -195,6 +197,12 @@ AM_CONDITIONAL(REX,${TEST} -n "${REX_CLASSES}") AM_CONDITIONAL(JSDK,${TEST} -n "${JSDK_CLASSES}") +AC_PATH_JAVACLASS(JAXP,jaxp,javax.xml.parsers.SAXParser,[ Where to find the JAXP extension (http://java.sun.com/xml)],"optional") +AC_PATH_JAVACLASS(JAXP_PARSER,jaxp,com.sun.xml.parser.Parser,[ Where to find the JAXP parser (http://java.sun.com/xml)],"optional") + +AM_CONDITIONAL(JAXP,${TEST} -n "${JAXP_CLASSES}") +AM_CONDITIONAL(JAXP_PARSER,${TEST} -n "${JAXP_PARSER_CLASSES}") + dnl Define the TARGET_CLASSPATH TARGET_CLASSPATH=`cd ${srcdir} && pwd`/src/java @@ -294,6 +302,8 @@ AC_PATH_EXTRA(JTA) AC_PATH_EXTRA(JTS) AC_PATH_EXTRA(JMX) +AC_PATH_EXTRA(JAXP) +AC_PATH_EXTRA(JAXP_CLASSES) dnl FIXME: Ugly hack @@ -467,7 +477,14 @@ AC_MSG_RESULT(Thread library: ${THREADLIB}) -AC_MSG_RESULT(Build classpath is set to: ${TARGET_CLASSPATH}) +AC_MSG_RESULT(Build classpath is set to:) + +BUILD_CLASSPATH=`${ECHO} $TARGET_CLASSPATH|${TR} "${CPS}" "\n"` + +AC_MSG_RESULT() +for dir in ${BUILD_CLASSPATH}; do + AC_MSG_RESULT([ $dir]) +done AC_MSG_RESULT() @@ -481,6 +498,8 @@ AC_REPORT_OPTIONAL(JTS) AC_REPORT_OPTIONAL(JMX) AC_REPORT_OPTIONAL(JMXTOOLS) +AC_REPORT_OPTIONAL(JAXP) +AC_REPORT_OPTIONAL(JAXP_PARSER) AC_MSG_RESULT() if ${TEST} -z "$BOOTSTRAP" ; then 1.25.2.1 +7 -5 J4/acinclude.m4 CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/acinclude.m4?annotate=1.25.2.1&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/acinclude.m4?rev=1.25.2.1&content-type=text/x-cvsweb-markup&cvsroot=jukebox4 CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/acinclude.m4.diff?r1=1.25.2.1&r2=1.24&cvsroot=jukebox4 ----------------------------------- Index: acinclude.m4 =================================================================== RCS file: /usr/local/cvs/J4/acinclude.m4,v retrieving revision 1.25 retrieving revision 1.25.2.1 diff -u -r1.25 -r1.25.2.1 --- acinclude.m4 2000/07/17 02:15:25 1.25 +++ acinclude.m4 2000/08/07 05:31:56 1.25.2.1 @@ -338,7 +338,7 @@ dnl Transform the class name into the path name - CLASS="`echo $3|tr "." "/"`.class" + CLASS="`${ECHO} $3|${TR} "." "/"`.class" dnl Find out what it is @@ -361,6 +361,8 @@ fi fi else + + dnl OK, so this is a jar file AC_PATH_VERIFYJAR($1,${$1_CLASSES},${CLASS}) @@ -411,11 +413,11 @@ AC_DEFUN(AC_PATH_SEARCHCLASS, [ - PRESENT=`(cd $2 && find . -name "*.class"|grep "$3"|cut -c 3-)` + PRESENT=`(cd $2 && ${FIND} . -name "*.class"|${GREP} "$3"|${CUT} -c 3-)` if ${TEST} -n "${PRESENT}" ; then - PRESENT=`echo ${PRESENT}|grep -x "${CLASS}"` + PRESENT=`${ECHO} ${PRESENT}|${GREP} -x "${CLASS}"` if ${TEST} -z "${PRESENT}" ; then @@ -439,8 +441,8 @@ AC_DEFUN(AC_PATH_SEARCHJAR, [ - JARS=`find $2 -name "*.jar" -or -name "*.zip"|tr "\n" " "` - + JARS=`${FIND} $2/ -name "*.jar" -o -name "*.zip"|${TR} "\n" " "` + if ${TEST} -n "$JARS" ; then for JARFILE in ${JARS}; do dnl AC_MSG_CHECKING('$JARFILE' for $3) |
From: CVS B. <vt...@fr...> - 2000-08-04 23:21:53
|
User: vt Date: 00/08/04 16:21:47 Modified: src/java/gnu/j4/core Makefile.am RegexpFacilityFilter.java Added: src/java/gnu/j4/core RexFacilityFilter.java Log: Added the support for the Jakarta Regexp. Revision Changes Path 1.17 +12 -4 J4/src/java/gnu/j4/core/Makefile.am CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/core/Makefile.am?annotate=1.17&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/core/Makefile.am?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/core/Makefile.am.diff?r1=1.17&r2=1.16&cvsroot=jukebox4 ----------------------------------- Index: Makefile.am =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/core/Makefile.am,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- Makefile.am 2000/07/25 07:12:56 1.16 +++ Makefile.am 2000/08/04 23:21:46 1.17 @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.16 2000/07/25 07:12:56 vt Exp $ +# $Id: Makefile.am,v 1.17 2000/08/04 23:21:46 vt Exp $ EXTRA_DIST = package.html noinst_PROGRAMS = package @@ -28,15 +28,23 @@ JMX_FILES = JmxSyslog.java -REX_FILES = RegexpFacilityFilter.java +REGEXP_FILES = RegexpFacilityFilter.java -EXTRA_DIST = ${JAVA2_FILES} ${REX_FILES} ${JMX_FILES} +REX_FILES = RexFacilityFilter.java +EXTRA_DIST = ${JAVA2_FILES} ${REGEXP_FILES} ${REX_FILES} ${JMX_FILES} + # The reference to RegexpFacilityFilter.java will appear here only if you're making the # package with gnu.rex # The reference to UdpSyslog.java will appear here only if the JDK is 1.2 +if REGEXP +REGEXP_SUBSET = ${REGEXP_FILES} +else +REGEXP_SUBSET = +endif + if REX REX_SUBSET = ${REX_FILES} else @@ -61,7 +69,7 @@ JMX_SUBSET = endif -package_SOURCES = ${BASE_FILES} ${JAVA2_SUBSET} ${JAVA3_SUBSET} ${REX_SUBSET} ${JMX_SUBSET} +package_SOURCES = ${BASE_FILES} ${JAVA2_SUBSET} ${JAVA3_SUBSET} ${REGEXP_SUBSET} ${REX_SUBSET} ${JMX_SUBSET} ECHO = @ECHO@ JAVACX = @JAVACX@ 1.6 +11 -15 J4/src/java/gnu/j4/core/RegexpFacilityFilter.java CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/core/RegexpFacilityFilter.java?annotate=1.6&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/core/RegexpFacilityFilter.java?rev=1.6&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/core/RegexpFacilityFilter.java.diff?r1=1.6&r2=1.5&cvsroot=jukebox4 ----------------------------------- Index: RegexpFacilityFilter.java =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/core/RegexpFacilityFilter.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- RegexpFacilityFilter.java 1999/06/29 04:35:34 1.5 +++ RegexpFacilityFilter.java 2000/08/04 23:21:46 1.6 @@ -3,8 +3,10 @@ import java.util.Enumeration; import java.util.Vector; +import org.apache.regexp.RE; +import org.apache.regexp.RESyntaxException; + import gnu.j4.config.Configuration; -import gnu.rex.*; /** * Syslog facility filter based on the regular expression pattern matching. @@ -15,11 +17,11 @@ * SwitchFacilityFilter}, but it may bear more overhead. Not necessarily, * but quite probably. * - * <code>gnu.rex</code> package is required to use this filter, see the - * documentation for details. + * <a href="http://jakarta.apache.org/regexp/">Jakarta Regexp</a> package is + * required to use this filter, see the documentation for details. * * @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1995-1998 - * @version $Id: RegexpFacilityFilter.java,v 1.5 1999/06/29 04:35:34 vt Exp $ + * @version $Id: RegexpFacilityFilter.java,v 1.6 2000/08/04 23:21:46 vt Exp $ */ public class RegexpFacilityFilter extends SyslogFacilityFilter implements LogConfigKeywords { @@ -65,14 +67,14 @@ } String sPattern = raw.substring(patternIndex, raw.length()-1); - Rex pattern = Rex.build(sPattern); + RE pattern = new RE(sPattern); Pattern p = new Pattern(include, pattern); // System.err.println("Pattern: " + sPattern); patternSet.addElement(p); } - } catch ( RegExprSyntaxException resex ) { + } catch ( RESyntaxException resex ) { throw new Error( resex.toString() ); } } @@ -93,19 +95,13 @@ + ((ll == null)?"NO_LEVEL":ll.toString()); // System.err.println("Search: " + target); - int length = target.length(); - char buf[] = new char[length]; - - target.getChars(0, length, buf, 0); - boolean include = false; for ( Enumeration e = patternSet.elements(); e.hasMoreElements(); ) { Pattern p = (Pattern)e.nextElement(); - RexResult match = p.pattern.match(buf, 0, length); - if ( match != null ) { + if ( p.pattern.match(target) ) { // System.err.println("Match (" + p.include + "): "+ match.toString()); include = p.include; @@ -118,9 +114,9 @@ protected class Pattern { boolean include = true; - Rex pattern = null; + RE pattern = null; - private Pattern(boolean include, Rex pattern) { + private Pattern(boolean include, RE pattern) { this.include = include; this.pattern = pattern; } 1.1 J4/src/java/gnu/j4/core/RexFacilityFilter.java CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/core/RexFacilityFilter.java?annotate=1.1&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/core/RexFacilityFilter.java?rev=1.1&content-type=text/x-cvsweb-markup&cvsroot=jukebox4 ----------------------------------- Index: RexFacilityFilter.java =================================================================== package gnu.j4.core; import java.util.Enumeration; import java.util.Vector; import gnu.j4.config.Configuration; import gnu.rex.*; /** * Syslog facility filter based on the regular expression pattern matching. * * <p> * * This filter is much more powerful than the {@link SwitchFacilityFilter * SwitchFacilityFilter}, but it may bear more overhead. Not necessarily, * but quite probably. * * <code>gnu.rex</code> package is required to use this filter, see the * documentation for details. * * @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1995-1998 * @version $Id: RexFacilityFilter.java,v 1.1 2000/08/04 23:21:46 vt Exp $ */ public class RexFacilityFilter extends SyslogFacilityFilter implements LogConfigKeywords { /** * Collection of preprocessed patterns to match. * * The patterns are specified with the keyword defined by {@link * LogConfigKeywords#SYSLOG_REX_PATTERN SYSLOG_REX_PATTERN}. */ protected Vector patternSet = new Vector(); public void init(String confName) { super.init(confName); Configuration defaultCfg = new Configuration(); Vector defaultPattern = new Vector(); defaultPattern.addElement(".*"); defaultPattern.addElement("-\\.DEBUG"); defaultCfg.put(SYSLOG_REX_PATTERN, defaultPattern); conf = Configuration.createChain(confName, defaultCfg); try { Vector stringPatternSet = conf.getVector(SYSLOG_REX_PATTERN); for ( Enumeration e = stringPatternSet.elements(); e.hasMoreElements(); ) { String raw = e.nextElement().toString(); // First character is '-' (exclude) or '+' or anything else (include). boolean include = true; int patternIndex = 0; if ( raw.charAt(0) == '-' ) { include = false; patternIndex = 1; } else if ( raw.charAt(0) == '+' ) { patternIndex = 1; } String sPattern = raw.substring(patternIndex, raw.length()-1); Rex pattern = Rex.build(sPattern); Pattern p = new Pattern(include, pattern); // System.err.println("Pattern: " + sPattern); patternSet.addElement(p); } } catch ( RegExprSyntaxException resex ) { throw new Error( resex.toString() ); } } /** * Find out if the combination of the log level and facility is enabled. * * @param ll Log level. * @param facility Log facility. * @return true if the given combination is allowed to be written. */ public boolean isEnabled( LogLevel ll, String facility ) { // First of all, let's glue the level and facility together String target = (facility == null)?"NULL_FACILITY":facility + "." + ((ll == null)?"NO_LEVEL":ll.toString()); // System.err.println("Search: " + target); int length = target.length(); char buf[] = new char[length]; target.getChars(0, length, buf, 0); boolean include = false; for ( Enumeration e = patternSet.elements(); e.hasMoreElements(); ) { Pattern p = (Pattern)e.nextElement(); RexResult match = p.pattern.match(buf, 0, length); if ( match != null ) { // System.err.println("Match (" + p.include + "): "+ match.toString()); include = p.include; } } // System.err.println("Final: " + target + ": " + include ); return include; } protected class Pattern { boolean include = true; Rex pattern = null; private Pattern(boolean include, Rex pattern) { this.include = include; this.pattern = pattern; } } } |
From: CVS B. <vt...@fr...> - 2000-08-04 23:21:52
|
User: vt Date: 00/08/04 16:21:46 Modified: docs/apidocs index-template.html Log: Added the support for the Jakarta Regexp. Revision Changes Path 1.7 +1 -1 J4/docs/apidocs/index-template.html CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/docs/apidocs/index-template.html?annotate=1.7&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/docs/apidocs/index-template.html?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/docs/apidocs/index-template.html.diff?r1=1.7&r2=1.6&cvsroot=jukebox4 ----------------------------------- Index: index-template.html =================================================================== RCS file: /usr/local/cvs/J4/docs/apidocs/index-template.html,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- index-template.html 2000/07/18 21:45:59 1.6 +++ index-template.html 2000/08/04 23:21:46 1.7 @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc on Sat Jul 08 19:40:48 MDT 2000--> +<!-- Generated by javadoc on Mon Jul 24 15:52:54 MDT 2000--> <TITLE> Generated Documentation (Untitled) </TITLE> |
From: CVS B. <vt...@fr...> - 2000-08-04 23:21:51
|
User: vt Date: 00/08/04 16:21:46 Modified: . ChangeLog configure.in Log: Added the support for the Jakarta Regexp. Revision Changes Path 1.19 +3 -1 J4/ChangeLog CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/ChangeLog?annotate=1.19&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/ChangeLog?rev=1.19&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.19&r2=1.18&cvsroot=jukebox4 ----------------------------------- Index: ChangeLog =================================================================== RCS file: /usr/local/cvs/J4/ChangeLog,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ChangeLog 2000/07/14 06:48:39 1.18 +++ ChangeLog 2000/08/04 23:21:46 1.19 @@ -1,4 +1,4 @@ -$Id: ChangeLog,v 1.18 2000/07/14 06:48:39 vt Exp $ +$Id: ChangeLog,v 1.19 2000/08/04 23:21:46 vt Exp $ CURRENT RELEASE NOTES @@ -17,6 +17,8 @@ JVM version and excludes these files from the build process. CHANGE LOG + +--- 2.0p9 Added support for Jakarta Regexp --- 2.0p8 JMX support is compiled in by default, if the JMX jar files are found. 1.64 +5 -1 J4/configure.in CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/configure.in?annotate=1.64&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/configure.in?rev=1.64&content-type=text/x-cvsweb-markup&cvsroot=jukebox4 CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/configure.in.diff?r1=1.64&r2=1.63&cvsroot=jukebox4 ----------------------------------- Index: configure.in =================================================================== RCS file: /usr/local/cvs/J4/configure.in,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- configure.in 2000/07/19 04:53:19 1.63 +++ configure.in 2000/08/04 23:21:46 1.64 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_REVISION($Id: configure.in,v 1.63 2000/07/19 04:53:19 vt Exp $)dnl +AC_REVISION($Id: configure.in,v 1.64 2000/08/04 23:21:46 vt Exp $)dnl dnl I'd like it to read the ./configure-options to allow both the basic set dnl of options, as well as the local set. @@ -189,9 +189,11 @@ dnl Find the optional components +AC_PATH_JAVACLASS(REGEXP,jakarta,org.apache.regexp.RE,[ Where to find the Jakarta Regexp library (http://jakarta.apache.org/regexp/) (RECOMMENDED)],"optional") AC_PATH_JAVACLASS(REX,gnu.rex,gnu.rex.Rex,[ Where to find the REX library (http://www.crocodile.org/~sts/Rex) (RECOMMENDED)],"optional") AC_PATH_JAVACLASS(JSDK,JSDK2.0,javax.servlet.Servlet,[ Where to find the JSDK 2.0 classes],"optional") +AM_CONDITIONAL(REGEXP,${TEST} -n "${REGEXP_CLASSES}") AM_CONDITIONAL(REX,${TEST} -n "${REX_CLASSES}") AM_CONDITIONAL(JSDK,${TEST} -n "${JSDK_CLASSES}") @@ -287,6 +289,7 @@ AM_CONDITIONAL(MAIL, ${TEST} -n "${MAIL_ENABLED}") AC_PATH_EXTRA(JSDK) +AC_PATH_EXTRA(REGEXP) AC_PATH_EXTRA(REX) AC_PATH_EXTRA(EJB11) AC_PATH_EXTRA(EJB10) @@ -471,6 +474,7 @@ AC_MSG_RESULT() +AC_REPORT_OPTIONAL(REGEXP) AC_REPORT_OPTIONAL(REX) AC_REPORT_OPTIONAL(JSDK) |
From: CVS B. <vt...@fr...> - 2000-08-04 23:21:13
|
User: vt Date: 00/08/04 16:21:08 Modified: src/java/gnu/j4/examples Base64Example.java Log: Checkpoint. It's not exactly clear what is going on here. Revision Changes Path 1.2 +37 -4 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.2&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/Base64Example.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/examples/Base64Example.java.diff?r1=1.2&r2=1.1&cvsroot=jukebox4 ----------------------------------- Index: Base64Example.java =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/examples/Base64Example.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Base64Example.java 2000/07/25 09:22:17 1.1 +++ Base64Example.java 2000/08/04 23:21:07 1.2 @@ -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.1 2000/07/25 09:22:17 vt Exp $ + * @version $Id: Base64Example.java,v 1.2 2000/08/04 23:21:07 vt Exp $ */ public class Base64Example extends ActiveService { @@ -81,10 +81,33 @@ ByteArrayOutputStream out = new ByteArrayOutputStream(); + // This is guaranteed to work, has been tested before. + + while ( true ) { + + int ch = encoderStream.read(); + + if ( ch == -1 ) { + + break; + } + + out.write(ch); + } + + String encodedReliable = out.toString(); + + complain(LOG_NOTICE, CH_BASE64, "Encoded: '" + encodedReliable + "'"); + + in = new ByteArrayInputStream(source.getBytes()); + encoderStream = new Base64EncoderInputStream(in, 0); + + out = new ByteArrayOutputStream(); + while ( encoderStream.available() != 0 ) { // while ( true ) { - complain(LOG_NOTICE, CH_BASE64, "Available: " + encoderStream.available()); + complain(LOG_INFO, CH_BASE64, "Available: " + encoderStream.available()); int ch = encoderStream.read(); // complain(LOG_NOTICE, CH_BASE64, "Encoded: '" + (char)ch + "' (" + ch + ")"); @@ -99,9 +122,14 @@ } String encoded = out.toString(); + + complain(LOG_NOTICE, CH_BASE64, "Encoded: '" + encoded + "', length " + encoded.length()); - complain(LOG_NOTICE, CH_BASE64, "Encoded: '" + encoded + "'"); + if ( !encodedReliable.equals(encoded) ) { + complain(LOG_ERR, CH_BASE64, "FAILED: '" + encodedReliable + "', length " + encodedReliable.length()); + } + in = new ByteArrayInputStream(encoded.getBytes()); Base64DecoderInputStream decoderStream = new Base64DecoderInputStream(in); @@ -110,7 +138,7 @@ while ( decoderStream.available() != 0 ) { // while ( true ) { - complain(LOG_NOTICE, CH_BASE64, "Available: " + decoderStream.available()); + complain(LOG_INFO, CH_BASE64, "Available: " + decoderStream.available()); int ch = decoderStream.read(); // complain(LOG_NOTICE, CH_BASE64, "Decoded: '" + (char)ch + "' (" + ch + ")"); @@ -127,6 +155,11 @@ String decoded = out.toString(); complain(LOG_NOTICE, CH_BASE64, "Decoded: '" + decoded + "'"); + + if ( !source.equals(decoded) ) { + + complain(LOG_ERR, CH_BASE64, "FAILED: '" + source + "', length " + source.length()); + } } } |
From: CVS B. <vt...@fr...> - 2000-07-28 06:44:12
|
User: vt Date: 00/07/27 23:44:22 Modified: src/java/gnu/j4/io/base64 Base64State.java Log: Changed the modifiers to reflect the proper access permissions and documented a little Revision Changes Path 1.4 +62 -16 J4/src/java/gnu/j4/io/base64/Base64State.java CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/io/base64/Base64State.java?annotate=1.4&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/io/base64/Base64State.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/io/base64/Base64State.java.diff?r1=1.4&r2=1.3&cvsroot=jukebox4 ----------------------------------- Index: Base64State.java =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/io/base64/Base64State.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Base64State.java 1999/06/29 04:35:35 1.3 +++ Base64State.java 2000/07/28 06:44:22 1.4 @@ -5,11 +5,12 @@ * its access methods. * * @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1995-1998 - * @version $Id: Base64State.java,v 1.3 1999/06/29 04:35:35 vt Exp $ + * @version $Id: Base64State.java,v 1.4 2000/07/28 06:44:22 vt Exp $ * @see Base64EncoderInputStream * @see Base64DecoderInputStream */ class Base64State { + /** * Offset within a triplet which points to the byte to read/write next. */ @@ -32,55 +33,98 @@ /** * Read the next byte from the octet. - * <p> - * Note: it's your responsibility to maintain the offset sane. + * + * No bounds checking is performed for efficiency, so don't try this at + * home. + * * @return Octet byte. */ - public byte readOctetByte() { + byte readOctetByte() { + return octet[offset4++]; } /** * Write the next byte to the octet. - * <p> - * Note: it's your responsibility to maintain the offset sane. + * + * No bounds checking is performed for efficiency, so don't try this at + * home. + * * @param b Byte to write. */ - public void writeOctetByte( byte b ) { + void writeOctetByte( byte b ) { + octet[offset4++] = b; } - public boolean isOctetReady() { + /** + * Check if the octet is full. + * + * @return <code>true</code> if the {@link #octet octet} {@link + * #offset4 offset} equals to 4, i.e. it is full and ready to be + * consumed. + */ + boolean isOctetReady() { + return (offset4 == 4) ? true : false; } - public void clearOctet() { + void clearOctet() { + offset4 = 0; } - public void clearTriplet() { + void clearTriplet() { + offset3 = 0; } - public void writeTripletByte( byte b ) { + /** + * Write the next byte to the triplet. + * + * No bounds checking is performed for efficiency, so don't try this at + * home. + * + * @param b Byte to write. + */ + void writeTripletByte( byte b ) { + triplet[offset3++] = b; } + + /** + * Check if the triplet is full. + * + * @return <code>true</code> if the {@link #triplet triplet} {@link + * #offset3 offset} equals to 3, i.e. it is full and ready to be + * consumed. + */ + boolean isTripletReady() { - public boolean isTripletReady() { return (offset3 == 3) ? true : false; } - public boolean isTripletClear() { + /** + * Check if the triplet is clear. + * + * @return <code>true</code> if the {@link #triplet triplet} {@link + * #offset3 offset} equals to 0, i.e. there's no data in the triplet. + */ + boolean isTripletClear() { return (offset3 == 0) ? true : false; } - public void clear() { + /** + * Clear both the {@link #triplet triplet} and {@link #octet}. + */ + void clear() { + clearTriplet(); clearOctet(); } @@ -90,7 +134,8 @@ * * @return number of bytes available to read/write from the triplet. */ - public int tripletAvailable() { + int tripletAvailable() { + return (3 - offset3); } @@ -99,7 +144,8 @@ * * @return number of bytes available to read/write from the octet. */ - public int octetAvailable() { + int octetAvailable() { + return (4 - offset4); } } |
From: CVS B. <vt...@fr...> - 2000-07-25 19:05:46
|
User: vt Date: 00/07/25 12:05:46 Modified: src/java/gnu/j4/io/base64 Base64DecoderInputStream.java Log: Oops, debug statement... Revision Changes Path 1.5 +2 -2 J4/src/java/gnu/j4/io/base64/Base64DecoderInputStream.java CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/io/base64/Base64DecoderInputStream.java?annotate=1.5&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/io/base64/Base64DecoderInputStream.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/io/base64/Base64DecoderInputStream.java.diff?r1=1.5&r2=1.4&cvsroot=jukebox4 ----------------------------------- Index: Base64DecoderInputStream.java =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/io/base64/Base64DecoderInputStream.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Base64DecoderInputStream.java 2000/07/25 18:53:57 1.4 +++ Base64DecoderInputStream.java 2000/07/25 19:05:46 1.5 @@ -14,7 +14,7 @@ * Be careful with instances of this class, they're good just for once. * * @author Unknown, last modified by <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1995-2000 - * @version $Id: Base64DecoderInputStream.java,v 1.4 2000/07/25 18:53:57 vt Exp $ + * @version $Id: Base64DecoderInputStream.java,v 1.5 2000/07/25 19:05:46 vt Exp $ */ public class Base64DecoderInputStream extends Base64InputStream { /** @@ -99,7 +99,7 @@ */ public int available() throws IOException { - System.err.println("Available: " + super.available() + "/" + state.tripletAvailable()); +// System.err.println("Available: " + super.available() + "/" + state.tripletAvailable()); return super.available() + state.tripletAvailable(); } |
From: CVS B. <vt...@fr...> - 2000-07-25 18:54:01
|
User: vt Date: 00/07/25 11:53:57 Modified: src/java/gnu/j4/io/base64 Base64DecoderInputStream.java Base64EncoderInputStream.java Log: Quick fix for the available() bug. available() is still not 100% correct, however, it correctly handles the end of input stream condition. Revision Changes Path 1.4 +25 -4 J4/src/java/gnu/j4/io/base64/Base64DecoderInputStream.java CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/io/base64/Base64DecoderInputStream.java?annotate=1.4&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/io/base64/Base64DecoderInputStream.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/io/base64/Base64DecoderInputStream.java.diff?r1=1.4&r2=1.3&cvsroot=jukebox4 ----------------------------------- Index: Base64DecoderInputStream.java =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/io/base64/Base64DecoderInputStream.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Base64DecoderInputStream.java 1999/06/29 04:35:35 1.3 +++ Base64DecoderInputStream.java 2000/07/25 18:53:57 1.4 @@ -6,13 +6,15 @@ /** * RFC-2045 compliant implementation of Base64 content decoding reader. - * <br> - * Reads from the Base64 encoded stream, returns the source data stream. + * + * Reads the bytes from the Base64 encoded stream, returns the bytes from the source data stream. + * * <p> + * * Be careful with instances of this class, they're good just for once. * - * @author Unknown, last modified by <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1995-1998 - * @version $Id: Base64DecoderInputStream.java,v 1.3 1999/06/29 04:35:35 vt Exp $ + * @author Unknown, last modified by <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1995-2000 + * @version $Id: Base64DecoderInputStream.java,v 1.4 2000/07/25 18:53:57 vt Exp $ */ public class Base64DecoderInputStream extends Base64InputStream { /** @@ -81,5 +83,24 @@ state.writeOctetByte( (byte)c ); } return true; + } + + /** + * Returns the number of bytes that can be read from this input stream without + * blocking. + * + * This methods reads the value of <code>super.available()</code> and + * adjusts it with the amount of data available in the triplet. + * + * @return The number of bytes that can be read from the input stream + * without blocking. + * + * @exception IOException - if an I/O error occurs. + */ + public int available() throws IOException { + + System.err.println("Available: " + super.available() + "/" + state.tripletAvailable()); + + return super.available() + state.tripletAvailable(); } } 1.4 +28 -4 J4/src/java/gnu/j4/io/base64/Base64EncoderInputStream.java CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/io/base64/Base64EncoderInputStream.java?annotate=1.4&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/io/base64/Base64EncoderInputStream.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/io/base64/Base64EncoderInputStream.java.diff?r1=1.4&r2=1.3&cvsroot=jukebox4 ----------------------------------- Index: Base64EncoderInputStream.java =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/io/base64/Base64EncoderInputStream.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Base64EncoderInputStream.java 1999/06/29 04:35:35 1.3 +++ Base64EncoderInputStream.java 2000/07/25 18:53:57 1.4 @@ -5,14 +5,19 @@ /** * RFC-2045 compliant implementation of Base64 content encoding reader. - * <br> - * Reads from the data source stream, returns the Base64 encoded stream. + * + * Reads the bytes from the data source stream, returns the bytes from the + * Base64 encoded stream. + * * <p> + * * Be careful with instances of this class, they're good just for once. - * @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1995-1998 - * @version $Id: Base64EncoderInputStream.java,v 1.3 1999/06/29 04:35:35 vt Exp $ + * + * @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1995-2000 + * @version $Id: Base64EncoderInputStream.java,v 1.4 2000/07/25 18:53:57 vt Exp $ */ public class Base64EncoderInputStream extends Base64InputStream implements Base64Constants { + /** * Current maximum line length. * Can't be lower than 4. 0 means infinite. @@ -159,5 +164,24 @@ */ public int getMaxLineLength() { return maxLineLength; + } + + /** + * Returns the number of bytes that can be read from this input stream without + * blocking. + * + * This methods reads the value of <code>super.available()</code> and + * adjusts it with the amount of data available in the octet. + * + * @return The number of bytes that can be read from the input stream + * without blocking. + * + * @exception IOException - if an I/O error occurs. + */ + public int available() throws IOException { + +// System.err.println("Available: " + super.available() + "/" + state.octetAvailable()); + + return super.available() + state.octetAvailable(); } } |
From: CVS B. <vt...@fr...> - 2000-07-25 17:42:31
|
User: vt Date: 00/07/25 10:42:28 Modified: src/java/gnu/j4/config Configuration.java Log: Now the request for the vector will return the comma separated values as different elements, not as a single string. Revision Changes Path 1.30 +19 -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.30&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/config/Configuration.java?rev=1.30&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.30&r2=1.29&cvsroot=jukebox4 ----------------------------------- Index: Configuration.java =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/config/Configuration.java,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- Configuration.java 2000/07/10 21:20:11 1.29 +++ Configuration.java 2000/07/25 17:42:28 1.30 @@ -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.29 2000/07/10 21:20:11 vt Exp $ + * @version $Id: Configuration.java,v 1.30 2000/07/25 17:42:28 vt Exp $ */ public class Configuration extends Hashtable { @@ -381,7 +381,24 @@ Vector dummy = new Vector(); - dummy.addElement(found); + if ( found instanceof String ) { + + for ( StringTokenizer st = new StringTokenizer((String)found, ",; "); st.hasMoreTokens(); ) { + + String token = st.nextToken(); + + // VT: FIXME: Analyze the previous token for the escape + // symbols so we can include the separators into values as + // well + + dummy.addElement(token); + } + + } else { + + dummy.addElement(found); + } + return dummy; } |
From: CVS B. <vt...@fr...> - 2000-07-25 09:22:18
|
User: vt Date: 00/07/25 02:22:18 Modified: src/java/gnu/j4/examples Makefile.am Added: src/java/gnu/j4/examples Base64Example.java Log: Added the test case for the base64 encoder and decoder. Turned out, should've done it long time ago. Revision Changes Path 1.22 +3 -2 J4/src/java/gnu/j4/examples/Makefile.am CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/Makefile.am?annotate=1.22&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/Makefile.am?rev=1.22&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/Makefile.am.diff?r1=1.22&r2=1.21&cvsroot=jukebox4 ----------------------------------- Index: Makefile.am =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/examples/Makefile.am,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- Makefile.am 2000/07/18 21:46:00 1.21 +++ Makefile.am 2000/07/25 09:22:17 1.22 @@ -1,8 +1,9 @@ -# $Id: Makefile.am,v 1.21 2000/07/18 21:46:00 vt Exp $ +# $Id: Makefile.am,v 1.22 2000/07/25 09:22:17 vt Exp $ noinst_PROGRAMS = package -BASE_FILES = ClientTest.java \ +BASE_FILES = Base64Example.java \ + ClientTest.java \ ConfigTest.java \ ChunkedClientTest.java \ ChunkedOutputTest.java \ 1.1 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.1&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/Base64Example.java?rev=1.1&content-type=text/x-cvsweb-markup&cvsroot=jukebox4 ----------------------------------- Index: Base64Example.java =================================================================== package gnu.j4.examples; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.Enumeration; import java.util.Vector; import gnu.j4.service.ActiveService; import gnu.j4.io.base64.Base64DecoderInputStream; import gnu.j4.io.base64.Base64EncoderInputStream; /** * MIME Base64 encoding/decoding example. * * @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1995-1998 * @version $Id: Base64Example.java,v 1.1 2000/07/25 09:22:17 vt Exp $ */ public class Base64Example extends ActiveService { /** * Log facility to use for this class. */ public static final String CH_BASE64 = "base64"; /** * Do nothing. * * @exception InterruptedException if this thread was interrupted by * another thread. */ protected void startup() throws InterruptedException { } /** * Perform the operations. * * @exception InterruptedException if this thread was interrupted by * another thread. * * @exception Throwable in case something goes wrong */ protected void execute() throws InterruptedException, Throwable { // Tough thing with the Base64 encoding is the padding. Since there // are four possible cases with the padding, let's check it with // those four pesky strings. Vector sources = new Vector(); sources.add("Padding"); sources.add("Padding1"); sources.add("Padding12"); sources.add("Padding123"); sources.add("Padding1234"); sources.add("Padding12345"); for ( Enumeration e = sources.elements(); e.hasMoreElements(); ) { process((String)e.nextElement()); } } /** * Do nothing. * * @exception InterruptedException if this thread was interrupted by * another thread. */ protected void shutdown() throws InterruptedException { complain( LOG_NOTICE,CH_BASE64,"shutdown: cleaning up" ); } private void process(String source) throws Throwable { complain(LOG_NOTICE, CH_BASE64, "Source: '" + source + "'"); ByteArrayInputStream in = new ByteArrayInputStream(source.getBytes()); Base64EncoderInputStream encoderStream = new Base64EncoderInputStream(in, 0); ByteArrayOutputStream out = new ByteArrayOutputStream(); while ( encoderStream.available() != 0 ) { // while ( true ) { complain(LOG_NOTICE, CH_BASE64, "Available: " + encoderStream.available()); int ch = encoderStream.read(); // complain(LOG_NOTICE, CH_BASE64, "Encoded: '" + (char)ch + "' (" + ch + ")"); if ( ch == -1 ) { // complain(LOG_ERR, CH_BASE64, "Encoded: EOF"); break; } out.write(ch); } String encoded = out.toString(); complain(LOG_NOTICE, CH_BASE64, "Encoded: '" + encoded + "'"); in = new ByteArrayInputStream(encoded.getBytes()); Base64DecoderInputStream decoderStream = new Base64DecoderInputStream(in); out = new ByteArrayOutputStream(); while ( decoderStream.available() != 0 ) { // while ( true ) { complain(LOG_NOTICE, CH_BASE64, "Available: " + decoderStream.available()); int ch = decoderStream.read(); // complain(LOG_NOTICE, CH_BASE64, "Decoded: '" + (char)ch + "' (" + ch + ")"); if ( ch == -1 ) { // complain(LOG_ERR, CH_BASE64, "Decoded: EOF"); break; } out.write(ch); } String decoded = out.toString(); complain(LOG_NOTICE, CH_BASE64, "Decoded: '" + decoded + "'"); } } |
From: CVS B. <vt...@fr...> - 2000-07-25 07:12:56
|
User: vt Date: 00/07/25 00:12:56 Modified: src/java/gnu/j4/core Makefile.am Log: Made sure UdpSyslog compiles with JDK 1.3 Revision Changes Path 1.16 +10 -2 J4/src/java/gnu/j4/core/Makefile.am CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/core/Makefile.am?annotate=1.16&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/core/Makefile.am?rev=1.16&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/core/Makefile.am.diff?r1=1.16&r2=1.15&cvsroot=jukebox4 ----------------------------------- Index: Makefile.am =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/core/Makefile.am,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Makefile.am 2000/07/06 10:47:04 1.15 +++ Makefile.am 2000/07/25 07:12:56 1.16 @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.15 2000/07/06 10:47:04 vt Exp $ +# $Id: Makefile.am,v 1.16 2000/07/25 07:12:56 vt Exp $ EXTRA_DIST = package.html noinst_PROGRAMS = package @@ -24,6 +24,8 @@ JAVA2_FILES = UdpSyslog.java +JAVA3_FILES = UdpSyslog.java + JMX_FILES = JmxSyslog.java REX_FILES = RegexpFacilityFilter.java @@ -47,13 +49,19 @@ JAVA2_SUBSET = endif +if JAVA3 +JAVA3_SUBSET = ${JAVA3_FILES} +else +JAVA3_SUBSET = +endif + if JMX JMX_SUBSET = ${JMX_FILES} else JMX_SUBSET = endif -package_SOURCES = ${BASE_FILES} ${JAVA2_SUBSET} ${REX_SUBSET} ${JMX_SUBSET} +package_SOURCES = ${BASE_FILES} ${JAVA2_SUBSET} ${JAVA3_SUBSET} ${REX_SUBSET} ${JMX_SUBSET} ECHO = @ECHO@ JAVACX = @JAVACX@ |
From: CVS B. <vt...@fr...> - 2000-07-24 06:42:09
|
User: vt Date: 00/07/23 23:42:08 Modified: src/java/gnu/j4/core FileSyslog.java Log: Made the file syslog accept the file name as constructor parameter. Revision Changes Path 1.3 +31 -6 J4/src/java/gnu/j4/core/FileSyslog.java CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/core/FileSyslog.java?annotate=1.3&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/core/FileSyslog.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/core/FileSyslog.java.diff?r1=1.3&r2=1.2&cvsroot=jukebox4 ----------------------------------- Index: FileSyslog.java =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/core/FileSyslog.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- FileSyslog.java 1999/06/29 04:35:34 1.2 +++ FileSyslog.java 2000/07/24 06:42:08 1.3 @@ -20,7 +20,7 @@ * called before the actual construction of the object is completed ;-) * * @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1998 - * @version $Id: FileSyslog.java,v 1.2 1999/06/29 04:35:34 vt Exp $ + * @version $Id: FileSyslog.java,v 1.3 2000/07/24 06:42:08 vt Exp $ */ public class FileSyslog extends BasicSyslog implements LogLevels, LogConfigKeywords { @@ -39,25 +39,50 @@ * * Get the {@link LogConfigKeywords#SYSLOG_FILE file name} from the * configuration, try to open it, fail if it's impossible. + * + * @exception InstantiationException if it is not possible to write to + * the file specified in the configuration. */ public FileSyslog() throws InstantiationException { super(); + + init(conf.getString(SYSLOG_FILE)); - String name = conf.getString(SYSLOG_FILE); + } + + /** + * Create the instance writing to the specified log file. + * + * @param outputFileName File to write the log to. + * + * @exception InstantiationException if it is not possible to write to + * the file specified in the configuration. + */ + public FileSyslog(String outputFileName) throws InstantiationException { + + super(); + init(outputFileName); + } + + /** + * Actually open the file. + */ + private void init(String outputFileName) throws InstantiationException { + try { - out = new PrintWriter(new FileOutputStream(name)); + out = new PrintWriter(new FileOutputStream(outputFileName)); } catch ( IOException ioex ) { + Logger.logTo(null); Logger.log(Thread.currentThread(), this, LOG_ERR, Logger.LOG_LOGGER, "Can't write to '" - + name + + outputFileName + "', reason:", ioex); - throw new InstantiationException("Can't write to file: " + name); + throw new InstantiationException("Can't write to file: " + outputFileName); } - } /** |
From: CVS B. <vt...@fr...> - 2000-07-21 17:43:03
|
User: vt Date: 00/07/21 10:43:08 Modified: src/java/gnu/j4/sem ACT.java Log: Documentation update Revision Changes Path 1.8 +3 -2 J4/src/java/gnu/j4/sem/ACT.java CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/sem/ACT.java?annotate=1.8&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/sem/ACT.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/sem/ACT.java.diff?r1=1.8&r2=1.7&cvsroot=jukebox4 ----------------------------------- Index: ACT.java =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/sem/ACT.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ACT.java 2000/07/17 00:46:02 1.7 +++ ACT.java 2000/07/21 17:43:08 1.8 @@ -14,7 +14,7 @@ * and optional callback. * * @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1995-1999 - * @version $Id: ACT.java,v 1.7 2000/07/17 00:46:02 vt Exp $ + * @version $Id: ACT.java,v 1.8 2000/07/21 17:43:08 vt Exp $ */ public class ACT extends EventSemaphore { @@ -171,7 +171,8 @@ * operation completion. * * @deprecated It would be better to set the user object simultaneously - * with the completion notification. + * with the completion notification. Use {@link #complete(boolean, + * java.lang.Object) complete(status, userObject)}. */ public void setUserObject(Object userObject) { |
From: CVS B. <vt...@fr...> - 2000-07-19 21:32:29
|
User: vt Date: 00/07/19 14:31:55 Modified: src/java/gnu/j4/service PassiveService.java Log: Clarified the finalizer log message. Revision Changes Path 1.14 +8 -3 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.14&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/service/PassiveService.java?rev=1.14&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.14&r2=1.13&cvsroot=jukebox4 ----------------------------------- Index: PassiveService.java =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/service/PassiveService.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- PassiveService.java 2000/07/07 20:00:40 1.13 +++ PassiveService.java 2000/07/19 21:31:55 1.14 @@ -50,12 +50,17 @@ * target="_top">$500 million mistake</a>. * * @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1995-1998 - * @version $Id: PassiveService.java,v 1.13 2000/07/07 20:00:40 vt Exp $ + * @version $Id: PassiveService.java,v 1.14 2000/07/19 21:31:55 vt Exp $ * @see ActiveService */ public abstract class PassiveService extends LogAware implements RunnableService { /** + * Log facility to use by the wrapper classes. + */ + public final static String CH_WRAPPER = "service/wrapper"; + + /** * Execute the startup sequence. * * @return true if all the preconditions are met. @@ -710,7 +715,7 @@ */ public void finalize() throws Throwable { - complain(LOG_DEBUG, LOG_SERVICE, "finalize."+Integer.toHexString(hashCode())); + complain(LOG_DEBUG, CH_WRAPPER, "finalize."+Integer.toHexString(hashCode())); super.finalize(); } } @@ -731,7 +736,7 @@ } catch ( InterruptedException iex ) { - complain(this, LOG_INFO, LOG_SERVICE, "startup interrupted: ", iex); + complain(this, LOG_INFO, LOG_SERVICE, "startup interrupted: ", iex); target.setFlags(false); sem.clear(); core = null; |
From: CVS B. <vt...@fr...> - 2000-07-19 04:53:57
|
User: vt Date: 00/07/18 21:53:19 Modified: . configure.in Log: Oh my, JMX wasn't declared optional... Revision Changes Path 1.63 +4 -5 J4/configure.in CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/configure.in?annotate=1.63&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/configure.in?rev=1.63&content-type=text/x-cvsweb-markup&cvsroot=jukebox4 CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/configure.in.diff?r1=1.63&r2=1.62&cvsroot=jukebox4 ----------------------------------- Index: configure.in =================================================================== RCS file: /usr/local/cvs/J4/configure.in,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- configure.in 2000/07/17 02:15:25 1.62 +++ configure.in 2000/07/19 04:53:19 1.63 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_REVISION($Id: configure.in,v 1.62 2000/07/17 02:15:25 vt Exp $)dnl +AC_REVISION($Id: configure.in,v 1.63 2000/07/19 04:53:19 vt Exp $)dnl dnl I'd like it to read the ./configure-options to allow both the basic set dnl of options, as well as the local set. @@ -266,12 +266,11 @@ ]) if ${TEST} "${JMX_ENABLED}" = "yes" ; then - AC_PATH_JAVACLASS(JMX,jmx,javax.management.Attribute,[ Where to find the JMX classes (http://java.sun.com/jmx/, jmxri.jar)]) - AC_PATH_JAVACLASS(JMXTOOLS,jmx,com.sun.jdmk.comm.HtmlAdaptorServer,[ Where to find the JMX tools (jmxtools.jar)]) + AC_PATH_JAVACLASS(JMX,jmx,javax.management.Attribute,[ Where to find the JMX classes (http://java.sun.com/jmx/, jmxri.jar)],"optional") + AC_PATH_JAVACLASS(JMXTOOLS,jmx,com.sun.jdmk.comm.HtmlAdaptorServer,[ Where to find the JMX tools (jmxtools.jar)],"optional") AM_CONDITIONAL(JMX,${TEST} -n "${JMX_CLASSES}") + fi - -AM_CONDITIONAL(JMX,${TEST} "${JMX_ENABLED}" = "yes") AC_MSG_CHECKING(mail classes) |
From: CVS B. <vt...@fr...> - 2000-07-18 21:46:36
|
User: vt Date: 00/07/18 14:46:00 Modified: src/java/gnu/j4/core LogAware.java Log: Nothing major Revision Changes Path 1.17 +2 -2 J4/src/java/gnu/j4/core/LogAware.java CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/core/LogAware.java?annotate=1.17&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/core/LogAware.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/core/LogAware.java.diff?r1=1.17&r2=1.16&cvsroot=jukebox4 ----------------------------------- Index: LogAware.java =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/core/LogAware.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- LogAware.java 2000/06/20 05:19:04 1.16 +++ LogAware.java 2000/07/18 21:46:00 1.17 @@ -8,7 +8,7 @@ * have to directly subclass it unless you want your object to be log-aware. * * @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1995-2000 - * @version $Id: LogAware.java,v 1.16 2000/06/20 05:19:04 vt Exp $ + * @version $Id: LogAware.java,v 1.17 2000/07/18 21:46:00 vt Exp $ */ public class LogAware implements LogLevels, LogFacilities { /** @@ -30,7 +30,7 @@ static { logger = Logger.init(); complain(logger, LOG_NOTICE, "copyright", "Jukebox 4 v" + gnu.j4.LocalConfig.version + ": reusable client/server multiprotocol framework"); - complain(logger, LOG_NOTICE, "copyright", "Copyright (C) Vadim Tkachenko <vt...@fr...> 1996, 1999"); + complain(logger, LOG_NOTICE, "copyright", "Copyright (C) Vadim Tkachenko <vt...@fr...> 1996-2000"); complain(logger, LOG_DEBUG, "copyright", "READ THE DOCS TO FIND OUT HOW TO DISABLE THE COPYRIGHT AND DEBUG MESSAGES"); } |
From: CVS B. <vt...@fr...> - 2000-07-18 21:46:33
|
User: vt Date: 00/07/18 14:46:00 Modified: docs/apidocs index-template.html Log: Nothing major Revision Changes Path 1.6 +1 -1 J4/docs/apidocs/index-template.html CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/docs/apidocs/index-template.html?annotate=1.6&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/docs/apidocs/index-template.html?rev=1.6&content-type=text/x-cvsweb-markup&cvsroot=jukebox4 CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/docs/apidocs/index-template.html.diff?r1=1.6&r2=1.5&cvsroot=jukebox4 ----------------------------------- Index: index-template.html =================================================================== RCS file: /usr/local/cvs/J4/docs/apidocs/index-template.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- index-template.html 2000/07/09 01:14:49 1.5 +++ index-template.html 2000/07/18 21:45:59 1.6 @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc on Sat Jul 08 17:38:47 MDT 2000--> +<!-- Generated by javadoc on Sat Jul 08 19:40:48 MDT 2000--> <TITLE> Generated Documentation (Untitled) </TITLE> |
From: CVS B. <vt...@fr...> - 2000-07-18 21:46:32
|
User: vt Date: 00/07/18 14:46:01 Modified: src/java/gnu/j4/examples Makefile.am Log: Nothing major Revision Changes Path 1.21 +3 -3 J4/src/java/gnu/j4/examples/Makefile.am CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/Makefile.am?annotate=1.21&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/examples/Makefile.am?rev=1.21&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/Makefile.am.diff?r1=1.21&r2=1.20&cvsroot=jukebox4 ----------------------------------- Index: Makefile.am =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/examples/Makefile.am,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- Makefile.am 2000/07/06 10:47:04 1.20 +++ Makefile.am 2000/07/18 21:46:00 1.21 @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.20 2000/07/06 10:47:04 vt Exp $ +# $Id: Makefile.am,v 1.21 2000/07/18 21:46:00 vt Exp $ noinst_PROGRAMS = package @@ -10,7 +10,6 @@ LruCacheTest.java \ ResourcePoolTest.java \ ResourcePoolFailureTest.java \ - RWLockTest.java \ SemaphoreGroupTest.java \ ServerSocketTest.java \ ServerTest.java \ @@ -21,7 +20,8 @@ ThreadTest.java \ VvsStest.java -JAVA2_FILES = LogTest.java +JAVA2_FILES = LogTest.java \ + RWLockTest.java EJB_FILES = |
From: CVS B. <vt...@fr...> - 2000-07-17 02:15:53
|
User: vt Date: 00/07/16 19:15:26 Modified: src/java/gnu/j4/io/storage/jdbc Makefile.am Log: Adjusted the behavior to accomodate JDK 1.3 changes Revision Changes Path 1.6 +3 -3 J4/src/java/gnu/j4/io/storage/jdbc/Makefile.am CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/io/storage/jdbc/Makefile.am?annotate=1.6&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/io/storage/jdbc/Makefile.am?rev=1.6&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/jdbc/Makefile.am.diff?r1=1.6&r2=1.5&cvsroot=jukebox4 ----------------------------------- Index: Makefile.am =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/io/storage/jdbc/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile.am 2000/07/06 10:47:07 1.5 +++ Makefile.am 2000/07/17 02:15:25 1.6 @@ -11,10 +11,10 @@ SingleConnectionFactory.java \ TransactionContext.java -if JAVA2 -package_SOURCES = -else +if JAVA1 package_SOURCES = ${JAVA1_FILES} +else +package_SOURCES = endif EXTRA_DIST = ${JAVA1_FILES} |
From: CVS B. <vt...@fr...> - 2000-07-17 02:15:53
|
User: vt Date: 00/07/16 19:15:25 Modified: . Makefile.am acinclude.m4 configure.in Log: Adjusted the behavior to accomodate JDK 1.3 changes Revision Changes Path 1.24 +6 -5 J4/Makefile.am CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/Makefile.am?annotate=1.24&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/Makefile.am?rev=1.24&content-type=text/x-cvsweb-markup&cvsroot=jukebox4 CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/Makefile.am.diff?r1=1.24&r2=1.23&cvsroot=jukebox4 ----------------------------------- Index: Makefile.am =================================================================== RCS file: /usr/local/cvs/J4/Makefile.am,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- Makefile.am 2000/07/06 10:46:58 1.23 +++ Makefile.am 2000/07/17 02:15:25 1.24 @@ -1,11 +1,11 @@ ## Makefile.am: top level automake makefile for Jukebox. ## Process this file with automake to get Makefile.in ## -## $Id: Makefile.am,v 1.23 2000/07/06 10:46:58 vt Exp $ +## $Id: Makefile.am,v 1.24 2000/07/17 02:15:25 vt Exp $ # Makefile.in: top level autoconf makefile for Jukebox. # -# $Id: Makefile.am,v 1.23 2000/07/06 10:46:58 vt Exp $ +# $Id: Makefile.am,v 1.24 2000/07/17 02:15:25 vt Exp $ AUTOMAKE_OPTIONS = gnu @@ -85,14 +85,15 @@ EJB_PACKAGES = endif -if JDBC -JDBC_PACKAGES = gnu.j4.io.storage.jdbc +if JAVA1 +JAVA1_PACKAGES = gnu.j4.io.storage.jdbc else -JDBC_PACKAGES = +JAVA1_PACKAGES = endif PACKAGES = ${CORE_PACKAGES} \ ${MAIL_PACKAGES} \ + ${JAVA1_PACKAGES} \ ${EJB_PACKAGES} # 'JAVADOCX' is the javadoc properly wrapped in a classpath definition, 1.25 +8 -4 J4/acinclude.m4 CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/acinclude.m4?annotate=1.25&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/acinclude.m4?rev=1.25&content-type=text/x-cvsweb-markup&cvsroot=jukebox4 CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/acinclude.m4.diff?r1=1.25&r2=1.24&cvsroot=jukebox4 ----------------------------------- Index: acinclude.m4 =================================================================== RCS file: /usr/local/cvs/J4/acinclude.m4,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- acinclude.m4 2000/07/17 00:05:01 1.24 +++ acinclude.m4 2000/07/17 02:15:25 1.25 @@ -120,7 +120,6 @@ 3) AC_MSG_RESULT([guess Java 2 (1.3? You better pay attention to the rest, untested)]) - JAVA_PLATFORM=2 ;; *) @@ -156,11 +155,16 @@ dnl This requires a bit of tweaking to be handled properly, but dnl the default is good enough - JAVA_PLATFORM="2" - AC_SUBST(JAVA_PLATFORM) + if ${TEST} "${JAVA_PLATFORM}" = "3" ; then + AC_MSG_RESULT([with all due respect, I will not downgrade]) + else + JAVA_PLATFORM="2" + AC_SUBST(JAVA_PLATFORM) + AC_MSG_RESULT(forced Java ${JAVA_PLATFORM}) + fi ]) - AC_MSG_RESULT(forced Java ${JAVA_PLATFORM}) + fi 1.62 +12 -4 J4/configure.in CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/configure.in?annotate=1.62&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/configure.in?rev=1.62&content-type=text/x-cvsweb-markup&cvsroot=jukebox4 CVSWeb: Diff to previous version: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/configure.in.diff?r1=1.62&r2=1.61&cvsroot=jukebox4 ----------------------------------- Index: configure.in =================================================================== RCS file: /usr/local/cvs/J4/configure.in,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- configure.in 2000/07/17 00:05:01 1.61 +++ configure.in 2000/07/17 02:15:25 1.62 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_REVISION($Id: configure.in,v 1.61 2000/07/17 00:05:01 vt Exp $)dnl +AC_REVISION($Id: configure.in,v 1.62 2000/07/17 02:15:25 vt Exp $)dnl dnl I'd like it to read the ./configure-options to allow both the basic set dnl of options, as well as the local set. @@ -386,12 +386,10 @@ AC_SUBST(JAVA_OPT) +AM_CONDITIONAL(JAVA1, ${TEST} "${JAVA_PLATFORM}" = 1) AM_CONDITIONAL(JAVA2, ${TEST} "${JAVA_PLATFORM}" = 2) +AM_CONDITIONAL(JAVA3, ${TEST} "${JAVA_PLATFORM}" = 3) -dnl I'm cheating here, allowing JDBC only for JDK 1.1. - -AM_CONDITIONAL(JDBC, ${TEST} "${JAVA_PLATFORM}" = 1) - AC_OUTPUT( index.html buildtools/Makefile @@ -459,6 +457,16 @@ AC_MSG_RESULT(Jukebox will be installed to: ${prefix}) AC_MSG_RESULT(Configuration files are in: ${prefix}/etc) AC_MSG_RESULT(JDK used: ${JDK_HOME}) + +dnl Let's tell them what thread lib we're using + +if ${TEST} -n "${GREEN}" ; then + THREADLIB="green" +else + THREADLIB="native" +fi + +AC_MSG_RESULT(Thread library: ${THREADLIB}) AC_MSG_RESULT(Build classpath is set to: ${TARGET_CLASSPATH}) |