jukebox4-cvs Mailing List for Jukebox (Page 4)
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-08-24 20:35:32
|
User: vt Date: 00/08/24 13:35:49 Modified: etc .cvsignore Makefile.am Added: etc jukebox.conf.dtd.in jukebox.conf.xml.in Log: Patchlevel bump. - Incorporated changes made in the JAXP branch - Added the local configuration options support Revision Changes Path 1.2 +2 -0 J4/etc/.cvsignore CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/etc/.cvsignore?annotate=1.2&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/etc/.cvsignore?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/.cvsignore.diff?r1=1.2&r2=1.1&cvsroot=jukebox4 ----------------------------------- Index: .cvsignore =================================================================== RCS file: /usr/local/cvs/J4/etc/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1999/03/08 22:03:46 1.1 +++ .cvsignore 2000/08/24 20:35:49 1.2 @@ -1,3 +1,5 @@ Makefile Makefile.in *.conf +*.conf.xml +*.conf.dtd 1.5 +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.5&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/etc/Makefile.am?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/etc/Makefile.am.diff?r1=1.5&r2=1.4&cvsroot=jukebox4 ----------------------------------- Index: Makefile.am =================================================================== RCS file: /usr/local/cvs/J4/etc/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile.am 2000/07/06 10:47:00 1.4 +++ Makefile.am 2000/08/24 20:35:49 1.5 @@ -1,7 +1,7 @@ -# $Id: Makefile.am,v 1.4 2000/07/06 10:47:00 vt Exp $ +# $Id: Makefile.am,v 1.5 2000/08/24 20:35:49 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 jukebox.conf.dtd RM = @RM@ 1.2 +37 -0 J4/etc/jukebox.conf.dtd.in CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/etc/jukebox.conf.dtd.in?annotate=1.2&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/etc/jukebox.conf.dtd.in?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/jukebox.conf.dtd.in.diff?r1=1.2&r2=1.1&cvsroot=jukebox4 ----------------------------------- 1.2 +134 -0 J4/etc/jukebox.conf.xml.in CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/etc/jukebox.conf.xml.in?annotate=1.2&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/etc/jukebox.conf.xml.in?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/jukebox.conf.xml.in.diff?r1=1.2&r2=1.1&cvsroot=jukebox4 ----------------------------------- |
|
From: CVS B. <vt...@fr...> - 2000-08-24 20:35:31
|
User: vt Date: 00/08/24 13:35:49 Modified: docs/apidocs index-template.html Log: Patchlevel bump. - Incorporated changes made in the JAXP branch - Added the local configuration options support Revision Changes Path 1.8 +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.8&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/docs/apidocs/index-template.html?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/docs/apidocs/index-template.html.diff?r1=1.8&r2=1.7&cvsroot=jukebox4 ----------------------------------- Index: index-template.html =================================================================== RCS file: /usr/local/cvs/J4/docs/apidocs/index-template.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- index-template.html 2000/08/04 23:21:46 1.7 +++ index-template.html 2000/08/24 20:35:48 1.8 @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc on Mon Jul 24 15:52:54 MDT 2000--> +<!-- Generated by javadoc on Sun Aug 06 22:55:54 MST 2000--> <TITLE> Generated Documentation (Untitled) </TITLE> |
|
From: CVS B. <vt...@fr...> - 2000-08-24 20:35:31
|
User: vt
Date: 00/08/24 13:35:48
Modified: . .cvsignore ChangeLog Makefile.am acinclude.m4
configure.in
Log:
Patchlevel bump.
- Incorporated changes made in the JAXP branch
- Added the local configuration options support
Revision Changes Path
1.4 +1 -0 J4/.cvsignore
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/.cvsignore?annotate=1.4&cvsroot=jukebox4
CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/.cvsignore?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/.cvsignore.diff?r1=1.4&r2=1.3&cvsroot=jukebox4
-----------------------------------
Index: .cvsignore
===================================================================
RCS file: /usr/local/cvs/J4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 1999/04/09 18:34:33 1.3
+++ .cvsignore 2000/08/24 20:35:48 1.4
@@ -8,3 +8,4 @@
index.html
jukebox*.tar.gz
configure
+configure-options
1.21 +7 -2 J4/ChangeLog
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/ChangeLog?annotate=1.21&cvsroot=jukebox4
CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/ChangeLog?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/ChangeLog.diff?r1=1.21&r2=1.20&cvsroot=jukebox4
-----------------------------------
Index: ChangeLog
===================================================================
RCS file: /usr/local/cvs/J4/ChangeLog,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ChangeLog 2000/08/14 05:17:33 1.20
+++ ChangeLog 2000/08/24 20:35:48 1.21
@@ -1,11 +1,12 @@
-$Id: ChangeLog,v 1.20 2000/08/14 05:17:33 vt Exp $
+$Id: ChangeLog,v 1.21 2000/08/24 20:35:48 vt Exp $
CURRENT RELEASE NOTES
- The JMX support is now on by default. The JMX itself (hopefully, unlike
support) is not very mature so far, so be careful now.
-- The recommended syslog provider is gnu.rex (--with-REX configure option).
+- The recommended syslog provider is Jakarta Regexp (--with-REGEXP configure
+ option).
- You may want to configure the package --with-jdk-home if there are
multiple VMs installed. In particular, production VM for Solaris is about
@@ -17,6 +18,10 @@
JVM version and excludes these files from the build process.
CHANGE LOG
+
+--- 2.0p9 Jakarta Regexp support added; XML configuration added, minor
+ fixes. It is now possible to use both global and local
+ preset configurations.
--- 2.0p8 JMX support is compiled in by default, if the JMX jar files
are found. Properly works with JDK 1.3 now, 1.3 is
1.25 +9 -2 J4/Makefile.am
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/Makefile.am?annotate=1.25&cvsroot=jukebox4
CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/Makefile.am?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/Makefile.am.diff?r1=1.25&r2=1.24&cvsroot=jukebox4
-----------------------------------
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvs/J4/Makefile.am,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Makefile.am 2000/07/17 02:15:25 1.24
+++ Makefile.am 2000/08/24 20:35:48 1.25
@@ -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.24 2000/07/17 02:15:25 vt Exp $
+## $Id: Makefile.am,v 1.25 2000/08/24 20:35:48 vt Exp $
# Makefile.in: top level autoconf makefile for Jukebox.
#
-# $Id: Makefile.am,v 1.24 2000/07/17 02:15:25 vt Exp $
+# $Id: Makefile.am,v 1.25 2000/08/24 20:35:48 vt Exp $
AUTOMAKE_OPTIONS = gnu
@@ -103,6 +103,7 @@
JAVA_PLATFORM = @JAVA_PLATFORM@
CP = @CP@
+ECHO = @ECHO@
MKDIR = @MKDIR@
RM = @RM@
TEST = @TEST@
@@ -122,3 +123,9 @@
${MKDIR} -p ${distdir}/docs/apidocs/gnu
${CP} docs/apidocs/*.html docs/apidocs/stylesheet.css docs/apidocs/package-list ${distdir}/docs/apidocs
${CP} -r docs/apidocs/gnu/* ${distdir}/docs/apidocs/gnu
+
+install-data-local:
+
+ ${ECHO} @VERSION_MAJOR@ > ${prefix}/etc/version.major
+ ${ECHO} @VERSION_MINOR@ > ${prefix}/etc/version.minor
+ ${ECHO} @PATCHLEVEL@ > ${prefix}/etc/version.patchlevel
1.26 +7 -5 J4/acinclude.m4
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/acinclude.m4?annotate=1.26&cvsroot=jukebox4
CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/acinclude.m4?rev=1.26&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.26&r2=1.25&cvsroot=jukebox4
-----------------------------------
Index: acinclude.m4
===================================================================
RCS file: /usr/local/cvs/J4/acinclude.m4,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- acinclude.m4 2000/07/17 02:15:25 1.25
+++ acinclude.m4 2000/08/24 20:35:48 1.26
@@ -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)
1.65 +56 -15 J4/configure.in
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/configure.in?annotate=1.65&cvsroot=jukebox4
CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/configure.in?rev=1.65&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.65&r2=1.64&cvsroot=jukebox4
-----------------------------------
Index: configure.in
===================================================================
RCS file: /usr/local/cvs/J4/configure.in,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- configure.in 2000/08/04 23:21:46 1.64
+++ configure.in 2000/08/24 20:35:48 1.65
@@ -1,29 +1,41 @@
dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Id: configure.in,v 1.64 2000/08/04 23:21:46 vt Exp $)dnl
+AC_REVISION($Id: configure.in,v 1.65 2000/08/24 20:35:48 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.
-BOOTFILE=/usr/local/share/jukebox/configure-options
+GLOBAL_OPTIONS=/usr/local/share/jukebox/configure-options
-if test -f "${BOOTFILE}" && test -z "${BOOTSTRAP}" ; then
- echo "Reading options from ${BOOTFILE}"
- BOOTSTRAP="1" $0 `cat ${BOOTFILE}|tr "\n" " "` $*
- exit $?
+if test -f "${GLOBAL_OPTIONS}" && test -z "${GLOBAL_OPTIONS_PRESENT}" ; then
+ echo "Reading options from ${GLOBAL_OPTIONS}"
+ GLOBAL_OPTIONS_PRESENT="1" $0 `cat ${GLOBAL_OPTIONS}|tr "\n" " "` $*
+ exit $?
fi
+LOCAL_OPTIONS=`pwd`/configure-options
+
+if test -f "${LOCAL_OPTIONS}" && test -z "${LOCAL_OPTIONS_PRESENT}" ; then
+ echo "Reading options from ${LOCAL_OPTIONS}"
+ LOCAL_OPTIONS_PRESENT="1" $0 `cat ${LOCAL_OPTIONS}|tr "\n" " "` $*
+ exit $?
+fi
+
dnl This file ensures our --srcdir is right. Later it's also used to verify
dnl the acceptable version of Java compiler and the options specific to the
dnl versions.
AC_INIT(src/java/gnu/j4/core/Syslog.java)
-PATCHLEVEL="8"
+VERSION_MAJOR="2"
+VERSION_MINOR="0"
+PATCHLEVEL="9"
+AC_SUBST(VERSION_MAJOR)dnl
+AC_SUBST(VERSION_MINOR)dnl
AC_SUBST(PATCHLEVEL)dnl
PACKAGE="jukebox"
-VERSION="2.0p${PATCHLEVEL}"
+VERSION="${VERSION_MAJOR}.${VERSION_MINOR}p${PATCHLEVEL}"
AC_SUBST(PACKAGE)dnl
AC_SUBST(VERSION)dnl
@@ -85,6 +97,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)
@@ -190,13 +204,17 @@
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(REX,gnu.rex,gnu.rex.Rex,[ Where to find the REX library (http://www.crocodile.org/~sts/Rex)],"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}")
+AC_PATH_JAVACLASS(XERCES,xerces,org.apache.xerces.dom.DocumentImpl,[ Where to find the Apache Xerces classes])
+
+AM_CONDITIONAL(XERCES,${TEST} -n "${XERCES_CLASSES}")
+
dnl Define the TARGET_CLASSPATH
TARGET_CLASSPATH=`cd ${srcdir} && pwd`/src/java
@@ -297,6 +315,7 @@
AC_PATH_EXTRA(JTA)
AC_PATH_EXTRA(JTS)
AC_PATH_EXTRA(JMX)
+AC_PATH_EXTRA(XERCES)
dnl FIXME: Ugly hack
@@ -403,6 +422,8 @@
etc/test.conf
etc/test.resource.pool.conf
etc/management.conf
+ etc/jukebox.conf.dtd
+ etc/jukebox.conf.xml
examples/Makefile
examples/index.html
examples/exampleConfigTest
@@ -414,6 +435,7 @@
examples/exampleSemaphoreGroupTest
examples/exampleSimpleServiceTest
examples/exampleTelnetTest
+ examples/exampleXmlConfigurationTest
src/java/gnu/j4/cache/Makefile
src/java/gnu/j4/config/Makefile
src/java/gnu/j4/core/Makefile
@@ -470,10 +492,17 @@
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()
+
AC_REPORT_OPTIONAL(REGEXP)
AC_REPORT_OPTIONAL(REX)
AC_REPORT_OPTIONAL(JSDK)
@@ -485,14 +514,26 @@
AC_REPORT_OPTIONAL(JTS)
AC_REPORT_OPTIONAL(JMX)
AC_REPORT_OPTIONAL(JMXTOOLS)
+AC_REPORT_OPTIONAL(XERCES)
-AC_MSG_RESULT()
-if ${TEST} -z "$BOOTSTRAP" ; then
- AC_MSG_RESULT([You may want to create the ${BOOTFILE} file (see documentation)])
+
+if ${TEST} -z "$GLOBAL_OPTIONS_PRESENT" ; then
+ AC_MSG_RESULT([You may want to create the ${GLOBAL_OPTIONS} file (see documentation)])
+else
+ AC_MSG_RESULT()
+ AC_MSG_RESULT([${GLOBAL_OPTIONS} content was used to configure:])
+ AC_MSG_RESULT([--- start ---])
+ cat ${GLOBAL_OPTIONS}
+ AC_MSG_RESULT([---- end ----])
+fi
+
+if ${TEST} -z "$LOCAL_OPTIONS_PRESENT" ; then
+ AC_MSG_RESULT([You may want to create the ${LOCAL_OPTIONS} file (see documentation)])
else
- AC_MSG_RESULT([${BOOTFILE} content was used to configure:])
+ AC_MSG_RESULT()
+ AC_MSG_RESULT([${LOCAL_OPTIONS} content was used to configure:])
AC_MSG_RESULT([--- start ---])
- cat ${BOOTFILE}
+ cat ${LOCAL_OPTIONS}
AC_MSG_RESULT([---- end ----])
fi
|
|
From: CVS B. <vt...@fr...> - 2000-08-24 20:03:34
|
User: vt Date: 00/08/24 13:03:50 Modified: src/java/gnu/j4/config Tag: JAXP XmlConfiguration.java Log: Made the XML configuration read only Revision Changes Path No revision No revision 1.1.2.7 +33 -2 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.7&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.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/config/Attic/XmlConfiguration.java.diff?r1=1.1.2.7&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.6 retrieving revision 1.1.2.7 diff -u -r1.1.2.6 -r1.1.2.7 --- XmlConfiguration.java 2000/08/24 19:34:02 1.1.2.6 +++ XmlConfiguration.java 2000/08/24 20:03:50 1.1.2.7 @@ -13,8 +13,14 @@ * Successor to the classical {@link Configuration Configuration} that * supports the XML configuration files and objects. * + * <p> + * + * So far, there's one unresolved issue: how to add the values that do not + * have an XML representation into the configuration. Therefore, this object + * is read only, and will throw an exception on any attempt to modify it. + * * @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 2000 - * @version $Id: XmlConfiguration.java,v 1.1.2.6 2000/08/24 19:34:02 vt Exp $ + * @version $Id: XmlConfiguration.java,v 1.1.2.7 2000/08/24 20:03:50 vt Exp $ */ public class XmlConfiguration extends Configuration implements LogLevels, LogFacilities { @@ -34,10 +40,16 @@ /** * @return The XML document object, for those who are not lazy to walk * it. + * + * <p> + * + * <strong>NOTE:</strong> we return a <strong>clone</strong>, not a reference. */ public Document getDocument() { - return conf; + return (conf == null) + ? null + : (Document)conf.getDocumentElement().cloneNode(true); } /** @@ -252,5 +264,24 @@ private void complain(LogLevel ll, String channel, String message, Throwable t) { LogAware.complain(this, ll, channel, message, t); + } + /** + * Add a mapping from the key to the value. + * + * <p> + * + * <strong>NOTE:</strong> This class is read only (see the top of the + * page), so an attempt to put anything in the configuration will result + * in an exception. + * + * @param key The key. + * + * @param value The value. + * + * @throws IllegalAccessError unconditionally. + */ + public void put(String key, Object value) { + + throw new IllegalAccessError("XmlConfiguration is read only"); } } |
|
From: CVS B. <vt...@fr...> - 2000-08-24 19:33:46
|
User: vt Date: 00/08/24 12:34:02 Modified: src/java/gnu/j4/config Tag: JAXP XmlConfiguration.java Log: It doesn't make sense to ask for a single element. Revision Changes Path No revision No revision 1.1.2.6 +1 -14 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.6&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.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/config/Attic/XmlConfiguration.java.diff?r1=1.1.2.6&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.5 retrieving revision 1.1.2.6 diff -u -r1.1.2.5 -r1.1.2.6 --- XmlConfiguration.java 2000/08/21 15:31:24 1.1.2.5 +++ XmlConfiguration.java 2000/08/24 19:34:02 1.1.2.6 @@ -14,7 +14,7 @@ * supports the XML configuration files and objects. * * @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 2000 - * @version $Id: XmlConfiguration.java,v 1.1.2.5 2000/08/21 15:31:24 vt Exp $ + * @version $Id: XmlConfiguration.java,v 1.1.2.6 2000/08/24 19:34:02 vt Exp $ */ public class XmlConfiguration extends Configuration implements LogLevels, LogFacilities { @@ -53,19 +53,6 @@ parse(); } - /** - * Get the configuration element. - * - * @param path Dot delimited path to the elements. - * - * @return The element located at the end of this path, or - * <code>null</code> if such element doesn't exist. - */ - public Element getElement(String path) { - - throw new Error("Not Implemented"); - } - /** * Get the configuration elements. * |
|
From: CVS B. <vt...@fr...> - 2000-08-24 18:14:24
|
User: vt Date: 00/08/24 11:14:41 Modified: src/java/gnu/j4/core Tag: JAXP BasicSyslog.java Log: Improved a message a little bit Revision Changes Path No revision No revision 1.15.2.2 +4 -2 J4/src/java/gnu/j4/core/BasicSyslog.java CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/core/BasicSyslog.java?annotate=1.15.2.2&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/core/BasicSyslog.java?rev=1.15.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/core/BasicSyslog.java.diff?r1=1.15.2.2&r2=1.14&cvsroot=jukebox4 ----------------------------------- Index: BasicSyslog.java =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/core/BasicSyslog.java,v retrieving revision 1.15.2.1 retrieving revision 1.15.2.2 diff -u -r1.15.2.1 -r1.15.2.2 --- BasicSyslog.java 2000/08/24 18:07:02 1.15.2.1 +++ BasicSyslog.java 2000/08/24 18:14:41 1.15.2.2 @@ -43,7 +43,7 @@ * something less complicated, at least for the production versions. * @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1995-1998 - * @version $Id: BasicSyslog.java,v 1.15.2.1 2000/08/24 18:07:02 vt Exp $ + * @version $Id: BasicSyslog.java,v 1.15.2.2 2000/08/24 18:14:41 vt Exp $ * @since Jukebox v4 * @see LogConfigKeywords */ @@ -140,7 +140,9 @@ String message = "syslog.timestamp.format (" + conf.getString(DATEFORMAT_CF) - + ") is invalid, using default (" + + ") is invalid (" + + t.getMessage() + + "), using default (" + DEFAULT_DATEFORMAT + ")"; try { |
|
From: CVS B. <vt...@fr...> - 2000-08-24 18:06:45
|
User: vt Date: 00/08/24 11:07:02 Modified: src/java/gnu/j4/core Tag: JAXP BasicSyslog.java Log: Fixed the problem with the invalid timestamp format destroying all the application Revision Changes Path No revision No revision 1.15.2.1 +40 -1 J4/src/java/gnu/j4/core/BasicSyslog.java CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/core/BasicSyslog.java?annotate=1.15.2.1&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/core/BasicSyslog.java?rev=1.15.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/core/BasicSyslog.java.diff?r1=1.15.2.1&r2=1.14&cvsroot=jukebox4 ----------------------------------- Index: BasicSyslog.java =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/core/BasicSyslog.java,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -u -r1.15 -r1.15.2.1 --- BasicSyslog.java 2000/07/17 02:14:25 1.15 +++ BasicSyslog.java 2000/08/24 18:07:02 1.15.2.1 @@ -43,7 +43,7 @@ * something less complicated, at least for the production versions. * @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1995-1998 - * @version $Id: BasicSyslog.java,v 1.15 2000/07/17 02:14:25 vt Exp $ + * @version $Id: BasicSyslog.java,v 1.15.2.1 2000/08/24 18:07:02 vt Exp $ * @since Jukebox v4 * @see LogConfigKeywords */ @@ -117,6 +117,45 @@ public void configurationChanged() { dateFormatter = new SimpleDateFormat(conf.getString(DATEFORMAT_CF, DEFAULT_DATEFORMAT)); + + // We know it's possible to make typos in the configuration. To + // ensure the date format is right, I'll try to format the date + // here, because this is the least expensive place to do it. + + try { + + dateFormatter.format(new Date(System.currentTimeMillis())); + + } catch ( Throwable t ) { + + // OK, we're not OK. + // + // Let's just get the default format and pray it works fine. + // Otherwise, we're screwed. + + dateFormatter = new SimpleDateFormat(DEFAULT_DATEFORMAT); + + // And don't forget to complain. The logging system may be + // inoperable at this point, so let's take care of that as well. + + String message = "syslog.timestamp.format (" + + conf.getString(DATEFORMAT_CF) + + ") is invalid, using default (" + + DEFAULT_DATEFORMAT + + ")"; + try { + + logMessage(new LogRecord(Thread.currentThread(), + this, LOG_WARNING, Logger.LOG_LOGGER, + message, + null)); + + } catch ( NullPointerException npex ) { + + System.err.println("WARNING: " + message); + } + + } Class filterClass = null; |
|
From: CVS B. <vt...@fr...> - 2000-08-21 15:31:01
|
User: vt Date: 00/08/21 08:31:24 Modified: src/java/gnu/j4/config Tag: JAXP XmlConfiguration.java Log: Checkpoint on XML configuration: cleaned up a little and taught it to recognize the multiple elements properly Revision Changes Path No revision No revision 1.1.2.5 +134 -22 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.5&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.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/config/Attic/XmlConfiguration.java.diff?r1=1.1.2.5&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.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- XmlConfiguration.java 2000/08/14 08:44:39 1.1.2.4 +++ XmlConfiguration.java 2000/08/21 15:31:24 1.1.2.5 @@ -1,6 +1,6 @@ package gnu.j4.config; -import java.util.Enumeration; +import java.util.StringTokenizer; import java.util.Vector; import org.w3c.dom.Document; @@ -13,8 +13,8 @@ * 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.4 2000/08/14 08:44:39 vt Exp $ + * @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 2000 + * @version $Id: XmlConfiguration.java,v 1.1.2.5 2000/08/21 15:31:24 vt Exp $ */ public class XmlConfiguration extends Configuration implements LogLevels, LogFacilities { @@ -32,6 +32,15 @@ } /** + * @return The XML document object, for those who are not lazy to walk + * it. + */ + public Document getDocument() { + + return conf; + } + + /** * Create the configuration based on the given XML document. * * VT: FIXME: I want to have the DTD reference so this stays validated. @@ -62,14 +71,119 @@ * * @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. + * @return A collection of the elements with the same path. If there are + * no elements, the collection will be empty. */ public Vector getElements(String path) { - throw new Error("Not Implemented"); + // Let's split the path into the components first. + + StringTokenizer st = new StringTokenizer(path, "."); + Vector vpath = new Vector(); + + while ( st.hasMoreTokens() ) { + + vpath.addElement(st.nextToken()); + } + +// complain(LOG_DEBUG, CH_XC + "/getElements", "Path requested: " + vpath, null); + + // Now let's walk it + + Element root = conf.getDocumentElement(); + Vector result = new Vector(); + + resolveElement(root, vpath, result); + + return result; + } + + /** + * Resolve the element by path. + * + * @param current Element to start resolving from. + * + * @param path Sequence of tag names to be found. + * + * <strong>NOTE:</strong> elements from this vector get removed as we + * successfully walk the document. + * + * @param result The container that will hold the elements found. + */ + private void resolveElement(Element current, Vector path, Vector result) { + + if ( path.isEmpty() ) { + + // OK, we've finished. + +// complain(LOG_WARNING, CH_XC, "path exhausted", null); + return; + } + +/* complain(LOG_DEBUG, CH_XC, "Resolving " + + current.getTagName() + + ", path " + + path, + null); + */ + String pathElement = (String)path.elementAt(0); + + // We don't need it anymore + + path.removeElementAt(0); + + // Now, let's see who's got the name we want + + Node cursor = current; + + while ( cursor != null ) { + + String name = cursor.getNodeName(); + +// complain(LOG_DEBUG, CH_XC, "Analyzing: " + name, null); + + if ( name.equals(pathElement) ) { + + if ( path.isEmpty() ) { + + // Bingo! + + result.addElement(cursor); +// complain(LOG_INFO, CH_XC, "Adding element: " + path + " " + name, null); + + } else { + + // We've got a component of the name right, but there + // are other elements left in the path. + +// complain(LOG_INFO, CH_XC, "Found path element: " + name, null); + + Node child = cursor.getFirstChild(); + + while ( child != null && child.getNodeType() != Node.ELEMENT_NODE ) { + + child = child.getNextSibling(); + } + + if ( child == null ) { + +// complain(LOG_INFO, CH_XC, "No more children @" + name, null); + return; + } + + resolveElement((Element)child, (Vector)path.clone(), result); + } + } + + // Skip the cursor until the next sibling which is an Element + + + do { + + cursor = cursor.getNextSibling(); + + } while ( cursor != null && cursor.getNodeType() != Node.ELEMENT_NODE ); + } } /** @@ -77,41 +191,32 @@ */ private synchronized void parse() { - parseEntry( conf.getDocumentElement(), "" ); - - for ( Enumeration e = keys(); e.hasMoreElements(); ) { - - Object key = e.nextElement(); - - complain(LOG_NOTICE, CH_XC, "Item: " + key.toString() + ": " + get(key), null); - } - - throw new Error("Not Implemented"); + parseEntry(conf.getDocumentElement(), ""); } private void parseEntry(Node node, String prefix) { boolean hasChildren = node.hasChildNodes(); - complain(LOG_WARNING, CH_XC, "Parsing entry: " +/* complain(LOG_WARNING, CH_XC, "Parsing entry: " + prefix + "/" + node.getNodeName() + (hasChildren?" (has children)":""), null); - + */ switch ( node.getNodeType() ) { case Node.TEXT_NODE: if ( !("".equals(node.getNodeValue().trim())) ) { - complain(LOG_NOTICE, CH_XC, prefix +/* complain(LOG_NOTICE, CH_XC, prefix + " = '" + node.getNodeValue().trim() + "'", null); - + */ super.put(prefix, node.getNodeValue().trim()); } break; @@ -132,6 +237,13 @@ super.put(prefix, name); prefix += "." + name; } + String enabled = ((Element)node).getAttribute("enabled"); + + if ( !("".equals(enabled)) ) { + + super.put(prefix + ".enabled", enabled); + } + break; } |
|
From: CVS B. <vt...@fr...> - 2000-08-21 15:31:01
|
User: vt Date: 00/08/21 08:31:24 Modified: src/java/gnu/j4/examples Tag: JAXP XmlConfigTest.java Log: Checkpoint on XML configuration: cleaned up a little and taught it to recognize the multiple elements properly Revision Changes Path No revision No revision 1.1.2.4 +18 -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.4&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.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/Attic/XmlConfigTest.java.diff?r1=1.1.2.4&r2=1.0&cvsroot=jukebox4 ----------------------------------- Index: XmlConfigTest.java =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/examples/Attic/XmlConfigTest.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- XmlConfigTest.java 2000/08/14 08:44:39 1.1.2.3 +++ XmlConfigTest.java 2000/08/21 15:31:24 1.1.2.4 @@ -3,6 +3,8 @@ import java.io.BufferedReader; import java.io.FileReader; import java.io.StringWriter; +import java.util.Enumeration; +import java.util.Vector; import org.apache.xerces.parsers.DOMParser; import org.w3c.dom.Document; @@ -43,6 +45,22 @@ complain(LOG_NOTICE, CH_XT, "Document parsed: " + toString(confSource)); xconf = new XmlConfiguration(confSource); + + + // Now print it + + for ( Enumeration e = xconf.keys(); e.hasMoreElements(); ) { + + Object key = e.nextElement(); + + complain(LOG_NOTICE, CH_XT, "Item: " + key.toString() + ": " + xconf.get(key)); + } + + // Now check if we have the element we want + + complain(LOG_NOTICE, CH_XT, "Queue found: " + xconf.getElements("jukebox.syslog.queue")); + complain(LOG_NOTICE, CH_XT, "Consumers found: " + xconf.getElements("jukebox.syslog.consumer")); + complain(LOG_NOTICE, CH_XT, "Consumers found: " + xconf.getElements("jukebox.syslog.consumer.classname")); } catch ( Throwable t ) { |
|
From: CVS B. <vt...@fr...> - 2000-08-21 15:31:01
|
User: vt Date: 00/08/21 08:31:24 Modified: examples Tag: JAXP exampleXmlConfigurationTest.in Log: Checkpoint on XML configuration: cleaned up a little and taught it to recognize the multiple elements properly Revision Changes Path No revision No revision 1.1.2.2 +2 -0 J4/examples/Attic/exampleXmlConfigurationTest.in CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/examples/Attic/exampleXmlConfigurationTest.in?annotate=1.1.2.2&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/examples/Attic/exampleXmlConfigurationTest.in?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/examples/Attic/exampleXmlConfigurationTest.in.diff?r1=1.1.2.2&r2=1.0&cvsroot=jukebox4 ----------------------------------- Index: exampleXmlConfigurationTest.in =================================================================== RCS file: /usr/local/cvs/J4/examples/Attic/exampleXmlConfigurationTest.in,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- exampleXmlConfigurationTest.in 2000/08/11 00:11:51 1.1.2.1 +++ exampleXmlConfigurationTest.in 2000/08/21 15:31:24 1.1.2.2 @@ -6,4 +6,6 @@ # configuration files in @prefix@/etc carefully so you understand what's # going on. +TARGET_CLASSPATH=@XERCES_CLASSES@ + @prefix@/bin/j4wrapper gnu.j4.examples.XmlConfigTest $* |
|
From: CVS B. <vt...@fr...> - 2000-08-21 15:30:59
|
User: vt Date: 00/08/21 08:31:23 Modified: etc Tag: JAXP jukebox.conf.xml.in Log: Checkpoint on XML configuration: cleaned up a little and taught it to recognize the multiple elements properly Revision Changes Path No revision No revision 1.1.2.4 +7 -11 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.4&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.4&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.4&r2=1.0&cvsroot=jukebox4 ----------------------------------- Index: jukebox.conf.xml.in =================================================================== RCS file: /usr/local/cvs/J4/etc/Attic/jukebox.conf.xml.in,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- jukebox.conf.xml.in 2000/08/14 08:44:37 1.1.2.3 +++ jukebox.conf.xml.in 2000/08/21 15:31:23 1.1.2.4 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE jukebox SYSTEM "@prefix@/etc/jukebox.conf.dtd"> -<!-- $Id: jukebox.conf.xml.in,v 1.1.2.3 2000/08/14 08:44:37 vt Exp $ --> +<!-- $Id: jukebox.conf.xml.in,v 1.1.2.4 2000/08/21 15:31:23 vt Exp $ --> <@PACKAGE@> <syslog> <queue> @@ -70,7 +70,7 @@ </pattern> </regexp> </filter> - <consumer name="Ansi" active="true"> + <consumer name="Ansi" enabled="true"> <classname> gnu.j4.core.AnsiSyslog </classname> @@ -85,19 +85,17 @@ gnu.j4.core.SwitchFacilityFilter </classname> <switch> - <channel name="DEBUG" enable="false"/> + <channel name="DEBUG" enabled="false"/> </switch> </filter> <timestamp> <format> HH:mm:ss:SSS </format> - <displaydelay> - true - </displaydelay> + <displaydelay enabled="true"/> </timestamp> </consumer> - <consumer name="File" active="false"> + <consumer name="File" enabled="false"> <classname> gnu.j4.core.FileSyslog </classname> @@ -110,12 +108,10 @@ <format> yyyy:MM:dd HH:mm:ss:SSS zz </format> - <displaydelay> - true - </displaydelay> + <displaydelay enabled="true"/> </timestamp> </consumer> - <consumer name="UDP" active="false"> + <consumer name="UDP" enabled="false"> <classname> gnu.j4.core.UdpSyslog </classname> |
|
From: CVS B. <vt...@fr...> - 2000-08-18 17:45:49
|
User: vt Date: 00/08/18 10:45:58 Modified: src/java/gnu/j4/service Tag: JAXP ApplicationWrapper.java Log: Found one exception that was coming unnoticed. I will see it from now on. Revision Changes Path No revision No revision 1.11.2.1 +5 -1 J4/src/java/gnu/j4/service/ApplicationWrapper.java CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/service/ApplicationWrapper.java?annotate=1.11.2.1&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/java/gnu/j4/service/ApplicationWrapper.java?rev=1.11.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/service/ApplicationWrapper.java.diff?r1=1.11.2.1&r2=1.10&cvsroot=jukebox4 ----------------------------------- Index: ApplicationWrapper.java =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/service/ApplicationWrapper.java,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -u -r1.11 -r1.11.2.1 --- ApplicationWrapper.java 2000/06/06 18:46:26 1.11 +++ ApplicationWrapper.java 2000/08/18 17:45:57 1.11.2.1 @@ -118,7 +118,7 @@ * * @since Jukebox v2 * @author Copyright © <a href="mailto:vt...@fr...">Vadim Tkachenko</a> 1995-1999 - * @version $Id: ApplicationWrapper.java,v 1.11 2000/06/06 18:46:26 vt Exp $ + * @version $Id: ApplicationWrapper.java,v 1.11.2.1 2000/08/18 17:45:57 vt Exp $ */ public final class ApplicationWrapper extends LogAware { @@ -214,6 +214,10 @@ ApplicationWrapper w = new ApplicationWrapper(argv); exitCode = w.execute(); + } catch ( Throwable t ) { + + t.printStackTrace(); + } finally { System.gc(); |
|
From: CVS B. <vt...@fr...> - 2000-08-16 21:43:01
|
User: vt Date: 00/08/16 14:43:15 Modified: src/java/gnu/j4/io/base64 Base64DecoderInputStream.java Log: Malformed encoded input stream with some base64 characters due, but none left, doesn't make the decoder hang anymore. Revision Changes Path 1.6 +16 -1 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.6&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.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/base64/Base64DecoderInputStream.java.diff?r1=1.6&r2=1.5&cvsroot=jukebox4 ----------------------------------- Index: Base64DecoderInputStream.java =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/io/base64/Base64DecoderInputStream.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Base64DecoderInputStream.java 2000/07/25 19:05:46 1.5 +++ Base64DecoderInputStream.java 2000/08/16 21:43:15 1.6 @@ -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.5 2000/07/25 19:05:46 vt Exp $ + * @version $Id: Base64DecoderInputStream.java,v 1.6 2000/08/16 21:43:15 vt Exp $ */ public class Base64DecoderInputStream extends Base64InputStream { /** @@ -64,9 +64,17 @@ int c = super.read(); if ( c == -1 ) { + if ( state.isOctetClear() ) { + EOF = true; return false; // Clear end of stream with no extra bytes + + } else { + + // Actually, the additional check for EOF below should + // be moved here, because it just doesn't make sense. + // Let's wait and see. } } @@ -74,6 +82,13 @@ EOF = true; return true; // Padding character, means end of encoded // stream is reached + } + + if ( c == -1 ) { + + // We shouldn't get there at all. + + throw new IOException("Malformed input stream, EOF reached"); } if ( !Base64Common.isBase64Char( (byte)c ) ) { |
|
From: CVS B. <vt...@fr...> - 2000-08-14 08:44:24
|
User: vt Date: 00/08/14 01:44:36 Modified: . Tag: JAXP configure.in Log: Checkpoint: XML configuration Revision Changes Path No revision No revision 1.63.2.4 +3 -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.4&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/configure.in?rev=1.63.2.4&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.4&r2=1.62&cvsroot=jukebox4 ----------------------------------- Index: configure.in =================================================================== RCS file: /usr/local/cvs/J4/configure.in,v retrieving revision 1.63.2.3 retrieving revision 1.63.2.4 diff -u -r1.63.2.3 -r1.63.2.4 --- configure.in 2000/08/11 00:11:47 1.63.2.3 +++ configure.in 2000/08/14 08:44:36 1.63.2.4 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_REVISION($Id: configure.in,v 1.63.2.3 2000/08/11 00:11:47 vt Exp $)dnl +AC_REVISION($Id: configure.in,v 1.63.2.4 2000/08/14 08:44:36 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. @@ -197,7 +197,7 @@ AM_CONDITIONAL(REX,${TEST} -n "${REX_CLASSES}") AM_CONDITIONAL(JSDK,${TEST} -n "${JSDK_CLASSES}") -AC_PATH_JAVACLASS(XERCES,XML4J_3_0_1,org.apache.xerces.dom.DocumentImpl,[ Where to find the Apache Xerces classes]) +AC_PATH_JAVACLASS(XERCES,xerces,org.apache.xerces.dom.DocumentImpl,[ Where to find the Apache Xerces classes]) AM_CONDITIONAL(XERCES,${TEST} -n "${XERCES_CLASSES}") @@ -407,6 +407,7 @@ etc/test.conf etc/test.resource.pool.conf etc/management.conf + etc/jukebox.conf.dtd etc/jukebox.conf.xml examples/Makefile examples/index.html |
|
From: CVS B. <vt...@fr...> - 2000-08-14 08:44:16
|
User: vt Date: 00/08/14 01:44:39 Modified: src/java/gnu/j4/examples Tag: JAXP XmlConfigTest.java Log: Checkpoint: XML configuration Revision Changes Path No revision No revision 1.1.2.3 +6 -1 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.3&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.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/Attic/XmlConfigTest.java.diff?r1=1.1.2.3&r2=1.0&cvsroot=jukebox4 ----------------------------------- Index: XmlConfigTest.java =================================================================== RCS file: /usr/local/cvs/J4/src/java/gnu/j4/examples/Attic/XmlConfigTest.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- XmlConfigTest.java 2000/08/11 00:11:52 1.1.2.2 +++ XmlConfigTest.java 2000/08/14 08:44:39 1.1.2.3 @@ -27,7 +27,12 @@ DOMParser parser = new DOMParser(); - // parser.setValidating(false); + parser.setFeature("http://xml.org/sax/features/validation", true); + + if ( !parser.getFeature("http://xml.org/sax/features/validation") ) { + + throw new Error("How the hell come it is not validating???"); + } InputSource is = new InputSource(br); |
|
From: CVS B. <vt...@fr...> - 2000-08-14 08:44:16
|
User: vt
Date: 00/08/14 01:44:39
Modified: src/java/gnu/j4/config Tag: JAXP Configuration.java
XmlConfiguration.java
Log:
Checkpoint: XML configuration
Revision Changes Path
No revision
No revision
1.30.2.1 +33 -20 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.2.1&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.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/Configuration.java.diff?r1=1.30.2.1&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.30
retrieving revision 1.30.2.1
diff -u -r1.30 -r1.30.2.1
--- Configuration.java 2000/07/25 17:42:28 1.30
+++ Configuration.java 2000/08/14 08:44:38 1.30.2.1
@@ -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.30 2000/07/25 17:42:28 vt Exp $
+ * @version $Id: Configuration.java,v 1.30.2.1 2000/08/14 08:44:38 vt Exp $
*/
public class Configuration extends Hashtable {
@@ -519,45 +519,58 @@
* If there's already existing value[s], the value is added into the
* sequence of values.
*
+ * <p>
+ *
+ * <strong>NOTE:</strong> it is not possible to distinguish between the
+ * <code>Vector</code> that is a value itself and the
+ * <code>Vector</code> that is a collection of other values. Caveat
+ * emptor.
+ *
* @param key The key.
*
* @param value The value.
- *
- * @exception IllegalArgumentException if the argument is neither
- * <code>String</code> nor <code>Vector</code>.
*/
- public void put(String key, String value) {
+ public void put(String key, Object value) {
+
Object found = super.get(key);
if ( found == null ) {
+
+ // OK, we don't have to fiddle with the sequence
+
super.put(key, value);
return;
+
}
if ( found instanceof Vector ) {
+
+ // OK, there's existing sequence already.
+
Vector vFound = (Vector)found;
if ( vFound.indexOf(value) == -1 ) {
+
vFound.addElement(value);
+ return;
+
+ } else {
+
+ // Oh well, it's already there, I'm not going to add a
+ // duplicate
}
- return;
- }
-
- if ( found instanceof String ) {
- String first = (String)found;
- super.remove(key);
- Vector set = new Vector();
- set.addElement(first);
- set.addElement(value);
- super.put(key, set);
- return;
}
- throw new IllegalArgumentException(key
- + " maps to "
- + found.getClass().getName()
- + ", String/Vector expected");
+ // Now, we know for sure that some object is already set to be the
+ // configuration value, and it's not a collection (well, Vector), so
+ // we have to create a collection and add new value to it.
+
+ super.remove(key);
+ Vector set = new Vector();
+ set.addElement(found);
+ set.addElement(value);
+ super.put(key, set);
}
/**
1.1.2.4 +36 -8 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.4&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.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/config/Attic/XmlConfiguration.java.diff?r1=1.1.2.4&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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XmlConfiguration.java 2000/08/11 00:11:51 1.1.2.3
+++ XmlConfiguration.java 2000/08/14 08:44:39 1.1.2.4
@@ -1,6 +1,6 @@
package gnu.j4.config;
-import java.util.NoSuchElementException;
+import java.util.Enumeration;
import java.util.Vector;
import org.w3c.dom.Document;
@@ -14,7 +14,7 @@
* 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.3 2000/08/11 00:11:51 vt Exp $
+ * @version $Id: XmlConfiguration.java,v 1.1.2.4 2000/08/14 08:44:39 vt Exp $
*/
public class XmlConfiguration extends Configuration implements LogLevels, LogFacilities {
@@ -49,10 +49,8 @@
*
* @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.
+ * @return The element located at the end of this path, or
+ * <code>null</code> if such element doesn't exist.
*/
public Element getElement(String path) {
@@ -79,7 +77,15 @@
*/
private synchronized void parse() {
- parseEntry( conf.getDocumentElement(), "." );
+ parseEntry( conf.getDocumentElement(), "" );
+
+ for ( Enumeration e = keys(); e.hasMoreElements(); ) {
+
+ Object key = e.nextElement();
+
+ complain(LOG_NOTICE, CH_XC, "Item: " + key.toString() + ": " + get(key), null);
+ }
+
throw new Error("Not Implemented");
}
@@ -89,6 +95,7 @@
complain(LOG_WARNING, CH_XC, "Parsing entry: "
+ prefix
+ + "/"
+ node.getNodeName()
+ (hasChildren?" (has children)":""),
null);
@@ -104,7 +111,28 @@
+ node.getNodeValue().trim()
+ "'",
null);
+
+ super.put(prefix, node.getNodeValue().trim());
+ }
+ break;
+
+ case Node.ELEMENT_NODE:
+
+ if ( !("".equals(prefix)) ) {
+
+ prefix += ".";
+ }
+
+ prefix += node.getNodeName();
+
+ String name = ((Element)node).getAttribute("name");
+
+ if ( !("".equals(name)) ) {
+
+ super.put(prefix, name);
+ prefix += "." + name;
}
+ break;
}
if ( hasChildren ) {
@@ -113,7 +141,7 @@
while ( cursor != null ) {
- parseEntry(cursor, prefix + node.getNodeName() + ".");
+ parseEntry(cursor, prefix);
cursor = cursor.getNextSibling();
}
|
|
From: CVS B. <vt...@fr...> - 2000-08-14 08:44:15
|
User: vt
Date: 00/08/14 01:44:38
Modified: etc Tag: JAXP .cvsignore Makefile.am
jukebox.conf.xml.in
Added: etc Tag: JAXP jukebox.conf.dtd.in
Log:
Checkpoint: XML configuration
Revision Changes Path
No revision
No revision
1.1.16.2 +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.2&cvsroot=jukebox4
CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/etc/.cvsignore?rev=1.1.16.2&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.2&r2=1.0&cvsroot=jukebox4
-----------------------------------
Index: .cvsignore
===================================================================
RCS file: /usr/local/cvs/J4/etc/.cvsignore,v
retrieving revision 1.1.16.1
retrieving revision 1.1.16.2
diff -u -r1.1.16.1 -r1.1.16.2
--- .cvsignore 2000/08/08 23:26:44 1.1.16.1
+++ .cvsignore 2000/08/14 08:44:37 1.1.16.2
@@ -2,3 +2,4 @@
Makefile.in
*.conf
*.conf.xml
+*.conf.dtd
1.4.2.2 +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.2&cvsroot=jukebox4
CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/etc/Makefile.am?rev=1.4.2.2&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.2&r2=1.3&cvsroot=jukebox4
-----------------------------------
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvs/J4/etc/Makefile.am,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- Makefile.am 2000/08/08 23:26:44 1.4.2.1
+++ Makefile.am 2000/08/14 08:44:37 1.4.2.2
@@ -1,7 +1,7 @@
-# $Id: Makefile.am,v 1.4.2.1 2000/08/08 23:26:44 vt Exp $
+# $Id: Makefile.am,v 1.4.2.2 2000/08/14 08:44:37 vt Exp $
etcdir = ${prefix}/etc
-etc_DATA = log.conf test.conf test.resource.pool.conf management.conf jukebox.conf.xml
+etc_DATA = log.conf test.conf test.resource.pool.conf management.conf jukebox.conf.xml jukebox.conf.dtd
RM = @RM@
1.1.2.3 +10 -7 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.3&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.3&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.3&r2=1.0&cvsroot=jukebox4
-----------------------------------
Index: jukebox.conf.xml.in
===================================================================
RCS file: /usr/local/cvs/J4/etc/Attic/jukebox.conf.xml.in,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- jukebox.conf.xml.in 2000/08/11 00:11:51 1.1.2.2
+++ jukebox.conf.xml.in 2000/08/14 08:44:37 1.1.2.3
@@ -1,4 +1,7 @@
-<Jukebox>
+<?xml version="1.0"?>
+<!DOCTYPE jukebox SYSTEM "@prefix@/etc/jukebox.conf.dtd">
+<!-- $Id: jukebox.conf.xml.in,v 1.1.2.3 2000/08/14 08:44:37 vt Exp $ -->
+<@PACKAGE@>
<syslog>
<queue>
<maxage>
@@ -67,7 +70,7 @@
</pattern>
</regexp>
</filter>
- <consumer active="true">
+ <consumer name="Ansi" active="true">
<classname>
gnu.j4.core.AnsiSyslog
</classname>
@@ -94,14 +97,14 @@
</displaydelay>
</timestamp>
</consumer>
- <consumer active="false">
+ <consumer name="File" active="false">
<classname>
gnu.j4.core.FileSyslog
</classname>
<file>
- <name>
+ <filename>
/var/log/jukebox
- </name>
+ </filename>
</file>
<timestamp>
<format>
@@ -112,7 +115,7 @@
</displaydelay>
</timestamp>
</consumer>
- <consumer active="false">
+ <consumer name="UDP" active="false">
<classname>
gnu.j4.core.UdpSyslog
</classname>
@@ -132,4 +135,4 @@
</udp>
</consumer>
</syslog>
-</Jukebox>
+</@PACKAGE@>
No revision
No revision
1.1.2.1 +37 -0 J4/etc/Attic/jukebox.conf.dtd.in
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/etc/Attic/jukebox.conf.dtd.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.dtd.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.dtd.in.diff?r1=1.1.2.1&r2=1.0&cvsroot=jukebox4
-----------------------------------
|
|
From: CVS B. <vt...@fr...> - 2000-08-14 08:44:14
|
User: vt Date: 00/08/14 01:44:37 Modified: docs/apidocs Tag: JAXP index-template.html Log: Checkpoint: XML configuration Revision Changes Path No revision No revision 1.6.2.1 +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.2.1&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/docs/apidocs/index-template.html?rev=1.6.2.1&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.2.1&r2=1.5&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.6.2.1 diff -u -r1.6 -r1.6.2.1 --- index-template.html 2000/07/18 21:45:59 1.6 +++ index-template.html 2000/08/14 08:44:37 1.6.2.1 @@ -2,7 +2,7 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc on Sat Jul 08 19:40:48 MDT 2000--> +<!-- Generated by javadoc on Sun Aug 06 22:55:54 MST 2000--> <TITLE> Generated Documentation (Untitled) </TITLE> |
|
From: CVS B. <vt...@fr...> - 2000-08-14 05:17:11
|
User: vt Date: 00/08/13 22:17:33 Modified: . ChangeLog Log: Checkpoint Revision Changes Path 1.20 +2 -3 J4/ChangeLog CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/ChangeLog?annotate=1.20&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/ChangeLog?rev=1.20&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.20&r2=1.19&cvsroot=jukebox4 ----------------------------------- Index: ChangeLog =================================================================== RCS file: /usr/local/cvs/J4/ChangeLog,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- ChangeLog 2000/08/04 23:21:46 1.19 +++ ChangeLog 2000/08/14 05:17:33 1.20 @@ -1,4 +1,4 @@ -$Id: ChangeLog,v 1.19 2000/08/04 23:21:46 vt Exp $ +$Id: ChangeLog,v 1.20 2000/08/14 05:17:33 vt Exp $ CURRENT RELEASE NOTES @@ -18,10 +18,9 @@ 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. + are found. Properly works with JDK 1.3 now, 1.3 is + recognized as a distinct platform. --- 2.0p7 Lots of small fixes. Fixed the bug that I fixed already working on JServ build infrastructure a year ago, thanks to |
|
From: CVS B. <vt...@fr...> - 2000-08-11 00:11:57
|
User: vt Date: 00/08/10 17:11:53 Modified: src/scripts Tag: JAXP j4wrapper.in Log: - Forget JAXP - Welcome Xerces - Working on it... Revision Changes Path No revision No revision 1.5.2.1 +6 -2 J4/src/scripts/j4wrapper.in CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/scripts/j4wrapper.in?annotate=1.5.2.1&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/src/scripts/j4wrapper.in?rev=1.5.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/scripts/j4wrapper.in.diff?r1=1.5.2.1&r2=1.4&cvsroot=jukebox4 ----------------------------------- Index: j4wrapper.in =================================================================== RCS file: /usr/local/cvs/J4/src/scripts/j4wrapper.in,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -r1.5 -r1.5.2.1 --- j4wrapper.in 2000/06/06 18:46:27 1.5 +++ j4wrapper.in 2000/08/11 00:11:53 1.5.2.1 @@ -1,6 +1,6 @@ #! /bin/sh # -# $Id: j4wrapper.in,v 1.5 2000/06/06 18:46:27 vt Exp $ +# $Id: j4wrapper.in,v 1.5.2.1 2000/08/11 00:11:53 vt Exp $ # # This script is used to run the classes extending the # gnu.j4.service.RunnableService. Please see the documentation - the wrapper @@ -8,7 +8,11 @@ # # J4WRAPPER environment variable -TARGET_CLASSPATH=@prefix@/lib/@PACKAGE@.jar:@JMX_CLASSES@:@JMXTOOLS_CLASSES@:${CLASSPATH} +TARGET_CLASSPATH=@prefix@/lib/@PACKAGE@.jar:\ +@JMX_CLASSES@:\ +@JMXTOOLS_CLASSES@:\ +@XERCES_CLASSES@:\ +${CLASSPATH} JAVA_OPT="@JAVA_OPT@" |
|
From: CVS B. <vt...@fr...> - 2000-08-11 00:11:56
|
User: vt
Date: 00/08/10 17:11:52
Modified: src/java/gnu/j4/examples Tag: JAXP Makefile.am
XmlConfigTest.java
Log:
- Forget JAXP
- Welcome Xerces
- Working on it...
Revision Changes Path
No revision
No revision
1.22.2.2 +6 -6 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.2&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.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/Makefile.am.diff?r1=1.22.2.2&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.2.1
retrieving revision 1.22.2.2
diff -u -r1.22.2.1 -r1.22.2.2
--- Makefile.am 2000/08/08 00:19:04 1.22.2.1
+++ Makefile.am 2000/08/11 00:11:52 1.22.2.2
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.22.2.1 2000/08/08 00:19:04 vt Exp $
+# $Id: Makefile.am,v 1.22.2.2 2000/08/11 00:11:52 vt Exp $
noinst_PROGRAMS = package
@@ -24,7 +24,7 @@
JAVA2_FILES = LogTest.java \
RWLockTest.java
-JAXP_FILES = XmlConfigTest.java
+XERCES_FILES = XmlConfigTest.java
EJB_FILES =
@@ -42,13 +42,13 @@
JAVA2_SUBSET =
endif
-if JAXP
-JAXP_SUBSET = ${JAXP_FILES}
+if XERCES
+XERCES_SUBSET = ${XERCES_FILES}
else
-JAXP_SUBSET
+XERCES_SUBSET
endif
-package_SOURCES = ${BASE_FILES} ${JAVA2_SUBSET} ${EJB_SUBSET} ${JAXP_SUBSET}
+package_SOURCES = ${BASE_FILES} ${JAVA2_SUBSET} ${EJB_SUBSET} ${XERCES_SUBSET}
ECHO = @ECHO@
JAVACX = @JAVACX@
1.1.2.2 +55 -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.2&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.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/Attic/XmlConfigTest.java.diff?r1=1.1.2.2&r2=1.0&cvsroot=jukebox4
-----------------------------------
Index: XmlConfigTest.java
===================================================================
RCS file: /usr/local/cvs/J4/src/java/gnu/j4/examples/Attic/XmlConfigTest.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- XmlConfigTest.java 2000/08/08 00:19:04 1.1.2.1
+++ XmlConfigTest.java 2000/08/11 00:11:52 1.1.2.2
@@ -1,9 +1,64 @@
package gnu.j4.examples;
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.StringWriter;
+
+import org.apache.xerces.parsers.DOMParser;
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
+import org.apache.xml.serialize.XMLSerializer;
+import org.apache.xml.serialize.OutputFormat;
+
import gnu.j4.service.ActiveService;
import gnu.j4.config.XmlConfiguration;
public class XmlConfigTest extends ActiveService {
+ public final static String CH_XT = "XmlConfigTest";
+
+ XmlConfiguration xconf;
+
+ protected void startup() throws InterruptedException {
+
+ try {
+
+ BufferedReader br = new BufferedReader(new FileReader("/usr/local/jukebox/etc/jukebox.conf.xml"));
+
+ DOMParser parser = new DOMParser();
+
+ // parser.setValidating(false);
+
+ InputSource is = new InputSource(br);
+
+ parser.parse(is);
+
+ Document confSource = parser.getDocument();
+
+ complain(LOG_NOTICE, CH_XT, "Document parsed: " + toString(confSource));
+
+ xconf = new XmlConfiguration(confSource);
+
+ } catch ( Throwable t ) {
+
+ complain(LOG_ERR, CH_XT, "Failed:", t);
+ }
+ }
+ protected void execute() {
+ }
+
+ protected void shutdown() {
+ }
+
+ public String toString(Document source) throws Throwable {
+
+ OutputFormat of = new OutputFormat(source);
+ StringWriter sw = new StringWriter();
+
+ XMLSerializer xmlserializer = new XMLSerializer(sw , of);
+
+ xmlserializer.serialize(source);
+ return sw.toString();
+ }
}
|
|
From: CVS B. <vt...@fr...> - 2000-08-11 00:11:56
|
User: vt
Date: 00/08/10 17:11:52
Modified: src/java/gnu/j4/config Tag: JAXP Makefile.am
XmlConfiguration.java
Log:
- Forget JAXP
- Welcome Xerces
- Working on it...
Revision Changes Path
No revision
No revision
1.8.2.2 +7 -10 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.2&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.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/Makefile.am.diff?r1=1.8.2.2&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.2.1
retrieving revision 1.8.2.2
diff -u -r1.8.2.1 -r1.8.2.2
--- Makefile.am 2000/08/07 15:46:09 1.8.2.1
+++ Makefile.am 2000/08/11 00:11:51 1.8.2.2
@@ -1,11 +1,11 @@
-# $Id: Makefile.am,v 1.8.2.1 2000/08/07 15:46:09 vt Exp $
+# $Id: Makefile.am,v 1.8.2.2 2000/08/11 00:11:51 vt Exp $
BASE_FILES = ConfigReader.java \
Configuration.java \
PropertiesReader.java
JSDK_FILES = ServletConfigReader.java
-JAXP_FILES = XmlConfiguration.java
+XERCES_FILES = XmlConfiguration.java
if JSDK
JSDK_SUBSET = ${JSDK_FILES}
@@ -13,19 +13,16 @@
JSDK_SUBSET =
endif
-## 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}
+if XERCES
+XERCES_SUBSET = ${XERCES_FILES}
else
-JAXP_SUBSET =
+XERCES_SUBSET =
endif
-EXTRA_DIST = package.html ${JSDK_FILES} ${JAXP_FILES}
+EXTRA_DIST = package.html ${JSDK_FILES} ${XERCES_FILES}
noinst_PROGRAMS = package
-package_SOURCES = ${BASE_FILES} ${JSDK_FILES} ${JAXP_SUBSET}
+package_SOURCES = ${BASE_FILES} ${JSDK_FILES} ${XERCES_SUBSET}
ECHO = @ECHO@
JAVACX = @JAVACX@
1.1.2.3 +79 -3 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.3&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.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/config/Attic/XmlConfiguration.java.diff?r1=1.1.2.3&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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- XmlConfiguration.java 2000/08/08 00:19:04 1.1.2.2
+++ XmlConfiguration.java 2000/08/11 00:11:51 1.1.2.3
@@ -5,23 +5,46 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import gnu.j4.core.*;
+
/**
* 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.2 2000/08/08 00:19:04 vt Exp $
+ * @version $Id: XmlConfiguration.java,v 1.1.2.3 2000/08/11 00:11:51 vt Exp $
*/
-public class XmlConfiguration extends Configuration {
+public class XmlConfiguration extends Configuration implements LogLevels, LogFacilities {
/**
* The XML configuration object.
*/
- private Document theConfiguration;
+ private Document conf;
+ /**
+ * Create the empty configuration.
+ */
+ public XmlConfiguration() {
+ this(null);
+ }
+
/**
+ * Create the configuration based on the given XML document.
+ *
+ * VT: FIXME: I want to have the DTD reference so this stays validated.
+ *
+ * @param conf XML document to use as a configuration source.
+ */
+ public XmlConfiguration(Document conf) {
+
+ this.conf = conf;
+ parse();
+ }
+
+ /**
* Get the configuration element.
*
* @param path Dot delimited path to the elements.
@@ -49,5 +72,58 @@
public Vector getElements(String path) {
throw new Error("Not Implemented");
+ }
+
+ /**
+ * Parse the {@link #conf XML document} into the configuration.
+ */
+ private synchronized void parse() {
+
+ parseEntry( conf.getDocumentElement(), "." );
+ throw new Error("Not Implemented");
+ }
+
+ private void parseEntry(Node node, String prefix) {
+
+ boolean hasChildren = node.hasChildNodes();
+
+ complain(LOG_WARNING, CH_XC, "Parsing entry: "
+ + prefix
+ + node.getNodeName()
+ + (hasChildren?" (has children)":""),
+ null);
+
+ switch ( node.getNodeType() ) {
+
+ case Node.TEXT_NODE:
+
+ if ( !("".equals(node.getNodeValue().trim())) ) {
+
+ complain(LOG_NOTICE, CH_XC, prefix
+ + " = '"
+ + node.getNodeValue().trim()
+ + "'",
+ null);
+ }
+ }
+
+ if ( hasChildren ) {
+
+ Node cursor = node.getFirstChild();
+
+ while ( cursor != null ) {
+
+ parseEntry(cursor, prefix + node.getNodeName() + ".");
+ cursor = cursor.getNextSibling();
+ }
+
+ }
+ }
+
+ String CH_XC = "XmlConf";
+
+ private void complain(LogLevel ll, String channel, String message, Throwable t) {
+
+ LogAware.complain(this, ll, channel, message, t);
}
}
|
|
From: CVS B. <vt...@fr...> - 2000-08-11 00:11:55
|
User: vt Date: 00/08/10 17:11:51 Modified: examples Tag: JAXP .cvsignore Makefile.am Added: examples Tag: JAXP exampleXmlConfigurationTest.in Log: - Forget JAXP - Welcome Xerces - Working on it... Revision Changes Path No revision No revision 1.8.2.1 +1 -0 J4/examples/.cvsignore CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/examples/.cvsignore?annotate=1.8.2.1&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/examples/.cvsignore?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/examples/.cvsignore.diff?r1=1.8.2.1&r2=1.7&cvsroot=jukebox4 ----------------------------------- Index: .cvsignore =================================================================== RCS file: /usr/local/cvs/J4/examples/.cvsignore,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -r1.8 -r1.8.2.1 --- .cvsignore 2000/06/13 23:36:36 1.8 +++ .cvsignore 2000/08/11 00:11:51 1.8.2.1 @@ -9,4 +9,5 @@ exampleSemaphoreGroupTest exampleSimpleServiceTest exampleTelnetTest +exampleXmlConfigurationTest index.html 1.8.2.1 +6 -2 J4/examples/Makefile.am CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/examples/Makefile.am?annotate=1.8.2.1&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/examples/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/examples/Makefile.am.diff?r1=1.8.2.1&r2=1.7&cvsroot=jukebox4 ----------------------------------- Index: Makefile.am =================================================================== RCS file: /usr/local/cvs/J4/examples/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:00 1.8 +++ Makefile.am 2000/08/11 00:11:51 1.8.2.1 @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.8 2000/07/06 10:47:00 vt Exp $ +# $Id: Makefile.am,v 1.8.2.1 2000/08/11 00:11:51 vt Exp $ bin_PROGRAMS = exampleLogTest \ exampleLruCacheTest \ @@ -8,7 +8,8 @@ exampleSemaphoreGroupTest \ exampleConfigTest \ exampleSimpleServiceTest \ - exampleTelnetTest + exampleTelnetTest \ + exampleXmlConfigurationTest bin_DATA = index.html @@ -23,6 +24,7 @@ exampleSimpleServiceTest_SOURCES = exampleSimpleServiceTest exampleTelnetTest_SOURCES = exampleTelnetTest exampleRWLockTest_SOURCES = exampleRWLockTest +exampleXmlConfigurationTest_SOURCES = exampleXmlConfigutrationTest RM = @RM@ @@ -47,3 +49,5 @@ exampleTelnetTest: exampleRWLockTest: + +exampleXmlConfigurationTest: No revision No revision 1.1.2.1 +9 -0 J4/examples/Attic/exampleXmlConfigurationTest.in CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/examples/Attic/exampleXmlConfigurationTest.in?annotate=1.1.2.1&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/examples/Attic/exampleXmlConfigurationTest.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/examples/Attic/exampleXmlConfigurationTest.in.diff?r1=1.1.2.1&r2=1.0&cvsroot=jukebox4 ----------------------------------- |
|
From: CVS B. <vt...@fr...> - 2000-08-11 00:11:55
|
User: vt Date: 00/08/10 17:11:47 Modified: . Tag: JAXP configure.in Log: - Forget JAXP - Welcome Xerces - Working on it... Revision Changes Path No revision No revision 1.63.2.3 +7 -9 J4/configure.in CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/configure.in?annotate=1.63.2.3&cvsroot=jukebox4 CVSWeb: View this file: http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/configure.in?rev=1.63.2.3&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.3&r2=1.62&cvsroot=jukebox4 ----------------------------------- Index: configure.in =================================================================== RCS file: /usr/local/cvs/J4/configure.in,v retrieving revision 1.63.2.2 retrieving revision 1.63.2.3 diff -u -r1.63.2.2 -r1.63.2.3 --- configure.in 2000/08/08 00:19:04 1.63.2.2 +++ configure.in 2000/08/11 00:11:47 1.63.2.3 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_REVISION($Id: configure.in,v 1.63.2.2 2000/08/08 00:19:04 vt Exp $)dnl +AC_REVISION($Id: configure.in,v 1.63.2.3 2000/08/11 00:11:47 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. @@ -197,11 +197,9 @@ 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") +AC_PATH_JAVACLASS(XERCES,XML4J_3_0_1,org.apache.xerces.dom.DocumentImpl,[ Where to find the Apache Xerces classes]) -AM_CONDITIONAL(JAXP,${TEST} -n "${JAXP_CLASSES}") -AM_CONDITIONAL(JAXP_PARSER,${TEST} -n "${JAXP_PARSER_CLASSES}") +AM_CONDITIONAL(XERCES,${TEST} -n "${XERCES_CLASSES}") dnl Define the TARGET_CLASSPATH @@ -302,8 +300,7 @@ AC_PATH_EXTRA(JTA) AC_PATH_EXTRA(JTS) AC_PATH_EXTRA(JMX) -AC_PATH_EXTRA(JAXP) -AC_PATH_EXTRA(JAXP_PARSER) +AC_PATH_EXTRA(XERCES) dnl FIXME: Ugly hack @@ -410,6 +407,7 @@ etc/test.conf etc/test.resource.pool.conf etc/management.conf + etc/jukebox.conf.xml examples/Makefile examples/index.html examples/exampleConfigTest @@ -421,6 +419,7 @@ examples/exampleSemaphoreGroupTest examples/exampleSimpleServiceTest examples/exampleTelnetTest + examples/exampleXmlConfigurationTest src/java/gnu/j4/cache/Makefile src/java/gnu/j4/config/Makefile src/java/gnu/j4/core/Makefile @@ -498,8 +497,7 @@ AC_REPORT_OPTIONAL(JTS) AC_REPORT_OPTIONAL(JMX) AC_REPORT_OPTIONAL(JMXTOOLS) -AC_REPORT_OPTIONAL(JAXP) -AC_REPORT_OPTIONAL(JAXP_PARSER) +AC_REPORT_OPTIONAL(XERCES) AC_MSG_RESULT() if ${TEST} -z "$BOOTSTRAP" ; then |
|
From: CVS B. <vt...@fr...> - 2000-08-11 00:11:55
|
User: vt Date: 00/08/10 17:11:51 Modified: etc Tag: JAXP jukebox.conf.xml.in Log: - Forget JAXP - Welcome Xerces - Working on it... Revision Changes Path No revision No revision 1.1.2.2 +15 -5 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.2&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.2&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.2&r2=1.0&cvsroot=jukebox4 ----------------------------------- Index: jukebox.conf.xml.in =================================================================== RCS file: /usr/local/cvs/J4/etc/Attic/jukebox.conf.xml.in,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- jukebox.conf.xml.in 2000/08/08 23:26:44 1.1.2.1 +++ jukebox.conf.xml.in 2000/08/11 00:11:51 1.1.2.2 @@ -43,18 +43,28 @@ flag is set to the action value if the pattern matches. Then, the action flag is left alone, so the action of the last match defines the final action. + + - Alternatively (and this is the only way it will work + until the filters are adjusted to the XML + configuration), no 'action' attribute will trigger the + old behavior (treating the patterns with the minus + sign at the beginning as patterns to exclude, and the + rest as the patterns to include). --> - <pattern action=include> + <pattern action="include"> .* </pattern> - <pattern action=exclude> + <pattern action="exclude"> logger.* </pattern> - <pattern action=exclude> + <pattern action="exclude"> copyright.* </pattern> + <pattern> + -getopt\..* + </pattern> </regexp> </filter> <consumer active="true"> @@ -72,7 +82,7 @@ gnu.j4.core.SwitchFacilityFilter </classname> <switch> - <channel name="DEBUG" enable="false"> + <channel name="DEBUG" enable="false"/> </switch> </filter> <timestamp> @@ -91,7 +101,7 @@ <file> <name> /var/log/jukebox - <name> + </name> </file> <timestamp> <format> |