Index: .classpath =================================================================== RCS file: /cvsroot/classpath/classpath/.classpath,v retrieving revision 1.3 diff -u -r1.3 .classpath --- .classpath 20 Sep 2004 19:04:59 -0000 1.3 +++ .classpath 23 Dec 2004 22:06:10 -0000 @@ -1,6 +1,9 @@ - + + + + Index: LICENSE =================================================================== RCS file: /cvsroot/classpath/classpath/LICENSE,v retrieving revision 1.4 diff -u -r1.4 LICENSE --- LICENSE 10 Dec 2004 14:52:18 -0000 1.4 +++ LICENSE 23 Dec 2004 22:06:10 -0000 @@ -86,27 +86,163 @@ the text of RFC 2853: Generic Security Service API Version 2: Java Bindings. That document is covered under the following license notice: -Copyright (C) The Internet Society (2000). All Rights Reserved. + Copyright (C) The Internet Society (2000). All Rights Reserved. + + This document and translations of it may be copied and furnished to + others, and derivative works that comment on or otherwise explain it + or assist in its implementation may be prepared, copied, published and + distributed, in whole or in part, without restriction of any kind, + provided that the above copyright notice and this paragraph are + included on all such copies and derivative works. However, this + document itself may not be modified in any way, such as by removing + the copyright notice or references to the Internet Society or other + Internet organizations, except as needed for the purpose of developing + Internet standards in which case the procedures for copyrights defined + in the Internet Standards process must be followed, or as required to + translate it into languages other than English. + + The limited permissions granted above are perpetual and will not be + revoked by the Internet Society or its successors or assigns. + + This document and the information contained herein is provided on an + "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING + TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT + NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN + WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF + MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. + + +Directory external/w3c_dom +Bindings for the Document Object Model (DOM) as published by the +World Wide Web Consortium. All files are distributed under the following +W3C Software Short Notice: + + Copyright (c) 2004 World Wide Web Consortium, + + (Massachusetts Institute of Technology, European Research Consortium for + Informatics and Mathematics, Keio University). All Rights Reserved. This + work is distributed under the W3C(r) Software License [1] in the hope that + it will be useful, but WITHOUT ANY WARRANTY; without even the implied + warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231 + + Permission to copy, modify, and distribute this software and its + documentation, with or without modification, for any purpose and + without fee or royalty is hereby granted, provided that you include + the following on ALL copies of the software and documentation or + portions thereof, including modifications: + + 1. The full text of this NOTICE in a location viewable to users of + the redistributed or derivative work. + 2. Any pre-existing intellectual property disclaimers, notices, or + terms and conditions. If none exist, the W3C Software Short Notice + should be included (hypertext is preferred, text is permitted) within + the body of any redistributed or derivative code. + 3. Notice of any changes or modifications to the files, including + the date changes were made. (We recommend you provide URIs to the + location from which the code is derived.) + + THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT + HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, + INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS + FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR + DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, + TRADEMARKS OR OTHER RIGHTS. + + COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL + OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR + DOCUMENTATION. + + The name and trademarks of copyright holders may NOT be used in + advertising or publicity pertaining to the software without specific, + written prior permission. Title to copyright in this software and any + associated documentation will at all times remain with copyright + holders. + + +Directory external/sax +Simple API for XML, a standard application interface for processing XML. +All files are distributed with the following short notice: + + NO WARRANTY! This class is in the Public Domain. + +The www.saxproject.org explains: + + Copyright Status + + SAX is free! + + In fact, it's not possible to own a license to SAX, since it's been + placed in the public domain. + + No Warranty + + Because SAX is released to the public domain, there is no warranty + for the design or for the software implementation, to the extent + permitted by applicable law. Except when otherwise stated in writing + the copyright holders and/or other parties provide SAX "as is" without + warranty of any kind, either expressed or implied, including, but not + limited to, the implied warranties of merchantability and fitness for + a particular purpose. The entire risk as to the quality and + performance of SAX is with you. Should SAX prove defective, you assume + the cost of all necessary servicing, repair or correction. + + In no event unless required by applicable law or agreed to in + writing will any copyright holder, or any other party who may modify + and/or redistribute SAX, be liable to you for damages, including any + general, special, incidental or consequential damages arising out of + the use or inability to use SAX (including but not limited to loss of + data or data being rendered inaccurate or losses sustained by you or + third parties or a failure of the SAX to operate with any other + programs), even if such holder or other party has been advised of the + possibility of such damages. + + Copyright Disclaimers + + This page includes statements to that effect by David Megginson, who + would have been able to claim copyright for the original work. + + SAX 1.0 + + Version 1.0 of the Simple API for XML (SAX), created collectively by + the membership of the XML-DEV mailing list, is hereby released into + the public domain. + + No one owns SAX: you may use it freely in both commercial and + non-commercial applications, bundle it with your software + distribution, include it on a CD-ROM, list the source code in a book, + mirror the documentation at your own web site, or use it in any other + way you see fit. + + David Megginson, address@hidden + 1998-05-11 + + SAX 2.0 + + I hereby abandon any property rights to SAX 2.0 (the Simple API for + XML), and release all of the SAX 2.0 source code, compiled code, and + documentation contained in this distribution into the Public + Domain. SAX comes with NO WARRANTY or guarantee of fitness for any + purpose. + + David Megginson, address@hidden + 2000-05-05 + + +Two files in gnu/xml/aelfred2 (SAXDriver.java and XmlParser.java) were +originally derived from code which carried the following notice: + + Copyright (c) 1997, 1998 by Microstar Software Ltd. + + AElfred is free for both commercial and non-commercial use and + redistribution, provided that Microstar's copyright and disclaimer are + retained intact. You are free to modify AElfred for your own use and + to redistribute AElfred with your modifications, provided that the + modifications are clearly documented. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + merchantability or fitness for a particular purpose. Please use it AT + YOUR OWN RISK. -This document and translations of it may be copied and furnished to -others, and derivative works that comment on or otherwise explain it -or assist in its implementation may be prepared, copied, published and -distributed, in whole or in part, without restriction of any kind, -provided that the above copyright notice and this paragraph are -included on all such copies and derivative works. However, this -document itself may not be modified in any way, such as by removing -the copyright notice or references to the Internet Society or other -Internet organizations, except as needed for the purpose of developing -Internet standards in which case the procedures for copyrights defined -in the Internet Standards process must be followed, or as required to -translate it into languages other than English. - -The limited permissions granted above are perpetual and will not be -revoked by the Internet Society or its successors or assigns. - -This document and the information contained herein is provided on an -"AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING -TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT -NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN -WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF -MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Index: Makefile.am =================================================================== RCS file: /cvsroot/classpath/classpath/Makefile.am,v retrieving revision 1.38 diff -u -r1.38 Makefile.am --- Makefile.am 16 Nov 2004 08:13:04 -0000 1.38 +++ Makefile.am 23 Dec 2004 22:06:10 -0000 @@ -1,8 +1,8 @@ ## Input file for automake to generate the Makefile.in used by configure # lib first, to compile .class files before native code, last examples -SUBDIRS = lib doc include native resource scripts $(EXAMPLESDIR) -DIST_SUBDIRS = lib doc include native resource scripts examples +SUBDIRS = lib doc external include native resource scripts $(EXAMPLESDIR) +DIST_SUBDIRS = lib doc external include native resource scripts examples native: lib Index: configure.ac =================================================================== RCS file: /cvsroot/classpath/classpath/configure.ac,v retrieving revision 1.62 diff -u -r1.62 configure.ac --- configure.ac 21 Dec 2004 16:17:07 -0000 1.62 +++ configure.ac 23 Dec 2004 22:06:10 -0000 @@ -360,6 +360,9 @@ AC_CONFIG_FILES([Makefile doc/Makefile doc/api/Makefile +external/Makefile +external/sax/Makefile +external/w3c_dom/Makefile gnu/classpath/Configuration.java include/Makefile native/Makefile Index: lib/.cvsignore =================================================================== RCS file: /cvsroot/classpath/classpath/lib/.cvsignore,v retrieving revision 1.15 diff -u -r1.15 .cvsignore --- lib/.cvsignore 23 Dec 2004 18:43:55 -0000 1.15 +++ lib/.cvsignore 23 Dec 2004 22:07:17 -0000 @@ -11,6 +11,7 @@ classes.locale2 classes.standard classes.standardx +classes.xml glibj.zip deps.sh gen-classlist.sh Index: lib/Makefile.am =================================================================== RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v retrieving revision 1.74 diff -u -r1.74 Makefile.am --- lib/Makefile.am 23 Dec 2004 18:43:56 -0000 1.74 +++ lib/Makefile.am 23 Dec 2004 22:07:17 -0000 @@ -16,7 +16,7 @@ propertydirs := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org -type d ! -name CVS -print) propertyfiles := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org -name \*\.properties -print) -compile_classpath = $(top_srcdir):$(top_srcdir)/vm/reference:.:$(USER_CLASSLIB) +compile_classpath = $(top_srcdir):$(top_srcdir)/vm/reference:$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:.:$(USER_CLASSLIB) # handling source to bytecode compiler programs like gcj, jikes and kjc if FOUND_GCJ @@ -24,6 +24,7 @@ && $(GCJ) -Wno-deprecated --bootclasspath '' --classpath $(compile_classpath) -C -d . @classes.awt \ && $(GCJ) -Wno-deprecated --bootclasspath '' --classpath $(compile_classpath) -C -d . @classes.locale1 \ && $(GCJ) -Wno-deprecated --bootclasspath '' --classpath $(compile_classpath) -C -d . @classes.locale2 \ +&& $(GCJ) -Wno-deprecated --bootclasspath '' --classpath $(compile_classpath) -C -d . @classes.xml \ && $(GCJ) -Wno-deprecated --bootclasspath '' --classpath $(compile_classpath) -C -d . @classes.standardx else if FOUND_JIKES @@ -97,7 +98,7 @@ EXTRA_DIST = standard.omit mkcollections.pl.in CLEANFILES = compile-classes resources classes \ - classes.standard classes.awt classes.standardx \ + classes.standard classes.awt classes.standardx classes.xml \ classes.locale1 classes.locale2 glibj.zip classes.1 \ $(top_builddir)/java/util/LocaleData.java \ $(JAVA_DEPEND) Index: lib/gen-classlist.sh.in =================================================================== RCS file: /cvsroot/classpath/classpath/lib/gen-classlist.sh.in,v retrieving revision 1.18 diff -u -r1.18 gen-classlist.sh.in --- lib/gen-classlist.sh.in 23 Dec 2004 18:43:56 -0000 1.18 +++ lib/gen-classlist.sh.in 23 Dec 2004 22:07:17 -0000 @@ -1,9 +1,9 @@ #! @SH@ # @configure_input@ if test "@top_srcdir@" = "${top_builddir}"; then - @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu @top_srcdir@/org @top_srcdir@/vm/reference -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1 + @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu @top_srcdir@/org @top_srcdir@/vm/reference @top_srcdir@/external/w3c_dom @top_srcdir@/external/sax -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1 else - @fIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu @top_srcdir@/org ${top_builddir}/gnu ${top_builddir}/java @top_srcdir@/vm/reference -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1 + @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu @top_srcdir@/org ${top_builddir}/gnu ${top_builddir}/java @top_srcdir@/vm/reference @top_srcdir@/external/w3c_dom @top_srcdir@/external/sax -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1 fi for filexp in `cat @top_srcdir@/lib/$1.omit` ; do { grep -v ${filexp} < ${top_builddir}/lib/classes.1 > ${top_builddir}/lib/classes.2 ; mv ${top_builddir}/lib/classes.2 ${top_builddir}/lib/classes.1 ; } ; done @@ -30,9 +30,11 @@ # Split in multiple parts for gcj grep -v /javax/ classes | grep -v /awt/ \ | grep -v /beans/ \ - | grep -v /locale/ > classes.standard + | grep -v /locale/ \ + | grep -v /xml/ > classes.standard grep /awt/ classes > classes.awt grep /beans/ classes >> classes.awt grep /locale/ classes | grep _[j-z][a-z].java > classes.locale1 grep /locale/ classes | grep -v _[j-z][a-z].java > classes.locale2 -grep /javax/ classes > classes.standardx +grep /xml/ classes > classes.xml +grep /javax/ classes | grep -v /xml/ > classes.standardx