[kaffe] CVS kaffe (robilad): resynced with gnu classpath

Kaffe CVS cvs-commits at kaffe.org
Wed Mar 8 13:36:43 PST 2006


PatchSet 7144 
Date: 2006/03/08 21:21:20
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath

2006-03-08  Dalibor Topic  <robilad at kaffe.org>

        * test/regression/Reflect.java: Updated for java.lang.System
        changes.

        * Resynchronized GNU Classpath. Reapplied patch for
        URLClassLoader pending review.

Members: 
	ChangeLog:1.4662->1.4663 
	libraries/javalib/external/classpath/ChangeLog:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/AttributeList.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/Attributes.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ContentHandler.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/DTDHandler.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/DocumentHandler.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/EntityResolver.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ErrorHandler.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/HandlerBase.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/InputSource.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/Locator.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/Parser.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXException.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotRecognizedException.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotSupportedException.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXParseException.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLFilter.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLReader.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/package.html:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2Impl.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DeclHandler.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DefaultHandler2.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/EntityResolver2.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/LexicalHandler.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2Impl.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/package.html:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributeListImpl.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributesImpl.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/DefaultHandler.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/LocatorImpl.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NamespaceSupport.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NewInstance.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserAdapter.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserFactory.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLFilterImpl.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java:1.21->1.22 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/package.html:1.21->1.22 
	libraries/javalib/external/classpath/gnu/classpath/SystemProperties.java:1.2->1.3 
	libraries/javalib/external/classpath/gnu/java/rmi/server/UnicastRef.java:1.3->1.4 
	libraries/javalib/external/classpath/gnu/java/rmi/server/UnicastServer.java:1.3->1.4 
	libraries/javalib/external/classpath/gnu/java/security/key/dss/DSSKey.java:1.3->1.4 
	libraries/javalib/external/classpath/java/awt/DefaultFocusTraversalPolicy.java:1.1->1.2 
	libraries/javalib/external/classpath/java/awt/GridBagLayout.java:1.3->1.4 
	libraries/javalib/external/classpath/java/awt/datatransfer/FlavorEvent.java:1.1->1.2 
	libraries/javalib/external/classpath/java/awt/dnd/DropTargetEvent.java:1.1->1.2 
	libraries/javalib/external/classpath/java/awt/image/ColorModel.java:1.1->1.2 
	libraries/javalib/external/classpath/java/lang/Math.java:1.2->1.3 
	libraries/javalib/external/classpath/java/lang/StrictMath.java:1.1->1.2 
	libraries/javalib/external/classpath/java/lang/System.java:1.2->1.3 
	libraries/javalib/external/classpath/java/net/InetSocketAddress.java:1.1->1.2 
	libraries/javalib/external/classpath/java/rmi/server/UID.java:1.1->1.2 
	libraries/javalib/external/classpath/java/util/jar/Manifest.java:1.1->1.2 
	libraries/javalib/external/classpath/javax/swing/ProgressMonitor.java:1.1->1.2 
	libraries/javalib/external/classpath/javax/swing/ProgressMonitorInputStream.java:1.1->1.2 
	libraries/javalib/external/classpath/javax/swing/tree/DefaultMutableTreeNode.java:1.2->1.3 
	libraries/javalib/external/classpath/javax/swing/tree/TreeNode.java:1.1->1.2 
	libraries/javalib/external/classpath/resource/gnu/regexp/MessagesBundle_it.properties:1.21->1.22 
	libraries/javalib/external/classpath/scripts/classpath.spec.in:1.21->1.22 
	test/regression/Reflect.java:1.14->1.15 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4662 kaffe/ChangeLog:1.4663
--- kaffe/ChangeLog:1.4662	Wed Mar  8 21:07:46 2006
+++ kaffe/ChangeLog	Wed Mar  8 21:21:20 2006
@@ -15,6 +15,14 @@
 
 2006-03-08  Dalibor Topic  <robilad at kaffe.org>
 
+	* test/regression/Reflect.java: Updated for java.lang.System
+	changes.
+
+	* Resynchronized GNU Classpath. Reapplied patch for
+	URLClassLoader pending review.
+
+2006-03-08  Dalibor Topic  <robilad at kaffe.org>
+
 	* Resynchronized GNU Classpath 0.90. Reapplied patch for
 	URLClassLoader pending review.
 
Index: kaffe/libraries/javalib/external/classpath/ChangeLog
diff -u kaffe/libraries/javalib/external/classpath/ChangeLog:1.21 kaffe/libraries/javalib/external/classpath/ChangeLog:1.22
--- kaffe/libraries/javalib/external/classpath/ChangeLog:1.21	Wed Mar  8 01:42:47 2006
+++ kaffe/libraries/javalib/external/classpath/ChangeLog	Wed Mar  8 21:21:26 2006
@@ -1,3 +1,120 @@
+2006-03-08  Lillian Angel  <langel at redhat.com>
+
+	* java/awt/GridBagLayout.java
+	(GetLayoutInfo): If the last component added had gridwidth == REMAINDER,
+	then the next item should be set to current_y (not 0).
+
+2006-03-08  Lillian Angel  <langel at redhat.com>
+
+	* java/awt/GridBagLayout.java
+	(GetLayoutInfo): If gridy is RELATIVE and there is no component
+	in the bottom-most spot of the column, we need to place that component
+	at the y-location of the other components in that row. If there are
+	no other components in that row, then place it at y = 0.
+
+2006-03-08  David Gilbert  <david.gilbert at object-refinery.com>
+
+	* javax/swing/ProgressMonitor.java: Updated API docs,
+	* javax/swing/ProgressMonitorInputStream.java: Likewise.
+
+2006-03-08  Michael Koch  <konqueror at gmx.de>
+
+	* java/net/InetSocketAddress.java
+	(InetSocketAddress(String,int,resolve)): New private contructor.
+	(InetSocketAddress(String,int)): Use new private constructor.
+	(createUnresolved): New method.
+
+2006-03-07  Audrius Meskauskas  <AudriusA at Bioinformatics.org>
+
+	* java/rmi/server/UID.java (constructor): Assign last and time fields
+ 	after pause.
+
+2006-03-07  Tom Tromey  <tromey at redhat.com>
+
+	* java/lang/System.java (clearProperty): New method, merged from
+	generics branch.
+	(getProperty): Removed 'else'.
+	(getProperty): Check for empty key.
+	(setProperty): Likewise.
+	* gnu/classpath/SystemProperties.java (remove): New method, merged
+	from generics branch.
+
+2006-03-07  Audrius Meskauskas  <AudriusA at Bioinformatics.org>
+
+	* java/rmi/server/UID.java: New file (replacing). 
+
+2006-03-08  Raif S. Naffah  <raif at swiftdsl.com.au>
+
+	* java/util/jar/Manifest.java: Removed unused imports.
+	(CRLF): New constant.
+	(read): Added method documentation.
+	Use UTF-8 encoding instead of 8859_1.
+	(write): Added method documentation.
+	Use BufferedOutputStream (w/ 4K buffer) instead of PrintWriter.
+	(write_main_section): Replace PrintWriter arg with OutputStream.
+	Replace JarException with IOException.
+	(write_version_info): Likewise.
+	(write_main_attributes): Likewise.
+	(write_attribute_entry): Likewise.
+	(write_individual_sections): Likewise.
+	(write_entry_attributes): Likewise.
+	(write_header): Replace PrintWriter arg with OutputStream.
+	Re-implemented.
+
+2006-03-07  David Gilbert  <david.gilbert at object-refinery.com>
+
+	* javax/swing/tree/DefaultMutableTreeNode.java
+	(getFirstChild): Updated API docs,
+	(getLastChild): Likewise,
+	(getChildAfter): Likewise,
+	(getChildBefore): Likewise,
+	(isNodeSibling): Return true if node == this,
+	(getSiblingCount): Updated API docs,
+	(getNextSibling): Likewise,
+	(getPreviousSibling): Likewise,
+	(isLeaf): Likewise,
+	(getFirstLeaf): Likewise,
+	(getLastLeaf): Likewise,
+	(getNextLeaf): Implemented,
+	(getPreviousLeaf): Implemented.
+
+2006-03-07  Tom Tromey  <tromey at redhat.com>
+
+	* java/awt/image/ColorModel.java (getComponents): Javadoc fix.
+	* java/awt/datatransfer/FlavorEvent.java: Added missing @since.
+	* java/awt/dnd/DropTargetEvent.java (serialVersionUID): New field.
+	* java/awt/DefaultFocusTraversalPolicy.java (serialVersionUID): New
+	field.
+
+2006-03-07  David Gilbert  <david.gilbert at object-refinery.com>
+
+	* javax/swing/tree/DefaultMutableTreeNode.java: API docs all over plus
+	(clone): Reimplemented,
+	(add): Throw IllegalArgumentException if child is an ancestor,
+	(remove(int)): Set child's parent to null,
+	(remove(MutableTreeNode)): Check arguments and set child's parent to 
+	null,
+	(insert): Check allowsChildren flag, check for null argument, and
+	check for a node that is an ancestor,
+	(getIndex): Throw IllegalArgumentException for null argument,
+	(setAllowsChildren): If setting to false, remove existing children,
+	(removeAllChildren): Set parent to null for removed children.
+
+2006-03-07  David Gilbert  <david.gilbert at object-refinery.com>
+
+	* javax/swing/tree/TreeNode.java: Reformatted and added API docs all
+	over.
+
+2006-03-06  Tom Tromey  <tromey at redhat.com>
+
+	* java/lang/StrictMath.java (ulp): New methods.
+	* java/lang/Math.java (ulp): New methods.
+
+2006-03-07  Audrius Meskauskas  <AudriusA at Bioinformatics.org>
+
+	* gnu/java/rmi/server/UnicastRef.java,
+	gnu/java/rmi/server/UnicastServer.java: Formatted.
+
 2006-03-07  Audrius Meskauskas  <AudriusA at Bioinformatics.org>
 
 	* gnu/java/rmi/server/CombinedClassLoader.java (findClass,
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/AttributeList.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/AttributeList.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/AttributeList.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/AttributeList.java:1.21	Wed Mar  8 01:42:56 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/AttributeList.java	Wed Mar  8 21:21:27 2006
@@ -1,7 +1,7 @@
 // SAX Attribute List Interface.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: AttributeList.java,v 1.21 2006/03/08 01:42:56 robilad Exp $
+// $Id: AttributeList.java,v 1.22 2006/03/08 21:21:27 robilad Exp $
 
 package org.xml.sax;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/Attributes.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/Attributes.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/Attributes.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/Attributes.java:1.21	Wed Mar  8 01:42:56 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/Attributes.java	Wed Mar  8 21:21:27 2006
@@ -2,7 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the public domain.
-// $Id: Attributes.java,v 1.21 2006/03/08 01:42:56 robilad Exp $
+// $Id: Attributes.java,v 1.22 2006/03/08 21:21:27 robilad Exp $
 
 package org.xml.sax;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ContentHandler.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ContentHandler.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ContentHandler.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ContentHandler.java:1.21	Wed Mar  8 01:42:56 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ContentHandler.java	Wed Mar  8 21:21:27 2006
@@ -2,7 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the public domain.
-// $Id: ContentHandler.java,v 1.21 2006/03/08 01:42:56 robilad Exp $
+// $Id: ContentHandler.java,v 1.22 2006/03/08 21:21:27 robilad Exp $
 
 package org.xml.sax;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/DTDHandler.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/DTDHandler.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/DTDHandler.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/DTDHandler.java:1.21	Wed Mar  8 01:42:56 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/DTDHandler.java	Wed Mar  8 21:21:27 2006
@@ -1,7 +1,7 @@
 // SAX DTD handler.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: DTDHandler.java,v 1.21 2006/03/08 01:42:56 robilad Exp $
+// $Id: DTDHandler.java,v 1.22 2006/03/08 21:21:27 robilad Exp $
 
 package org.xml.sax;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/DocumentHandler.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/DocumentHandler.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/DocumentHandler.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/DocumentHandler.java:1.21	Wed Mar  8 01:42:56 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/DocumentHandler.java	Wed Mar  8 21:21:28 2006
@@ -1,7 +1,7 @@
 // SAX document handler.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: DocumentHandler.java,v 1.21 2006/03/08 01:42:56 robilad Exp $
+// $Id: DocumentHandler.java,v 1.22 2006/03/08 21:21:28 robilad Exp $
 
 package org.xml.sax;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/EntityResolver.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/EntityResolver.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/EntityResolver.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/EntityResolver.java:1.21	Wed Mar  8 01:42:56 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/EntityResolver.java	Wed Mar  8 21:21:28 2006
@@ -1,7 +1,7 @@
 // SAX entity resolver.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: EntityResolver.java,v 1.21 2006/03/08 01:42:56 robilad Exp $
+// $Id: EntityResolver.java,v 1.22 2006/03/08 21:21:28 robilad Exp $
 
 package org.xml.sax;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ErrorHandler.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ErrorHandler.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ErrorHandler.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ErrorHandler.java:1.21	Wed Mar  8 01:42:56 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ErrorHandler.java	Wed Mar  8 21:21:28 2006
@@ -1,7 +1,7 @@
 // SAX error handler.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: ErrorHandler.java,v 1.21 2006/03/08 01:42:56 robilad Exp $
+// $Id: ErrorHandler.java,v 1.22 2006/03/08 21:21:28 robilad Exp $
 
 package org.xml.sax;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/HandlerBase.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/HandlerBase.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/HandlerBase.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/HandlerBase.java:1.21	Wed Mar  8 01:42:56 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/HandlerBase.java	Wed Mar  8 21:21:28 2006
@@ -1,7 +1,7 @@
 // SAX default handler base class.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: HandlerBase.java,v 1.21 2006/03/08 01:42:56 robilad Exp $
+// $Id: HandlerBase.java,v 1.22 2006/03/08 21:21:28 robilad Exp $
 
 package org.xml.sax;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/InputSource.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/InputSource.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/InputSource.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/InputSource.java:1.21	Wed Mar  8 01:42:56 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/InputSource.java	Wed Mar  8 21:21:28 2006
@@ -1,7 +1,7 @@
 // SAX input source.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: InputSource.java,v 1.21 2006/03/08 01:42:56 robilad Exp $
+// $Id: InputSource.java,v 1.22 2006/03/08 21:21:28 robilad Exp $
 
 package org.xml.sax;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/Locator.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/Locator.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/Locator.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/Locator.java:1.21	Wed Mar  8 01:42:56 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/Locator.java	Wed Mar  8 21:21:28 2006
@@ -1,7 +1,7 @@
 // SAX locator interface for document events.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: Locator.java,v 1.21 2006/03/08 01:42:56 robilad Exp $
+// $Id: Locator.java,v 1.22 2006/03/08 21:21:28 robilad Exp $
 
 package org.xml.sax;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/Parser.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/Parser.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/Parser.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/Parser.java:1.21	Wed Mar  8 01:42:57 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/Parser.java	Wed Mar  8 21:21:28 2006
@@ -1,7 +1,7 @@
 // SAX parser interface.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: Parser.java,v 1.21 2006/03/08 01:42:57 robilad Exp $
+// $Id: Parser.java,v 1.22 2006/03/08 21:21:28 robilad Exp $
 
 package org.xml.sax;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXException.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXException.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXException.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXException.java:1.21	Wed Mar  8 01:42:57 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXException.java	Wed Mar  8 21:21:28 2006
@@ -1,7 +1,7 @@
 // SAX exception class.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: SAXException.java,v 1.21 2006/03/08 01:42:57 robilad Exp $
+// $Id: SAXException.java,v 1.22 2006/03/08 21:21:28 robilad Exp $
 
 package org.xml.sax;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotRecognizedException.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotRecognizedException.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotRecognizedException.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotRecognizedException.java:1.21	Wed Mar  8 01:42:57 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotRecognizedException.java	Wed Mar  8 21:21:28 2006
@@ -2,7 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the Public Domain.
-// $Id: SAXNotRecognizedException.java,v 1.21 2006/03/08 01:42:57 robilad Exp $
+// $Id: SAXNotRecognizedException.java,v 1.22 2006/03/08 21:21:28 robilad Exp $
 
 package org.xml.sax;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotSupportedException.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotSupportedException.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotSupportedException.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotSupportedException.java:1.21	Wed Mar  8 01:42:57 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotSupportedException.java	Wed Mar  8 21:21:28 2006
@@ -2,7 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the Public Domain.
-// $Id: SAXNotSupportedException.java,v 1.21 2006/03/08 01:42:57 robilad Exp $
+// $Id: SAXNotSupportedException.java,v 1.22 2006/03/08 21:21:28 robilad Exp $
 
 package org.xml.sax;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXParseException.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXParseException.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXParseException.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXParseException.java:1.21	Wed Mar  8 01:42:57 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXParseException.java	Wed Mar  8 21:21:28 2006
@@ -1,7 +1,7 @@
 // SAX exception class.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: SAXParseException.java,v 1.21 2006/03/08 01:42:57 robilad Exp $
+// $Id: SAXParseException.java,v 1.22 2006/03/08 21:21:28 robilad Exp $
 
 package org.xml.sax;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLFilter.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLFilter.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLFilter.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLFilter.java:1.21	Wed Mar  8 01:42:57 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLFilter.java	Wed Mar  8 21:21:28 2006
@@ -2,7 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the Public Domain.
-// $Id: XMLFilter.java,v 1.21 2006/03/08 01:42:57 robilad Exp $
+// $Id: XMLFilter.java,v 1.22 2006/03/08 21:21:28 robilad Exp $
 
 package org.xml.sax;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLReader.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLReader.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLReader.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLReader.java:1.21	Wed Mar  8 01:42:57 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLReader.java	Wed Mar  8 21:21:28 2006
@@ -2,7 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the Public Domain.
-// $Id: XMLReader.java,v 1.21 2006/03/08 01:42:57 robilad Exp $
+// $Id: XMLReader.java,v 1.22 2006/03/08 21:21:28 robilad Exp $
 
 package org.xml.sax;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/package.html
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/package.html:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/package.html:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/package.html:1.21	Wed Mar  8 01:42:57 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/package.html	Wed Mar  8 21:21:28 2006
@@ -1,5 +1,5 @@
 <html><head>
-<!-- $Id: package.html,v 1.21 2006/03/08 01:42:57 robilad Exp $ -->
+<!-- $Id: package.html,v 1.22 2006/03/08 21:21:28 robilad Exp $ -->
 </head><body>
 
 <p> This package provides the core SAX APIs.
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2.java:1.21	Wed Mar  8 01:42:57 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2.java	Wed Mar  8 21:21:30 2006
@@ -1,7 +1,7 @@
 // Attributes2.java - extended Attributes
 // http://www.saxproject.org
 // Public Domain: no warranty.
-// $Id: Attributes2.java,v 1.21 2006/03/08 01:42:57 robilad Exp $
+// $Id: Attributes2.java,v 1.22 2006/03/08 21:21:30 robilad Exp $
 
 package org.xml.sax.ext;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2Impl.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2Impl.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2Impl.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2Impl.java:1.21	Wed Mar  8 01:42:57 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2Impl.java	Wed Mar  8 21:21:30 2006
@@ -1,7 +1,7 @@
 // Attributes2Impl.java - extended AttributesImpl
 // http://www.saxproject.org
 // Public Domain: no warranty.
-// $Id: Attributes2Impl.java,v 1.21 2006/03/08 01:42:57 robilad Exp $
+// $Id: Attributes2Impl.java,v 1.22 2006/03/08 21:21:30 robilad Exp $
 
 package org.xml.sax.ext;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DeclHandler.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DeclHandler.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DeclHandler.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DeclHandler.java:1.21	Wed Mar  8 01:42:57 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DeclHandler.java	Wed Mar  8 21:21:30 2006
@@ -1,7 +1,7 @@
 // DeclHandler.java - Optional handler for DTD declaration events.
 // http://www.saxproject.org
 // Public Domain: no warranty.
-// $Id: DeclHandler.java,v 1.21 2006/03/08 01:42:57 robilad Exp $
+// $Id: DeclHandler.java,v 1.22 2006/03/08 21:21:30 robilad Exp $
 
 package org.xml.sax.ext;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DefaultHandler2.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DefaultHandler2.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DefaultHandler2.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DefaultHandler2.java:1.21	Wed Mar  8 01:42:58 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DefaultHandler2.java	Wed Mar  8 21:21:30 2006
@@ -1,7 +1,7 @@
 // DefaultHandler2.java - extended DefaultHandler
 // http://www.saxproject.org
 // Public Domain: no warranty.
-// $Id: DefaultHandler2.java,v 1.21 2006/03/08 01:42:58 robilad Exp $
+// $Id: DefaultHandler2.java,v 1.22 2006/03/08 21:21:30 robilad Exp $
 
 package org.xml.sax.ext;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/EntityResolver2.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/EntityResolver2.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/EntityResolver2.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/EntityResolver2.java:1.21	Wed Mar  8 01:42:58 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/EntityResolver2.java	Wed Mar  8 21:21:30 2006
@@ -1,7 +1,7 @@
 // EntityResolver2.java - Extended SAX entity resolver.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: EntityResolver2.java,v 1.21 2006/03/08 01:42:58 robilad Exp $
+// $Id: EntityResolver2.java,v 1.22 2006/03/08 21:21:30 robilad Exp $
 
 package org.xml.sax.ext;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/LexicalHandler.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/LexicalHandler.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/LexicalHandler.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/LexicalHandler.java:1.21	Wed Mar  8 01:42:58 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/LexicalHandler.java	Wed Mar  8 21:21:30 2006
@@ -1,7 +1,7 @@
 // LexicalHandler.java - optional handler for lexical parse events.
 // http://www.saxproject.org
 // Public Domain: no warranty.
-// $Id: LexicalHandler.java,v 1.21 2006/03/08 01:42:58 robilad Exp $
+// $Id: LexicalHandler.java,v 1.22 2006/03/08 21:21:30 robilad Exp $
 
 package org.xml.sax.ext;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2.java:1.21	Wed Mar  8 01:42:58 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2.java	Wed Mar  8 21:21:30 2006
@@ -1,7 +1,7 @@
 // Locator2.java - extended Locator
 // http://www.saxproject.org
 // Public Domain: no warranty.
-// $Id: Locator2.java,v 1.21 2006/03/08 01:42:58 robilad Exp $
+// $Id: Locator2.java,v 1.22 2006/03/08 21:21:30 robilad Exp $
 
 package org.xml.sax.ext;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2Impl.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2Impl.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2Impl.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2Impl.java:1.21	Wed Mar  8 01:42:58 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2Impl.java	Wed Mar  8 21:21:30 2006
@@ -1,7 +1,7 @@
 // Locator2Impl.java - extended LocatorImpl
 // http://www.saxproject.org
 // Public Domain: no warranty.
-// $Id: Locator2Impl.java,v 1.21 2006/03/08 01:42:58 robilad Exp $
+// $Id: Locator2Impl.java,v 1.22 2006/03/08 21:21:30 robilad Exp $
 
 package org.xml.sax.ext;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/package.html
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/package.html:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/package.html:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/package.html:1.21	Wed Mar  8 01:42:58 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/package.html	Wed Mar  8 21:21:30 2006
@@ -1,5 +1,5 @@
 <HTML><HEAD>
-<!-- $Id: package.html,v 1.21 2006/03/08 01:42:58 robilad Exp $ -->
+<!-- $Id: package.html,v 1.22 2006/03/08 21:21:30 robilad Exp $ -->
 </HEAD><BODY>
 
 <p>
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributeListImpl.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributeListImpl.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributeListImpl.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributeListImpl.java:1.21	Wed Mar  8 01:42:58 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributeListImpl.java	Wed Mar  8 21:21:31 2006
@@ -1,7 +1,7 @@
 // SAX default implementation for AttributeList.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: AttributeListImpl.java,v 1.21 2006/03/08 01:42:58 robilad Exp $
+// $Id: AttributeListImpl.java,v 1.22 2006/03/08 21:21:31 robilad Exp $
 
 package org.xml.sax.helpers;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributesImpl.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributesImpl.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributesImpl.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributesImpl.java:1.21	Wed Mar  8 01:42:58 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributesImpl.java	Wed Mar  8 21:21:31 2006
@@ -2,7 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the public domain.
-// $Id: AttributesImpl.java,v 1.21 2006/03/08 01:42:58 robilad Exp $
+// $Id: AttributesImpl.java,v 1.22 2006/03/08 21:21:31 robilad Exp $
 
 package org.xml.sax.helpers;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/DefaultHandler.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/DefaultHandler.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/DefaultHandler.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/DefaultHandler.java:1.21	Wed Mar  8 01:42:58 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/DefaultHandler.java	Wed Mar  8 21:21:31 2006
@@ -2,7 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the public domain.
-// $Id: DefaultHandler.java,v 1.21 2006/03/08 01:42:58 robilad Exp $
+// $Id: DefaultHandler.java,v 1.22 2006/03/08 21:21:31 robilad Exp $
 
 package org.xml.sax.helpers;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/LocatorImpl.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/LocatorImpl.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/LocatorImpl.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/LocatorImpl.java:1.21	Wed Mar  8 01:42:59 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/LocatorImpl.java	Wed Mar  8 21:21:31 2006
@@ -1,7 +1,7 @@
 // SAX default implementation for Locator.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: LocatorImpl.java,v 1.21 2006/03/08 01:42:59 robilad Exp $
+// $Id: LocatorImpl.java,v 1.22 2006/03/08 21:21:31 robilad Exp $
 
 package org.xml.sax.helpers;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NamespaceSupport.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NamespaceSupport.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NamespaceSupport.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NamespaceSupport.java:1.21	Wed Mar  8 01:42:59 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NamespaceSupport.java	Wed Mar  8 21:21:31 2006
@@ -2,7 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // This class is in the Public Domain.  NO WARRANTY!
-// $Id: NamespaceSupport.java,v 1.21 2006/03/08 01:42:59 robilad Exp $
+// $Id: NamespaceSupport.java,v 1.22 2006/03/08 21:21:31 robilad Exp $
 
 package org.xml.sax.helpers;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NewInstance.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NewInstance.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NewInstance.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NewInstance.java:1.21	Wed Mar  8 01:42:59 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NewInstance.java	Wed Mar  8 21:21:31 2006
@@ -3,7 +3,7 @@
 // Written by Edwin Goei, edwingo at apache.org
 // and by David Brownell, dbrownell at users.sourceforge.net
 // NO WARRANTY!  This class is in the Public Domain.
-// $Id: NewInstance.java,v 1.21 2006/03/08 01:42:59 robilad Exp $
+// $Id: NewInstance.java,v 1.22 2006/03/08 21:21:31 robilad Exp $
 
 package org.xml.sax.helpers;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserAdapter.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserAdapter.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserAdapter.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserAdapter.java:1.21	Wed Mar  8 01:42:59 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserAdapter.java	Wed Mar  8 21:21:31 2006
@@ -2,7 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the public domain.
-// $Id: ParserAdapter.java,v 1.21 2006/03/08 01:42:59 robilad Exp $
+// $Id: ParserAdapter.java,v 1.22 2006/03/08 21:21:31 robilad Exp $
 
 package org.xml.sax.helpers;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserFactory.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserFactory.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserFactory.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserFactory.java:1.21	Wed Mar  8 01:42:59 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserFactory.java	Wed Mar  8 21:21:31 2006
@@ -1,7 +1,7 @@
 // SAX parser factory.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: ParserFactory.java,v 1.21 2006/03/08 01:42:59 robilad Exp $
+// $Id: ParserFactory.java,v 1.22 2006/03/08 21:21:31 robilad Exp $
 
 package org.xml.sax.helpers;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLFilterImpl.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLFilterImpl.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLFilterImpl.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLFilterImpl.java:1.21	Wed Mar  8 01:42:59 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLFilterImpl.java	Wed Mar  8 21:21:31 2006
@@ -2,7 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the Public Domain.
-// $Id: XMLFilterImpl.java,v 1.21 2006/03/08 01:42:59 robilad Exp $
+// $Id: XMLFilterImpl.java,v 1.22 2006/03/08 21:21:31 robilad Exp $
 
 package org.xml.sax.helpers;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java:1.21	Wed Mar  8 01:42:59 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java	Wed Mar  8 21:21:31 2006
@@ -2,7 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the public domain.
-// $Id: XMLReaderAdapter.java,v 1.21 2006/03/08 01:42:59 robilad Exp $
+// $Id: XMLReaderAdapter.java,v 1.22 2006/03/08 21:21:31 robilad Exp $
 
 package org.xml.sax.helpers;
 
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java:1.21	Wed Mar  8 01:42:59 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java	Wed Mar  8 21:21:32 2006
@@ -3,7 +3,7 @@
 // Written by David Megginson
 // and by David Brownell
 // NO WARRANTY!  This class is in the Public Domain.
-// $Id: XMLReaderFactory.java,v 1.21 2006/03/08 01:42:59 robilad Exp $
+// $Id: XMLReaderFactory.java,v 1.22 2006/03/08 21:21:32 robilad Exp $
 
 package org.xml.sax.helpers;
 import java.io.BufferedReader;
Index: kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/package.html
diff -u kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/package.html:1.21 kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/package.html:1.22
--- kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/package.html:1.21	Wed Mar  8 01:42:59 2006
+++ kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/package.html	Wed Mar  8 21:21:32 2006
@@ -1,5 +1,5 @@
 <HTML><HEAD>
-<!-- $Id: package.html,v 1.21 2006/03/08 01:42:59 robilad Exp $ -->
+<!-- $Id: package.html,v 1.22 2006/03/08 21:21:32 robilad Exp $ -->
 </HEAD><BODY>
 
 <p>This package contains "helper" classes, including
Index: kaffe/libraries/javalib/external/classpath/gnu/classpath/SystemProperties.java
diff -u kaffe/libraries/javalib/external/classpath/gnu/classpath/SystemProperties.java:1.2 kaffe/libraries/javalib/external/classpath/gnu/classpath/SystemProperties.java:1.3
--- kaffe/libraries/javalib/external/classpath/gnu/classpath/SystemProperties.java:1.2	Sat Nov 26 20:29:53 2005
+++ kaffe/libraries/javalib/external/classpath/gnu/classpath/SystemProperties.java	Wed Mar  8 21:21:32 2006
@@ -149,4 +149,17 @@
 
     SystemProperties.properties = properties;
   }
+
+  /**
+   * Removes the supplied system property and its current value.
+   * If the specified property does not exist, nothing happens.
+   * 
+   * @throws NullPointerException if the property name is null.
+   * @return the value of the removed property, or null if no
+   *         such property exists.
+   */
+  public static String remove(String name)
+  {
+    return (String) properties.remove(name);
+  }
 }
Index: kaffe/libraries/javalib/external/classpath/gnu/java/rmi/server/UnicastRef.java
diff -u kaffe/libraries/javalib/external/classpath/gnu/java/rmi/server/UnicastRef.java:1.3 kaffe/libraries/javalib/external/classpath/gnu/java/rmi/server/UnicastRef.java:1.4
--- kaffe/libraries/javalib/external/classpath/gnu/java/rmi/server/UnicastRef.java:1.3	Wed Mar  8 01:43:01 2006
+++ kaffe/libraries/javalib/external/classpath/gnu/java/rmi/server/UnicastRef.java	Wed Mar  8 21:21:33 2006
@@ -1,5 +1,5 @@
 /* UnicastRef.java --
-   Copyright (c) 1996, 1997, 1998, 1999, 2002, 2005
+   Copyright (c) 1996, 1997, 1998, 1999, 2002, 2005, 2006
    Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,6 +36,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package gnu.java.rmi.server;
 
 import gnu.java.rmi.dgc.LeaseRenewingTask;
@@ -62,77 +63,95 @@
 import java.rmi.server.UID;
 
 public class UnicastRef
-	implements RemoteRef, ProtocolConstants {
+    implements RemoteRef, ProtocolConstants
+{
+
+  /**
+   * Use serial version UID for iteroperability
+   */
+  private static final long serialVersionUID = 1;
+
+  public ObjID objid;
 
-      /**
-       * Use serial version UID for iteroperability
-       */
-private static final long serialVersionUID = 1;      
-
-public ObjID objid;
-UnicastConnectionManager manager;
-
-/**
- * Used by serialization, and let subclass capable of having default constructor
- */
-// must be public otherwise java.rmi.RemoteObject cannot instantiate this class
-// -- iP
-public UnicastRef() {
-}
+  UnicastConnectionManager manager;
 
-public UnicastRef(ObjID objid, String host, int port, RMIClientSocketFactory csf) {
+  /**
+   * Used by serialization, and let subclass capable of having default
+   * constructor
+   */
+  // must be public otherwise java.rmi.RemoteObject cannot instantiate this
+  // class
+  // -- iP
+  public UnicastRef()
+  {
+  }
+
+  public UnicastRef(ObjID objid, String host, int port,
+                    RMIClientSocketFactory csf)
+  {
     this(objid);
-	manager = UnicastConnectionManager.getInstance(host, port, csf);
-}
+    manager = UnicastConnectionManager.getInstance(host, port, csf);
+  }
 
-public UnicastRef(ObjID objid) {
-	this.objid = objid;
-}
+  public UnicastRef(ObjID objid)
+  {
+    this.objid = objid;
+  }
 
-public Object invoke(Remote obj, Method method, Object[] params, long opnum) throws Exception {
-    // Check if client and server are in the same VM, then local call can be used to
+  public Object invoke(Remote obj, Method method, Object[] params, long opnum)
+      throws Exception
+  {
+    // Check if client and server are in the same VM, then local call can be
+    // used to
     // replace remote call, but it's somewhat violating remote semantic.
     Object svrobj = manager.serverobj;
-    
-    // Make sure that the server object is compatible. It could be loaded from a different
+
+    // Make sure that the server object is compatible. It could be loaded from a
+    // different
     // classloader --iP
-    if(svrobj != null && method.getDeclaringClass().isInstance(svrobj)){
-        //local call
-		Object ret = null;
-		try{
-		    ret = method.invoke(svrobj, params);
-		}catch(InvocationTargetException e){
-		    throw (Exception)e.getTargetException();
-		}
-		//System.out.println("\n\n ***** local call: " + method + "\nreturn: " + ret + "\n\n");
-		return ret;
-	}
-	//System.out.println("***************** remote call:" + manager.serverPort);
-	return (invokeCommon(obj, method, params, -1, opnum));
-}
-
-/**
- * The ordinary number of the DGC messages.
- */
-static long dgcSequence;
-
-/**
- * The DGC object id, also serves as a synchronization target to increment
- * the dgcSequence safely.
- */
-static final ObjID dgcId = new ObjID(ObjID.DGC_ID);
-
-ObjID []this_id;
-
-/**
- * The number of the method "dirty" in the DGC.
- */
-static int DIRTY = 1;
-
-/**
- * The DGC interface hash code.
- */
-static final long dgcInterfaceHash = -669196253586618813L;
+    if (svrobj != null && method.getDeclaringClass().isInstance(svrobj))
+      {
+        // local call
+        Object ret = null;
+        try
+          {
+            ret = method.invoke(svrobj, params);
+          }
+        catch (InvocationTargetException e)
+          {
+            throw (Exception) e.getTargetException();
+          }
+        // System.out.println("\n\n ***** local call: " + method + "\nreturn: "
+        // + ret + "\n\n");
+        return ret;
+      }
+    // System.out.println("***************** remote call:" +
+    // manager.serverPort);
+    return (invokeCommon(obj, method, params, - 1, opnum));
+  }
+
+  /**
+   * The ordinary number of the DGC messages.
+   */
+  static long dgcSequence;
+
+  /**
+   * The DGC object id, also serves as a synchronization target to increment the
+   * dgcSequence safely.
+   */
+  static final ObjID dgcId = new ObjID(ObjID.DGC_ID);
+
+  ObjID[] this_id;
+
+  /**
+   * The number of the method "dirty" in the DGC.
+   */
+  static int DIRTY = 1;
+
+  /**
+   * The DGC interface hash code.
+   */
+  static final long dgcInterfaceHash = - 669196253586618813L;
 
   /**
    * Notify the DGC of the remote side that we still hold this object.
@@ -233,191 +252,235 @@
     return (Lease) returnval;
   }
 
-private Object invokeCommon(Remote obj, Method method, Object[] params, int opnum, long hash) throws Exception {
-	UnicastConnection conn;
-	try {
-		conn = manager.getConnection();
-	}
-	catch (IOException e1) {
-		throw new RemoteException("connection failed to host: " + manager.serverName, e1);
-	}
-
-	ObjectOutputStream out;
-	DataOutputStream dout;
-	try {
-		dout = conn.getDataOutputStream();
-		dout.writeByte(MESSAGE_CALL);
-
-		out = conn.startObjectOutputStream(); // (re)start ObjectOutputStream
-		
-		objid.write(out);
-		out.writeInt(opnum);
-		out.writeLong(hash);
-		
-		// must handle primitive class and their wrapper classes
-		Class clss[] = method.getParameterTypes();
-	    for(int i = 0; i < clss.length; i++)
-	        ((RMIObjectOutputStream)out).writeValue(params[i], clss[i]);
-
-		out.flush();
-	}
-	catch (IOException e2) {
-		throw new RemoteException("call failed: ", e2);
-	}
-
-	int returncode;
-	Object returnval;
-	DataInputStream din;
-	ObjectInputStream in;
-	UID ack;
-	try {
-		din = conn.getDataInputStream();
-		
-		if ((returncode = din.readUnsignedByte()) != MESSAGE_CALL_ACK) {
-		    conn.disconnect();
-			throw new RemoteException("Call not acked:" + returncode);
-		}
-
-		in = conn.startObjectInputStream(); // (re)start ObjectInputStream
-		returncode = in.readUnsignedByte();
-		ack = UID.read(in);
+  private Object invokeCommon(Remote obj, Method method, Object[] params,
+                              int opnum, long hash) throws Exception
+  {
+    UnicastConnection conn;
+    try
+      {
+        conn = manager.getConnection();
+      }
+    catch (IOException e1)
+      {
+        throw new RemoteException("connection failed to host: "
+                                  + manager.serverName, e1);
+      }
+
+    ObjectOutputStream out;
+    DataOutputStream dout;
+    try
+      {
+        dout = conn.getDataOutputStream();
+        dout.writeByte(MESSAGE_CALL);
+
+        out = conn.startObjectOutputStream(); // (re)start ObjectOutputStream

*** Patch too long, truncated ***




More information about the kaffe mailing list