Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode: [3315] trunk/core/src/classpath/javax/javax/xml/stream
|
From: <ls...@us...> - 2007-06-25 12:03:23
|
Revision: 3315
http://jnode.svn.sourceforge.net/jnode/?rev=3315&view=rev
Author: lsantha
Date: 2007-06-25 05:03:22 -0700 (Mon, 25 Jun 2007)
Log Message:
-----------
Openjdk integration.
Removed Paths:
-------------
trunk/core/src/classpath/javax/javax/xml/stream/EventFilter.java
trunk/core/src/classpath/javax/javax/xml/stream/FactoryConfigurationError.java
trunk/core/src/classpath/javax/javax/xml/stream/Location.java
trunk/core/src/classpath/javax/javax/xml/stream/StreamFilter.java
trunk/core/src/classpath/javax/javax/xml/stream/XMLEventFactory.java
trunk/core/src/classpath/javax/javax/xml/stream/XMLEventReader.java
trunk/core/src/classpath/javax/javax/xml/stream/XMLEventWriter.java
trunk/core/src/classpath/javax/javax/xml/stream/XMLInputFactory.java
trunk/core/src/classpath/javax/javax/xml/stream/XMLOutputFactory.java
trunk/core/src/classpath/javax/javax/xml/stream/XMLReporter.java
trunk/core/src/classpath/javax/javax/xml/stream/XMLResolver.java
trunk/core/src/classpath/javax/javax/xml/stream/XMLStreamConstants.java
trunk/core/src/classpath/javax/javax/xml/stream/XMLStreamException.java
trunk/core/src/classpath/javax/javax/xml/stream/XMLStreamReader.java
trunk/core/src/classpath/javax/javax/xml/stream/XMLStreamWriter.java
trunk/core/src/classpath/javax/javax/xml/stream/events/
trunk/core/src/classpath/javax/javax/xml/stream/util/EventReaderDelegate.java
trunk/core/src/classpath/javax/javax/xml/stream/util/XMLEventAllocator.java
trunk/core/src/classpath/javax/javax/xml/stream/util/XMLEventConsumer.java
Deleted: trunk/core/src/classpath/javax/javax/xml/stream/EventFilter.java
===================================================================
--- trunk/core/src/classpath/javax/javax/xml/stream/EventFilter.java 2007-06-25 11:45:11 UTC (rev 3314)
+++ trunk/core/src/classpath/javax/javax/xml/stream/EventFilter.java 2007-06-25 12:03:22 UTC (rev 3315)
@@ -1,54 +0,0 @@
-/* EventFilter.java --
- Copyright (C) 2005,2006 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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. See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING. If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library. Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module. An independent module is a module which is not derived from
-or based on this library. If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so. If you do not wish to do so, delete this
-exception statement from your version. */
-
-package javax.xml.stream;
-
-import javax.xml.stream.events.XMLEvent;
-
-/**
- * Simple filter interface for XML events.
- */
-public interface EventFilter
-{
-
- /**
- * Indicates whether this filter can accept the specified event.
- */
- boolean accept(XMLEvent event);
-
-}
-
Deleted: trunk/core/src/classpath/javax/javax/xml/stream/FactoryConfigurationError.java
===================================================================
--- trunk/core/src/classpath/javax/javax/xml/stream/FactoryConfigurationError.java 2007-06-25 11:45:11 UTC (rev 3314)
+++ trunk/core/src/classpath/javax/javax/xml/stream/FactoryConfigurationError.java 2007-06-25 12:03:22 UTC (rev 3315)
@@ -1,86 +0,0 @@
-/* FactoryConfigurationError.java --
- Copyright (C) 2005 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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. See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING. If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library. Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module. An independent module is a module which is not derived from
-or based on this library. If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so. If you do not wish to do so, delete this
-exception statement from your version. */
-
-package javax.xml.stream;
-
-/**
- * Error indicating that a factory could not be configured.
- */
-public class FactoryConfigurationError
- extends Error
-{
-
- private final Exception exception;
-
- public FactoryConfigurationError()
- {
- this((String) null, (Exception) null);
- }
-
- public FactoryConfigurationError(Exception e)
- {
- this(e, null);
- }
-
- public FactoryConfigurationError(Exception e, String msg)
- {
- super(msg);
- exception = e;
- }
-
- public FactoryConfigurationError(String msg, Exception e)
- {
- this(e, msg);
- }
-
- public FactoryConfigurationError(String msg)
- {
- this(null, msg);
- }
-
- public Exception getException()
- {
- return exception;
- }
-
- public String getMessage()
- {
- return super.getMessage();
- }
-
-}
-
Deleted: trunk/core/src/classpath/javax/javax/xml/stream/Location.java
===================================================================
--- trunk/core/src/classpath/javax/javax/xml/stream/Location.java 2007-06-25 11:45:11 UTC (rev 3314)
+++ trunk/core/src/classpath/javax/javax/xml/stream/Location.java 2007-06-25 12:03:22 UTC (rev 3315)
@@ -1,76 +0,0 @@
-/* Location.java --
- Copyright (C) 2005 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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. See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING. If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library. Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module. An independent module is a module which is not derived from
-or based on this library. If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so. If you do not wish to do so, delete this
-exception statement from your version. */
-
-package javax.xml.stream;
-
-/**
- * Information about the location of an XML event within the underlying
- * stream.
- */
-public interface Location
-{
-
- /**
- * Returns the line number at which the current event ends,
- * or -1 if this is not available.
- */
- int getLineNumber();
-
- /**
- * Returns the column number at which the current event ends,
- * or -1 if this is not available.
- */
- int getColumnNumber();
-
- /**
- * Returns the offset from the start of the source, in bytes or characters
- * depending on the nature of the source, or -1 if this is not available.
- */
- int getCharacterOffset();
-
- /**
- * Returns the public identifier for this location, if any.
- */
- String getPublicId();
-
- /**
- * Returns the system identifier for the underlying source.
- */
- String getSystemId();
-
-}
-
Deleted: trunk/core/src/classpath/javax/javax/xml/stream/StreamFilter.java
===================================================================
--- trunk/core/src/classpath/javax/javax/xml/stream/StreamFilter.java 2007-06-25 11:45:11 UTC (rev 3314)
+++ trunk/core/src/classpath/javax/javax/xml/stream/StreamFilter.java 2007-06-25 12:03:22 UTC (rev 3315)
@@ -1,53 +0,0 @@
-/* StreamFilter.java --
- Copyright (C) 2005,2006 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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. See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING. If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library. Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module. An independent module is a module which is not derived from
-or based on this library. If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so. If you do not wish to do so, delete this
-exception statement from your version. */
-
-package javax.xml.stream;
-
-/**
- * Simple filter interface for XMLStreamReaders.
- */
-public interface StreamFilter
-{
-
- /**
- * Indicates whether the current state of the specified reader in part of
- * this stream.
- */
- boolean accept(XMLStreamReader reader);
-
-}
-
Deleted: trunk/core/src/classpath/javax/javax/xml/stream/XMLEventFactory.java
===================================================================
--- trunk/core/src/classpath/javax/javax/xml/stream/XMLEventFactory.java 2007-06-25 11:45:11 UTC (rev 3314)
+++ trunk/core/src/classpath/javax/javax/xml/stream/XMLEventFactory.java 2007-06-25 12:03:22 UTC (rev 3315)
@@ -1,343 +0,0 @@
-/* XMLEventFactory.java --
- Copyright (C) 2005,2006 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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. See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING. If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library. Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module. An independent module is a module which is not derived from
-or based on this library. If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so. If you do not wish to do so, delete this
-exception statement from your version. */
-
-package javax.xml.stream;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.util.Iterator;
-import java.util.Properties;
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.namespace.QName;
-import javax.xml.stream.events.Attribute;
-import javax.xml.stream.events.Characters;
-import javax.xml.stream.events.Comment;
-import javax.xml.stream.events.DTD;
-import javax.xml.stream.events.EndDocument;
-import javax.xml.stream.events.EndElement;
-import javax.xml.stream.events.EntityDeclaration;
-import javax.xml.stream.events.EntityReference;
-import javax.xml.stream.events.Namespace;
-import javax.xml.stream.events.ProcessingInstruction;
-import javax.xml.stream.events.StartDocument;
-import javax.xml.stream.events.StartElement;
-
-/**
- * Factory for XML events.
- */
-public abstract class XMLEventFactory
-{
-
- protected XMLEventFactory()
- {
- }
-
- /**
- * Create a new factory instance.
- * @see #newInstance(String,ClassLoader)
- */
- public static XMLEventFactory newInstance()
- throws FactoryConfigurationError
- {
- return newInstance(null, null);
- }
-
- /**
- * Create a new factory instance.
- * The implementation class to load is the first found in the following
- * locations:
- * <ol>
- * <li>the <code>javax.xml.stream.XMLEventFactory</code> system
- * property</li>
- * <li>the above named property value in the
- * <code><i>$JAVA_HOME</i>/lib/stax.properties</code> file</li>
- * <li>the class name specified in the
- * <code>META-INF/services/javax.xml.stream.XMLEventFactory</code>
- * system resource</li>
- * <li>the default factory class</li>
- * </ol>
- */
- static XMLEventFactory newInstance(String factoryId, ClassLoader classLoader)
- throws FactoryConfigurationError
- {
- ClassLoader loader = classLoader;
- if (loader == null)
- {
- loader = Thread.currentThread().getContextClassLoader();
- }
- if (loader == null)
- {
- loader = XMLEventFactory.class.getClassLoader();
- }
- String className = null;
- int count = 0;
- do
- {
- className = getFactoryClassName(loader, count++);
- if (className != null)
- {
- try
- {
- Class t = (loader != null) ? loader.loadClass(className) :
- Class.forName(className);
- return (XMLEventFactory) t.newInstance();
- }
- catch (ClassNotFoundException e)
- {
- className = null;
- }
- catch (Exception e)
- {
- throw new FactoryConfigurationError(e,
- "error instantiating class " + className);
- }
- }
- }
- while (className == null && count < 3);
- return new gnu.xml.stream.XMLEventFactoryImpl();
- }
-
- private static String getFactoryClassName(ClassLoader loader, int attempt)
- {
- final String propertyName = "javax.xml.stream.XMLEventFactory";
- switch (attempt)
- {
- case 0:
- return System.getProperty(propertyName);
- case 1:
- try
- {
- File file = new File(System.getProperty("java.home"));
- file = new File(file, "lib");
- file = new File(file, "stax.properties");
- InputStream in = new FileInputStream(file);
- Properties props = new Properties();
- props.load(in);
- in.close();
- return props.getProperty(propertyName);
- }
- catch (IOException e)
- {
- return null;
- }
- case 2:
- try
- {
- String serviceKey = "/META-INF/services/" + propertyName;
- InputStream in = (loader != null) ?
- loader.getResourceAsStream(serviceKey) :
- XMLEventFactory.class.getResourceAsStream(serviceKey);
- if (in != null)
- {
- BufferedReader r =
- new BufferedReader(new InputStreamReader(in));
- String ret = r.readLine();
- r.close();
- return ret;
- }
- }
- catch (IOException e)
- {
- }
- return null;
- default:
- return null;
- }
- }
-
- /**
- * Sets the location for each event created by this factory.
- */
- public abstract void setLocation(Location location);
-
- /**
- * Create an attribute event.
- */
- public abstract Attribute createAttribute(String prefix, String namespaceURI,
- String localName, String value);
-
- /**
- * Create an attribute event.
- */
- public abstract Attribute createAttribute(String localName, String value);
-
- /**
- * Create an attribute event.
- */
- public abstract Attribute createAttribute(QName name, String value);
-
- /**
- * Create a namespace declaration event.
- */
- public abstract Namespace createNamespace(String namespaceURI);
-
- /**
- * Create a namespace declaration event.
- */
- public abstract Namespace createNamespace(String prefix, String namespaceUri);
-
- /**
- * Create a start-element event.
- */
- public abstract StartElement createStartElement(QName name,
- Iterator attributes,
- Iterator namespaces);
-
- /**
- * Create a start-element event.
- */
- public abstract StartElement createStartElement(String prefix,
- String namespaceUri,
- String localName);
-
- /**
- * Create a start-element event.
- */
- public abstract StartElement createStartElement(String prefix,
- String namespaceUri,
- String localName,
- Iterator attributes,
- Iterator namespaces);
-
- /**
- * Create a start-element event.
- */
- public abstract StartElement createStartElement(String prefix,
- String namespaceUri,
- String localName,
- Iterator attributes,
- Iterator namespaces,
- NamespaceContext context);
-
- /**
- * Create an end-element event.
- */
- public abstract EndElement createEndElement(QName name,
- Iterator namespaces);
-
- /**
- * Create an end-element event.
- */
- public abstract EndElement createEndElement(String prefix,
- String namespaceUri,
- String localName);
-
- /**
- * Create an end-element event.
- */
- public abstract EndElement createEndElement(String prefix,
- String namespaceUri,
- String localName,
- Iterator namespaces);
-
- /**
- * Create a text event.
- */
- public abstract Characters createCharacters(String content);
-
- /**
- * Create a text event of type CDATA section.
- */
- public abstract Characters createCData(String content);
-
- /**
- * Create a text event of type whitespace.
- */
- public abstract Characters createSpace(String content);
-
- /**
- * Create a text event of type ignorable whitespace.
- */
- public abstract Characters createIgnorableSpace(String content);
-
- /**
- * Create a start-document event.
- */
- public abstract StartDocument createStartDocument();
-
- /**
- * Create a start-document event.
- */
- public abstract StartDocument createStartDocument(String encoding,
- String version,
- boolean standalone);
-
- /**
- * Create a start-document event.
- */
- public abstract StartDocument createStartDocument(String encoding,
- String version);
-
- /**
- * Create a start-document event.
- */
- public abstract StartDocument createStartDocument(String encoding);
-
- /**
- * Create an end-document event.
- */
- public abstract EndDocument createEndDocument();
-
- /**
- * Create an entity reference event.
- */
- public abstract EntityReference createEntityReference(String name,
- EntityDeclaration declaration);
-
- /**
- * Create a comment event.
- */
- public abstract Comment createComment(String text);
-
- /**
- * Create a processing instruction event.
- */
- public abstract ProcessingInstruction createProcessingInstruction(String target,
- String data);
-
- /**
- * Create a DOCTYPE declaration event.
- */
- public abstract DTD createDTD(String dtd);
-
-}
-
Deleted: trunk/core/src/classpath/javax/javax/xml/stream/XMLEventReader.java
===================================================================
--- trunk/core/src/classpath/javax/javax/xml/stream/XMLEventReader.java 2007-06-25 11:45:11 UTC (rev 3314)
+++ trunk/core/src/classpath/javax/javax/xml/stream/XMLEventReader.java 2007-06-25 12:03:22 UTC (rev 3315)
@@ -1,102 +0,0 @@
-/* XMLEventReader.java --
- Copyright (C) 2005,2006 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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. See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING. If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library. Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module. An independent module is a module which is not derived from
-or based on this library. If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so. If you do not wish to do so, delete this
-exception statement from your version. */
-
-package javax.xml.stream;
-
-import java.util.Iterator;
-import javax.xml.stream.events.XMLEvent;
-
-/**
- * An XML parser.
- */
-public interface XMLEventReader
- extends Iterator
-{
-
- /**
- * Returns the next XML event.
- */
- XMLEvent nextEvent()
- throws XMLStreamException;
-
- /**
- * Indicates whether there are more XML events to be read.
- */
- boolean hasNext();
-
- /**
- * Looks at the next XML event without advancing the cursor in the stream.
- * Returns <code>null</code> if there are no more events to read.
- */
- XMLEvent peek()
- throws XMLStreamException;
-
- /**
- * Reads the text context of an element.
- * When invoked, the current event must be START_ELEMENT.
- * On completion, the current event will be END_ELEMENT.
- */
- String getElementText()
- throws XMLStreamException;
-
- /**
- * Returns the next element event.
- * This method skips insignificant space until a START_ELEMENT or
- * END_ELEMENT event is found.
- * @exception XMLStreamException if an event that was not an insignificant
- * space event was encountered
- */
- XMLEvent nextTag()
- throws XMLStreamException;
-
- /**
- * Returns the implementation-specific feature or property of the given
- * name.
- * @exception IllegalArgumentException if the property is not supported
- */
- Object getProperty(String name)
- throws IllegalArgumentException;
-
- /**
- * Free any resources associated with this parser.
- * This method will not close the underlying input source.
- */
- void close()
- throws XMLStreamException;
-
-}
-
Deleted: trunk/core/src/classpath/javax/javax/xml/stream/XMLEventWriter.java
===================================================================
--- trunk/core/src/classpath/javax/javax/xml/stream/XMLEventWriter.java 2007-06-25 11:45:11 UTC (rev 3314)
+++ trunk/core/src/classpath/javax/javax/xml/stream/XMLEventWriter.java 2007-06-25 12:03:22 UTC (rev 3315)
@@ -1,109 +0,0 @@
-/* XMLEventWriter.java --
- Copyright (C) 2005,2006 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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. See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING. If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library. Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module. An independent module is a module which is not derived from
-or based on this library. If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so. If you do not wish to do so, delete this
-exception statement from your version. */
-
-package javax.xml.stream;
-
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.stream.events.XMLEvent;
-import javax.xml.stream.util.XMLEventConsumer;
-
-/**
- * Interface for writing XML documents from a series of events.
- */
-public interface XMLEventWriter
- extends XMLEventConsumer
-{
-
- /**
- * Ensures that any cached events are written to the underlying output
- * sink.
- */
- void flush()
- throws XMLStreamException;
-
- /**
- * Frees any resources used by this writer.
- */
- void close()
- throws XMLStreamException;
-
- /**
- * Adds the specified event to this writer.
- */
- void add(XMLEvent event)
- throws XMLStreamException;
-
- /**
- * Adds the specified XML stream to this writer.
- * The implementation will call <code>next</code> on the given argument
- * while <code>hasNext</code> returns true.
- */
- void add(XMLEventReader reader)
- throws XMLStreamException;
-
- /**
- * Returns the namespace prefix the specified URI is currently associated
- * with.
- */
- String getPrefix(String uri)
- throws XMLStreamException;
-
- /**
- * Associates the given namespace prefix and URI.
- */
- void setPrefix(String prefix, String uri)
- throws XMLStreamException;
-
- /**
- * Sets the current default namespace URI.
- */
- void setDefaultNamespace(String uri)
- throws XMLStreamException;
-
- /**
- * Sets the namespace context for managing namespace prefixes and URIs.
- */
- void setNamespaceContext(NamespaceContext context)
- throws XMLStreamException;
-
- /**
- * Returns the namespace context.
- */
- NamespaceContext getNamespaceContext();
-
-}
-
Deleted: trunk/core/src/classpath/javax/javax/xml/stream/XMLInputFactory.java
===================================================================
--- trunk/core/src/classpath/javax/javax/xml/stream/XMLInputFactory.java 2007-06-25 11:45:11 UTC (rev 3314)
+++ trunk/core/src/classpath/javax/javax/xml/stream/XMLInputFactory.java 2007-06-25 12:03:22 UTC (rev 3315)
@@ -1,448 +0,0 @@
-/* XMLInputFactory.java --
- Copyright (C) 2005,2006 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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. See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING. If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library. Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module. An independent module is a module which is not derived from
-or based on this library. If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so. If you do not wish to do so, delete this
-exception statement from your version. */
-
-package javax.xml.stream;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
-import java.util.Properties;
-import javax.xml.stream.util.XMLEventAllocator;
-import javax.xml.transform.Source;
-
-/**
- * Factory for creating stream and event readers from various kinds of input
- * source.
- * <h3>Parameters</h3>
- * <table>
- * <tr>
- * <th>Name</th>
- * <th>Description</th>
- * <th>Type</th>
- * <th>Default</th>
- * <th>Required</th>
- * </tr>
- * <tr>
- * <td>javax.xml.stream.isValidating</td>
- * <td>Controls DTD validation</td>
- * <td>Boolean</td>
- * <td>Boolean.FALSE</td>
- * <td>no</td>
- * </tr>
- * <tr>
- * <td>javax.xml.stream.isNamespaceAware</td>
- * <td>Controls namespace processing for XML 1.0</td>
- * <td>Boolean</td>
- * <td>Boolean.TRUE</td>
- * <td>true is required, false is optional</td>
- * </tr>
- * <tr>
- * <td>javax.xml.stream.isCoalescing</td>
- * <td>Controls coalescing (normalization of adjacent character data)</td>
- * <td>Boolean</td>
- * <td>Boolean.FALSE</td>
- * <td>yes</td>
- * </tr>
- * <tr>
- * <td>javax.xml.stream.isReplacingEntityReferences</td>
- * <td>Controls replacement of entity references with their replacement
- * text</td>
- * <td>Boolean</td>
- * <td>Boolean.TRUE</td>
- * <td>yes</td>
- * </tr>
- * <tr>
- * <td>javax.xml.stream.isSupportingExternalEntities</td>
- * <td>Controls whether to resolve external entities</td>
- * <td>Boolean</td>
- * <td>not specified</td>
- * <td>yes</td>
- * </tr>
- * <tr>
- * <td>javax.xml.stream.supportDTD</td>
- * <td>Controls whether to support DTDs</td>
- * <td>Boolean</td>
- * <td>Boolean.TRUE</td>
- * <td>yes</td>
- * </tr>
- * <tr>
- * <td>javax.xml.stream.reporter</td>
- * <td></td>
- * <td>javax.xml.stream.XMLReporter</td>
- * <td></td>
- * <td>yes</td>
- * </tr>
- * <tr>
- * <td>javax.xml.stream.resolver</td>
- * <td></td>
- * <td>javax.xml.stream.XMLResolver</td>
- * <td></td>
- * <td>yes</td>
- * </tr>
- * <tr>
- * <td>javax.xml.stream.allocator</td>
- * <td></td>
- * <td>javax.xml.stream.util.XMLEventAllocator</td>
- * <td></td>
- * <td>yes</td>
- * </tr>
- * </table>
- */
-public abstract class XMLInputFactory
-{
-
- /**
- * Property used to control namespace support.
- */
- public static final String IS_NAMESPACE_AWARE =
- "javax.xml.stream.isNamespaceAware";
-
- /**
- * Property used to control DTD validation.
- */
- public static final String IS_VALIDATING = "javax.xml.stream.isValidating";
-
- /**
- * Property used to control whether to coalesce adjacent text events.
- */
- public static final String IS_COALESCING = "javax.xml.stream.isCoalescing";
-
- /**
- * Property used to control whether to replace entity references with
- * their replacement text.
- */
- public static final String IS_REPLACING_ENTITY_REFERENCES =
- "javax.xml.stream.isReplacingEntityReferences";
-
- /**
- * Property used to control whether to resolve external entities.
- */
- public static final String IS_SUPPORTING_EXTERNAL_ENTITIES =
- "javax.xml.stream.isSupportingExternalEntities";
-
- /**
- * Property used to indicate whether to support DTDs.
- */
- public static final String SUPPORT_DTD = "javax.xml.stream.supportDTD";
-
- /**
- * Property used to control the error reporter implementation.
- */
- public static final String REPORTER = "javax.xml.stream.reporter";
-
- /**
- * Property used to control the entity resolver implementation.
- */
- public static final String RESOLVER = "javax.xml.stream.resolver";
-
- /**
- * Property used to control the event allocator implementation.
- */
- public static final String ALLOCATOR = "javax.xml.stream.allocator";
-
- protected XMLInputFactory()
- {
- }
-
- /**
- * Creates a new factory instance.
- * @see #newInstance(String,ClassLoader)
- */
- public static XMLInputFactory newInstance()
- throws FactoryConfigurationError
- {
- return newInstance(null, null);
- }
-
- /**
- * Creates a new factory instance.
- * The implementation class to load is the first found in the following
- * locations:
- * <ol>
- * <li>the <code>javax.xml.stream.XMLInputFactory</code> system
- * property</li>
- * <li>the above named property value in the
- * <code><i>$JAVA_HOME</i>/lib/stax.properties</code> file</li>
- * <li>the class name specified in the
- * <code>META-INF/services/javax.xml.stream.XMLInputFactory</code>
- * system resource</li>
- * <li>the default factory class</li>
- * </ol>
- */
- public static XMLInputFactory newInstance(String factoryId,
- ClassLoader classLoader)
- throws FactoryConfigurationError
- {
- ClassLoader loader = classLoader;
- if (loader == null)
- {
- loader = Thread.currentThread().getContextClassLoader();
- }
- if (loader == null)
- {
- loader = XMLInputFactory.class.getClassLoader();
- }
- String className = null;
- int count = 0;
- do
- {
- className = getFactoryClassName(loader, count++);
- if (className != null)
- {
- try
- {
- Class t = (loader != null) ? loader.loadClass(className) :
- Class.forName(className);
- return (XMLInputFactory) t.newInstance();
- }
- catch (ClassNotFoundException e)
- {
- className = null;
- }
- catch (Exception e)
- {
- throw new FactoryConfigurationError(e,
- "error instantiating class " + className);
- }
- }
- }
- while (className == null && count < 3);
- return new gnu.xml.stream.XMLInputFactoryImpl();
- }
-
- private static String getFactoryClassName(ClassLoader loader, int attempt)
- {
- final String propertyName = "javax.xml.stream.XMLInputFactory";
- switch (attempt)
- {
- case 0:
- return System.getProperty(propertyName);
- case 1:
- try
- {
- File file = new File(System.getProperty("java.home"));
- file = new File(file, "lib");
- file = new File(file, "stax.properties");
- InputStream in = new FileInputStream(file);
- Properties props = new Properties();
- props.load(in);
- in.close();
- return props.getProperty(propertyName);
- }
- catch (IOException e)
- {
- return null;
- }
- case 2:
- try
- {
- String serviceKey = "/META-INF/services/" + propertyName;
- InputStream in = (loader != null) ?
- loader.getResourceAsStream(serviceKey) :
- XMLInputFactory.class.getResourceAsStream(serviceKey);
- if (in != null)
- {
- BufferedReader r =
- new BufferedReader(new InputStreamReader(in));
- String ret = r.readLine();
- r.close();
- return ret;
- }
- }
- catch (IOException e)
- {
- }
- return null;
- default:
- return null;
- }
- }
-
- /**
- * Creates a new stream reader.
- */
- public abstract XMLStreamReader createXMLStreamReader(Reader reader)
- throws XMLStreamException;
-
- /**
- * Creates a new stream reader.
- */
- public abstract XMLStreamReader createXMLStreamReader(Source source)
- throws XMLStreamException;
-
- /**
- * Creates a new stream reader.
- */
- public abstract XMLStreamReader createXMLStreamReader(InputStream stream)
- throws XMLStreamException;
-
- /**
- * Creates a new stream reader.
- */
- public abstract XMLStreamReader createXMLStreamReader(InputStream stream,
- String encoding)
- throws XMLStreamException;
-
- /**
- * Creates a new stream reader.
- */
- public abstract XMLStreamReader createXMLStreamReader(String systemId,
- InputStream stream)
- throws XMLStreamException;
-
- /**
- * Creates a new stream reader.
- */
- public abstract XMLStreamReader createXMLStreamReader(String systemId,
- Reader reader)
- throws XMLStreamException;
-
- /**
- * Creates a new event reader.
- */
- public abstract XMLEventReader createXMLEventReader(Reader reader)
- throws XMLStreamException;
-
- /**
- * Creates a new event reader.
- */
- public abstract XMLEventReader createXMLEventReader(String systemId,
- Reader reader)
- throws XMLStreamException;
-
- /**
- * Creates a new event reader.
- */
- public abstract XMLEventReader createXMLEventReader(XMLStreamReader reader)
- throws XMLStreamException;
-
- /**
- * Creates a new event reader.
- */
- public abstract XMLEventReader createXMLEventReader(Source source)
- throws XMLStreamException;
-
- /**
- * Creates a new event reader.
- */
- public abstract XMLEventReader createXMLEventReader(InputStream stream)
- throws XMLStreamException;
-
- /**
- * Creates a new event reader.
- */
- public abstract XMLEventReader createXMLEventReader(InputStream stream,
- String encoding)
- throws XMLStreamException;
-
- /**
- * Creates a new event reader.
- */
- public abstract XMLEventReader createXMLEventReader(String systemId,
- InputStream stream)
- throws XMLStreamException;
-
- /**
- * Create a new filtered reader.
- */
- public abstract XMLStreamReader createFilteredReader(XMLStreamReader reader,
- StreamFilter filter)
- throws XMLStreamException;
-
- /**
- * Create a new filtered reader.
- */
- public abstract XMLEventReader createFilteredReader(XMLEventReader reader,
- EventFilter filter)
- throws XMLStreamException;
-
- /**
- * Returns the entity resolver.
- */
- public abstract XMLResolver getXMLResolver();
-
- /**
- * Sets the entity resolver.
- */
- public abstract void setXMLResolver(XMLResolver resolver);
-
- /**
- * Returns the error reporter.
- */
- public abstract XMLReporter getXMLReporter();
-
- /**
- * Sets the error reporter.
- */
- public abstract void setXMLReporter(XMLReporter reporter);
-
- /**
- * Sets the implementation-specific property of the given name.
- * @exception IllegalArgumentException if the property is not supported
- */
- public abstract void setProperty(String name, Object value)
- throws IllegalArgumentException;
-
- /**
- * Returns the implementation-specific property of the given name.
- * @exception IllegalArgumentException if the property is not supported
- */
- public abstract Object getProperty(String name)
- throws IllegalArgumentException;
-
- /**
- * Indicates whether the specified property is supported.
- */
- public abstract boolean isPropertySupported(String name);
-
- /**
- * Sets the event allocator.
- */
- public abstract void setEventAllocator(XMLEventAllocator allocator);
-
- /**
- * Returns the event allocator.
- */
- public abstract XMLEventAllocator getEventAllocator();
-
-}
-
Deleted: trunk/core/src/classpath/javax/javax/xml/stream/XMLOutputFactory.java
===================================================================
--- trunk/core/src/classpath/javax/javax/xml/stream/XMLOutputFactory.java 2007-06-25 11:45:11 UTC (rev 3314)
+++ trunk/core/src/classpath/javax/javax/xml/stream/XMLOutputFactory.java 2007-06-25 12:03:22 UTC (rev 3315)
@@ -1,272 +0,0 @@
-/* XMLOutputFactory.java --
- Copyright (C) 2005,2006 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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. See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING. If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library. Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module. An independent module is a module which is not derived from
-or based on this library. If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so. If you do not wish to do so, delete this
-exception statement from your version. */
-
-package javax.xml.stream;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.Writer;
-import java.util.Properties;
-import javax.xml.transform.Result;
-
-/**
- * Factory for obtaining XML stream and event writers for various kinds of
- * output sink.
- * <h3>Configuration</h3>
- * <table>
- * <tr>
- * <th>Name</th>
- * <th>Description</th>
- * <th>Type</th>
- * <th>Default</th>
- * <th>Required</th>
- * </tr>
- * <tr>
- * <td>javax.xml.stream.isRepairingNamespaces</td>
- * <td>default namespace prefixes</td>
- * <td>Boolean</td>
- * <td>Boolean.FALSE</td>
- * <td>yes</td>
- * </tr>
- * </table>
- */
-public abstract class XMLOutputFactory
-{
-
- /**
- * Property used to control whether to default namespace prefixes.
- * If true, the writer will create a namespace declaration for any
- * attribute that doesn't have a namespace declaration in scope.
- */
- public static final java.lang.String IS_REPAIRING_NAMESPACES =
- "javax.xml.stream.isRepairingNamespaces";
-
- protected XMLOutputFactory()
- {
- }
-
- /**
- * Creates a new <b>output</b> factory.
- * The implementation class to load is the first found in the following
- * locations:
- * <ol>
- * <li>the <code>javax.xml.stream.XMLOutputFactory</code> system
- * property</li>
- * <li>the above named property value in the
- * <code><i>$JAVA_HOME</i>/lib/stax.properties</code> file</li>
- * <li>the class name specified in the
- * <code>META-INF/services/javax.xml.stream.XMLOutputFactory</code>
- * system resource</li>
- * <li>the default factory class</li>
- * </ol>
- */
- public static XMLOutputFactory newInstance()
- throws FactoryConfigurationError
- {
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- if (loader == null)
- {
- loader = XMLOutputFactory.class.getClassLoader();
- }
- String className = null;
- int count = 0;
- do
- {
- className = getFactoryClassName(loader, count++);
- if (className != null)
- {
- try
- {
- Class t = (loader != null) ? loader.loadClass(className) :
- Class.forName(className);
- return (XMLOutputFactory) t.newInstance();
- }
- catch (ClassNotFoundException e)
- {
- className = null;
- }
- catch (Exception e)
- {
- throw new FactoryConfigurationError(e,
- "error instantiating class " + className);
- }
- }
- }
- while (className == null && count < 3);
- return new gnu.xml.stream.XMLOutputFactoryImpl();
- }
-
- private static String getFactoryClassName(ClassLoader loader, int attempt)
- {
- final String propertyName = "javax.xml.stream.XMLOutputFactory";
- switch (attempt)
- {
- case 0:
- return System.getProperty(propertyName);
- case 1:
- try
- {
- File file = new File(System.getProperty("java.home"));
- file = new File(file, "lib");
- file = new File(file, "stax.properties");
- InputStream in = new FileInputStream(file);
- Properties props = new Properties();
- props.load(in);
- in.close();
- return props.getProperty(propertyName);
- }
- catch (IOException e)
- {
- return null;
- }
- case 2:
- try
- {
- String serviceKey = "/META-INF/services/" + propertyName;
- InputStream in = (loader != null) ?
- loader.getResourceAsStream(serviceKey) :
- XMLOutputFactory.class.getResourceAsStream(serviceKey);
- if (in != null)
- {
- BufferedReader r =
- new BufferedReader(new InputStreamReader(in));
- String ret = r.readLine();
- r.close();
- return ret;
- }
- }
- catch (IOException e)
- {
- }
- return null;
- default:
- return null;
- }
- }
-
- /**
- * Creates a new <b>input</b> factory.
- * This appears to be an API design bug.
- * @see javax.xml.stream.XMLInputFactory.newInstance(String,ClassLoader)
- */
- public static XMLInputFactory newInstance(String factoryId,
- ClassLoader classLoader)
- throws FactoryConfigurationError
- {
- return XMLInputFactory.newInstance(factoryId, classLoader);
- }
-
- /**
- * Creates a new stream writer.
- */
- public abstract XMLStreamWriter createXMLStreamWriter(Writer stream)
- throws XMLStreamException;
-
- /**
- * Creates a new stream writer.
- */
- public abstract XMLStreamWriter createXMLStreamWriter(OutputStream stream)
- throws XMLStreamException;
-
- /**
- * Creates a new stream writer.
- */
- public abstract XMLStreamWriter createXMLStreamWriter(OutputStream stream,
- String encoding)
- throws XMLStreamException;
-
- /**
- * Creates a new stream writer.
- * @exception UnsupportedOperationException if this method is not
- * supported
- */
- public abstract XMLStreamWriter createXMLStreamWriter(Result result)
- throws XMLStreamException;
-
- /**
- * Creates a new event writer.
- * @exception UnsupportedOperationException if this method is not
- * supported
- */
- public abstract XMLEventWriter createXMLEventWriter(Result result)
- throws XMLStreamException;
-
- /**
- * Creates a new event writer.
- */
- public abstract XMLEventWriter createXMLEventWriter(OutputStream stream)
- throws XMLStreamException;
-
- /**
- * Creates a new event writer.
- */
- public abstract XMLEventWriter createXMLEventWriter(OutputStream stream,
- String encoding)
- throws XMLStreamException;
-
- /**
- * Creates a new event writer.
- */
- public abstract XMLEventWriter createXMLEventWriter(Writer stream)
- throws XMLStreamException;
-
- /**
- * Sets the implementation-specific property of the given name.
- * @exception IllegalArgumentException if the property is not supported
- */
- public abstract void setProperty(String name, Object value)
- throws IllegalArgumentException;
-
- /**
- * Returns the implementation-specific property of the given name.
- * @exception IllegalArgumentException if the property is not supported
- */
- public abstract Object getProperty(String name)
- throws IllegalArgumentException;
-
- /**
- * Indicates whether the specified property is supported.
- */
- public abstract boolean isPropertySupported(String name);
-
-}
-
Deleted: trunk/core/src/classpath/javax/javax/xml/stream/XMLReporter.java
===================================================================
--- trunk/core/src/classpath/javax/javax/xml/stream/XMLReporter.java 2007-06-25 11:45:11 UTC (rev 3314)
+++ trunk/core/src/classpath/javax/javax/xml/stream/XMLReporter.java 2007-06-25 12:03:22 UTC (rev 3315)
@@ -1,58 +0,0 @@
-/* XMLReporter.java --
- Copyright (C) 2005,2006 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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. See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING. If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library. Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module. An independent module is a module which is not derived from
-or based on this library. If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so. If you do not wish to do so, delete this
-exception statement from your version. */
-
-package javax.xml.stream;
-
-/**
- * Interface used to report non-fatal errors during parsing.
- */
-public interface XMLReporter
-{
-
- /**
- * Reports an error.
- * @param message the error message
- * @param errorType an implementation-specific error type
- * @param relatedInformation additional information, if any
- * @param location the error location, if available
- */
- void report(String message, String errorType,
- Object relatedInformation, Location location)
- throws XMLStreamException;
-
-}
-
Deleted: trunk/core/src/classpath/javax/javax/xml/stream/XMLResolver.java
===================================================================
--- trunk/core/src/classpath/javax/javax/xml/stream/XMLResolver.java 2007-06-25 11:45:11 UTC (rev 3314)
+++ trunk/core/src/classpath/javax/javax/xml/stream/XMLResolver.java 2007-06-25 12:03:22 UTC (rev 3315)
@@ -1,66 +0,0 @@
-/* XMLResolver.java --
- Copyright (C) 2005,2006 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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. See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING. If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library. Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module. An independent module is a module which is not derived from
-or based on this library. If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so. If you do not wish to do so, delete this
-exception statement from your version. */
-
-package javax.xml.stream;
-
-/**
- * Interface used to resolve XML external entities during parsing.
- */
-public interface XMLResolver
-{
-
- /**
- * Returns an input source from which the specified external entity can be
- * read. The following return types are possible:
- * <ol>
- * <li><code>java.io.InputStream</code></li>
- * <li><code>javax.xml.stream.XMLStreamReader</code></li>
- * <li><code>java.xml.stream.XMLEventReader</code></li>
- * </ol>
- * If <code>null</code> is returned, the processor will attempt to resolve
- * the entity itself.
- * @param publicID the public ID of the external entity
- * @param systemID the system ID of the external entity
- * @param baseURI the absolute base URI of the referring entity
- * @param namespace the namespace of the external entity
- */
- Object resolveEntity(String publicID, String systemID,
- String baseURI, String namespace)
- throws XMLStreamException;
-
-}
-
Deleted: trunk/core...
[truncated message content] |