geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hogst...@apache.org
Subject svn commit: r516148 - in /geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml: ./ namespace/ stream/ stream/events/ stream/util/
Date Thu, 08 Mar 2007 19:04:49 GMT
Author: hogstrom
Date: Thu Mar  8 11:04:47 2007
New Revision: 516148

URL: http://svn.apache.org/viewvc?view=rev&rev=516148
Log:
Additional changes to method signatures, reformaating and other items related to the initial building of this project

Added:
    geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/XMLInputFactory.java   (with props)
    geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/XMLOutputFactory.java   (with props)
    geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/NotationDeclaration.java
      - copied, changed from r515948, geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/NotationDecleration.java
Removed:
    geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/NotationDecleration.java
Modified:
    geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/XMLConstants.java
    geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/namespace/NamespaceContext.java
    geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/EventFilter.java
    geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/FactoryConfigurationError.java
    geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/Location.java
    geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/StreamFilter.java
    geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/XMLEventFactory.java
    geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/XMLEventReader.java
    geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/XMLEventWriter.java
    geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/Attribute.java
    geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/Characters.java
    geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/Comment.java
    geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/DTD.java
    geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/EndDocument.java
    geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/EndElement.java
    geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/EntityDeclaration.java
    geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/EntityReference.java
    geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/Namespace.java
    geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/ProcessingInstruction.java
    geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/StartDocument.java
    geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/StartElement.java
    geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/XMLEvent.java
    geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/util/EventReaderDelegate.java
    geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/util/StreamReaderDelegate.java
    geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/util/XMLEventAllocator.java

Modified: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/XMLConstants.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/XMLConstants.java?view=diff&rev=516148&r1=516147&r2=516148
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/XMLConstants.java (original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/XMLConstants.java Thu Mar  8 11:04:47 2007
@@ -21,8 +21,12 @@
 
 public class XMLConstants {
 	public static final java.lang.String DEFAULT_NS_PREFIX = "";
+
 	public static final java.lang.String XML_NS_PREFIX = "xml";
+
 	public static final java.lang.String XML_NS_URI = "http://www.w3.org/XML/1998/namespace";
+
 	public static final java.lang.String XMLNS_ATTRIBUTE = "xmlns";
+
 	public static final java.lang.String XMLNS_ATTRIBUTE_NS_URI = "http://www.w3.org/2000/xmlns/";
 }

Modified: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/namespace/NamespaceContext.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/namespace/NamespaceContext.java?view=diff&rev=516148&r1=516147&r2=516148
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/namespace/NamespaceContext.java (original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/namespace/NamespaceContext.java Thu Mar  8 11:04:47 2007
@@ -16,13 +16,15 @@
  ** KIND, either express or implied.  See the License for the
  ** specific language governing permissions and limitations
  ** under the License.
-*/
+ */
 package javax.xml.namespace;
 
 import java.util.Iterator;
 
 public interface NamespaceContext {
-    public String getNamespaceURI(String prefix);
-    public String getPrefix(String namespaceURI);
-    public Iterator getPrefixes(String namespaceURI); 
+	public String getNamespaceURI(String prefix);
+
+	public String getPrefix(String namespaceURI);
+
+	public Iterator getPrefixes(String namespaceURI);
 }

Modified: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/EventFilter.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/EventFilter.java?view=diff&rev=516148&r1=516147&r2=516148
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/EventFilter.java (original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/EventFilter.java Thu Mar  8 11:04:47 2007
@@ -16,9 +16,11 @@
  ** KIND, either express or implied.  See the License for the
  ** specific language governing permissions and limitations
  ** under the License.
-*/
+ */
 package javax.xml.stream;
 
+import javax.xml.stream.events.XMLEvent;
+
 public interface EventFilter {
-    boolean accept(XMLEvent event);
+	public boolean accept(XMLEvent event);
 }

Modified: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/FactoryConfigurationError.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/FactoryConfigurationError.java?view=diff&rev=516148&r1=516147&r2=516148
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/FactoryConfigurationError.java (original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/FactoryConfigurationError.java Thu Mar  8 11:04:47 2007
@@ -16,48 +16,49 @@
  ** KIND, either express or implied.  See the License for the
  ** specific language governing permissions and limitations
  ** under the License.
-*/
+ */
 package javax.xml.stream;
 
-public class FactoryConfigurationError extends Error {
-Exception nestedException;
+import java.io.Serializable;
 
-    public FactoryConfigurationError() {
-    }
-    
-    public FactoryConfigurationError(Exception e) {
-        nestedException = e;
-    }
-
-    public FactoryConfigurationError(Exception e, String msg) {
-        super(msg);
-        nestedException = e;
-    }
-    
-    public FactoryConfigurationError(java.lang.String msg) {
-        super(msg);
-    }
-
-    public FactoryConfigurationError(String msg, Exception e) {
-        super(msg);
-        nestedException = e;
-    }
-
-    public Exception getException() {
-        return nestedException;
-    }
-    
-    public String getMessage() {
-        String msg = super.getMessage();
-        if(msg != null)
-            return msg;
-            
-        if(nestedException != null)
-        {
-            msg = nestedException.getMessage();
-            if(msg == null)
-                msg = nestedException.getClass().toString();
-        }
-        return msg;
-     }
+public class FactoryConfigurationError extends Error implements Serializable {
+	Exception nested;
+
+	public FactoryConfigurationError() {
+	}
+
+	public FactoryConfigurationError(Exception e) {
+		nested = e;
+	}
+
+	public FactoryConfigurationError(Exception e, String msg) {
+		super(msg);
+		nested = e;
+	}
+
+	public FactoryConfigurationError(java.lang.String msg) {
+		super(msg);
+	}
+
+	public FactoryConfigurationError(String msg, Exception e) {
+		super(msg);
+		nested = e;
+	}
+
+	public Exception getException() {
+		return nested;
+	}
+
+	public String getMessage() {
+		String msg = super.getMessage();
+		if (msg != null)
+			return msg;
+
+		if (nested != null) {
+			msg = nested.getMessage();
+			if (msg == null)
+				msg = nested.getClass().toString();
+		}
+		return msg;
+	}
 }

Modified: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/Location.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/Location.java?view=diff&rev=516148&r1=516147&r2=516148
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/Location.java (original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/Location.java Thu Mar  8 11:04:47 2007
@@ -16,13 +16,17 @@
  ** KIND, either express or implied.  See the License for the
  ** specific language governing permissions and limitations
  ** under the License.
-*/
+ */
 package javax.xml.stream;
 
 public interface Location {
-    public int getCharacterOffset();
-    public int getColumnNumber();
-    public int getLineNumber();
-    public String getPublicId();
-    public String getSystemId();
+	public int getCharacterOffset();
+
+	public int getColumnNumber();
+
+	public int getLineNumber();
+
+	public String getPublicId();
+
+	public String getSystemId();
 }

Modified: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/StreamFilter.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/StreamFilter.java?view=diff&rev=516148&r1=516147&r2=516148
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/StreamFilter.java (original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/StreamFilter.java Thu Mar  8 11:04:47 2007
@@ -16,9 +16,9 @@
  ** KIND, either express or implied.  See the License for the
  ** specific language governing permissions and limitations
  ** under the License.
-*/
+ */
 package javax.xml.stream;
 
 public interface StreamFilter {
-    public boolean accept(XMLStreamReader reader);
+	public boolean accept(XMLStreamReader reader);
 }

Modified: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/XMLEventFactory.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/XMLEventFactory.java?view=diff&rev=516148&r1=516147&r2=516148
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/XMLEventFactory.java (original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/XMLEventFactory.java Thu Mar  8 11:04:47 2007
@@ -43,16 +43,18 @@
 
 	public static XMLEventFactory newInstance()
 			throws FactoryConfigurationError {
-		// TODO Need to provide some default facvtory mechanism. 
+		// TODO Need to provide some default facvtory mechanism.
 		return null;
 	}
 
 	public static XMLEventFactory newInstance(String factoryId,
 			ClassLoader classLoader) throws FactoryConfigurationError {
-		// TODO Need to provide some default facvtory mechanism. 
+		// TODO Need to provide some default facvtory mechanism.
 		return null;
 	}
 
+	public abstract void setLocation(Location location);
+
 	public abstract Attribute createAttribute(QName name, String value);
 
 	public abstract Attribute createAttribute(String localName, String value);
@@ -60,39 +62,40 @@
 	public abstract Attribute createAttribute(String prefix,
 			String namespaceURI, String localName, String value);
 
-	public abstract Characters createCData(String content);
-
-	public abstract Characters createCharacters(String content);
+	public abstract Namespace createNamespace(String namespaceUri);
 
-	public abstract Comment createComment(String text);
+	public abstract Namespace createNamespace(String prefix, String namespaceUri);
 
-	public abstract DTD createDTD(String dtd);
+	public abstract StartElement createStartElement(QName name,
+			Iterator attributes, Iterator namespaces);
 
-	public abstract EndDocument createEndDocument();
+	public abstract StartElement createStartElement(String prefix,
+			String namespaceUri, String localName);
 
-	public abstract EndElement createEndElement(QName name,
+	public abstract StartElement createStartElement(String prefix,
+			String namespaceUri, String localName, Iterator attributes,
 			Iterator namespaces);
 
+	public abstract StartElement createStartElement(String prefix,
+			String namespaceUri, String localName, Iterator attributes,
+			Iterator namespaces, NamespaceContext context);
+
+	public abstract EndElement createEndElement(QName name, Iterator namespaces);
+
 	public abstract EndElement createEndElement(String prefix,
 			String namespaceUri, String localName);
 
 	public abstract EndElement createEndElement(String prefix,
 			String namespaceUri, String localName, Iterator namespaces);
 
-	public abstract EntityReference createEntityReference(String name,
-			EntityDeclaration declaration);
-
-	public abstract Characters createIgnorableSpace(String content);
-
-	public abstract Namespace createNamespace(String namespaceURI);
-
-	public abstract Namespace createNamespace(String prefix, String namespaceUri);
+	public abstract Characters createCharacters(String content);
 
-	public abstract ProcessingInstruction createProcessingInstruction(
-			String target, String data);
+	public abstract Characters createCData(String content);
 
 	public abstract Characters createSpace(String content);
 
+	public abstract Characters createIgnorableSpace(String content);
+
 	public abstract StartDocument createStartDocument();
 
 	public abstract StartDocument createStartDocument(String encoding);
@@ -103,20 +106,15 @@
 	public abstract StartDocument createStartDocument(String encoding,
 			String version, boolean standalone);
 
-	public abstract StartElement createStartElement(QName name,
-			Iterator attributes, Iterator namespaces);
+	public abstract EndDocument createEndDocument();
 
-	public abstract StartElement createStartElement(String prefix,
-			String namespaceUri, String localName);
+	public abstract EntityReference createEntityReference(String name,
+			EntityDeclaration declaration);
 
-	public abstract StartElement createStartElement(String prefix,
-			String namespaceUri, String localName,
-			Iterator attributes, Iterator namespaces);
+	public abstract Comment createComment(String text);
 
-	public abstract StartElement createStartElement(String prefix,
-			String namespaceUri, String localName,
-			Iterator attributes, Iterator namespaces,
-			NamespaceContext context);
+	public abstract ProcessingInstruction createProcessingInstruction(
+			String target, String data);
 
-	public abstract void setLocation(Location location);
+	public abstract DTD createDTD(String dtd);
 }

Modified: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/XMLEventReader.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/XMLEventReader.java?view=diff&rev=516148&r1=516147&r2=516148
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/XMLEventReader.java (original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/XMLEventReader.java Thu Mar  8 11:04:47 2007
@@ -19,9 +19,11 @@
  */
 package javax.xml.stream;
 
+import java.util.Iterator;
+
 import javax.xml.stream.events.XMLEvent;
 
-public interface XMLEventReader extends java.util.Iterator {
+public interface XMLEventReader extends Iterator {
 	public void close() throws XMLStreamException;
 
 	public String getElementText() throws XMLStreamException;

Modified: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/XMLEventWriter.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/XMLEventWriter.java?view=diff&rev=516148&r1=516147&r2=516148
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/XMLEventWriter.java (original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/XMLEventWriter.java Thu Mar  8 11:04:47 2007
@@ -34,14 +34,12 @@
 
 	public NamespaceContext getNamespaceContext();
 
-	public String getPrefix(java.lang.String uri) throws XMLStreamException;
+	public String getPrefix(String uri) throws XMLStreamException;
 
-	public void setDefaultNamespace(java.lang.String uri)
-			throws XMLStreamException;
+	public void setDefaultNamespace(String uri) throws XMLStreamException;
 
 	public void setNamespaceContext(NamespaceContext context)
 			throws XMLStreamException;
 
-	public void setPrefix(java.lang.String prefix, java.lang.String uri)
-			throws XMLStreamException;
+	public void setPrefix(String prefix, String uri) throws XMLStreamException;
 }

Added: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/XMLInputFactory.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/XMLInputFactory.java?view=auto&rev=516148
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/XMLInputFactory.java (added)
+++ geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/XMLInputFactory.java Thu Mar  8 11:04:47 2007
@@ -0,0 +1,129 @@
+/*
+ **
+ ** Licensed to the Apache Software Foundation (ASF) under one
+ ** or more contributor license agreements.  See the NOTICE file
+ ** distributed with this work for additional information
+ ** regarding copyright ownership.  The ASF licenses this file
+ ** to you under the Apache License, Version 2.0 (the
+ ** "License"); you may not use this file except in compliance
+ ** with the License.  You may obtain a copy of the License at
+ **
+ **  http://www.apache.org/licenses/LICENSE-2.0
+ **
+ ** Unless required by applicable law or agreed to in writing,
+ ** software distributed under the License is distributed on an
+ ** "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ** KIND, either express or implied.  See the License for the
+ ** specific language governing permissions and limitations
+ ** under the License.
+ */
+package javax.xml.stream;
+
+import javax.xml.stream.util.XMLEventAllocator;
+
+public abstract class XMLInputFactory {
+	public static final java.lang.String ALLOCATOR = "javax.xml.stream.allocator";
+
+	public static final java.lang.String IS_COALESCING = "javax.xml.stream.isCoalescing";
+
+	public static final java.lang.String IS_NAMESPACE_AWARE = "javax.xml.stream.isNamespaceAware";
+
+	public static final java.lang.String IS_REPLACING_ENTITY_REFERENCES = "javax.xml.stream.isReplacingEntityReferences";
+
+	public static final java.lang.String IS_SUPPORTING_EXTERNAL_ENTITIES = "javax.xml.stream.isSupportingExternalEntities";
+
+	public static final java.lang.String IS_VALIDATING = "javax.xml.stream.isValidating";
+
+	public static final java.lang.String REPORTER = "javax.xml.stream.reporter";
+
+	public static final java.lang.String RESOLVER = "javax.xml.stream.resolver";
+
+	public static final java.lang.String SUPPORT_DTD = "javax.xml.stream.supportDTD";
+
+	protected XMLInputFactory() {
+	}
+
+	public static XMLInputFactory newInstance()
+			throws FactoryConfigurationError {
+		// TODO - Implement Factory Finder methods
+		return null;
+	}
+
+	public static XMLInputFactory newInstance(java.lang.String factoryId,
+			java.lang.ClassLoader classLoader) throws FactoryConfigurationError {
+		// TODO - Implement Factory Finder methods
+		return null;
+	}
+
+	public abstract XMLStreamReader createXMLStreamReader(java.io.Reader reader)
+			throws XMLStreamException;
+
+	public abstract XMLStreamReader createXMLStreamReader(
+			javax.xml.transform.Source source) throws XMLStreamException;
+
+	public abstract XMLStreamReader createXMLStreamReader(
+			java.io.InputStream stream) throws XMLStreamException;
+
+	public abstract XMLStreamReader createXMLStreamReader(
+			java.io.InputStream stream, java.lang.String encoding)
+			throws XMLStreamException;
+
+	public abstract XMLStreamReader createXMLStreamReader(
+			java.lang.String systemId, java.io.InputStream stream)
+			throws XMLStreamException;
+
+	public abstract XMLStreamReader createXMLStreamReader(
+			java.lang.String systemId, java.io.Reader reader)
+			throws XMLStreamException;
+
+	public abstract XMLEventReader createXMLEventReader(java.io.Reader reader)
+			throws XMLStreamException;
+
+	public abstract XMLEventReader createXMLEventReader(
+			java.lang.String systemId, java.io.Reader reader)
+			throws XMLStreamException;
+
+	public abstract XMLEventReader createXMLEventReader(XMLStreamReader reader)
+			throws XMLStreamException;
+
+	public abstract XMLEventReader createXMLEventReader(
+			javax.xml.transform.Source source) throws XMLStreamException;
+
+	public abstract XMLEventReader createXMLEventReader(
+			java.io.InputStream stream) throws XMLStreamException;
+
+	public abstract XMLEventReader createXMLEventReader(
+			java.io.InputStream stream, java.lang.String encoding)
+			throws XMLStreamException;
+
+	public abstract XMLEventReader createXMLEventReader(
+			java.lang.String systemId, java.io.InputStream stream)
+			throws XMLStreamException;
+
+	public abstract XMLStreamReader createFilteredReader(
+			XMLStreamReader reader, StreamFilter filter)
+			throws XMLStreamException;
+
+	public abstract XMLEventReader createFilteredReader(XMLEventReader reader,
+			EventFilter filter) throws XMLStreamException;
+
+	public abstract XMLResolver getXMLResolver();
+
+	public abstract void setXMLResolver(XMLResolver resolver);
+
+	public abstract XMLReporter getXMLReporter();
+
+	public abstract void setXMLReporter(XMLReporter reporter);
+
+	public abstract void setProperty(java.lang.String name,
+			java.lang.Object value) throws java.lang.IllegalArgumentException;
+
+	public abstract java.lang.Object getProperty(java.lang.String name)
+			throws java.lang.IllegalArgumentException;
+
+	public abstract boolean isPropertySupported(java.lang.String name);
+
+	public abstract void setEventAllocator(XMLEventAllocator allocator);
+
+	public abstract XMLEventAllocator getEventAllocator();
+}

Propchange: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/XMLInputFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/XMLInputFactory.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/XMLInputFactory.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/XMLOutputFactory.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/XMLOutputFactory.java?view=auto&rev=516148
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/XMLOutputFactory.java (added)
+++ geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/XMLOutputFactory.java Thu Mar  8 11:04:47 2007
@@ -0,0 +1,5 @@
+package javax.xml.stream;
+
+public abstract class XMLOutputFactory {
+
+}

Propchange: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/XMLOutputFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/XMLOutputFactory.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/XMLOutputFactory.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/Attribute.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/Attribute.java?view=diff&rev=516148&r1=516147&r2=516148
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/Attribute.java (original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/Attribute.java Thu Mar  8 11:04:47 2007
@@ -16,14 +16,17 @@
  ** KIND, either express or implied.  See the License for the
  ** specific language governing permissions and limitations
  ** under the License.
-*/
+ */
 package javax.xml.stream.events;
 
 import javax.xml.namespace.QName;
 
 public interface Attribute extends XMLEvent {
-    java.lang.String getDTDType();
-    javax.xml.namespace.QName getName();
-    java.lang.String getValue();
-    boolean isSpecified();
+	public String getDTDType();
+
+	public QName getName();
+
+	public String getValue();
+
+	public boolean isSpecified();
 }

Modified: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/Characters.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/Characters.java?view=diff&rev=516148&r1=516147&r2=516148
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/Characters.java (original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/Characters.java Thu Mar  8 11:04:47 2007
@@ -16,12 +16,15 @@
  ** KIND, either express or implied.  See the License for the
  ** specific language governing permissions and limitations
  ** under the License.
-*/
+ */
 package javax.xml.stream.events;
 
 public interface Characters extends XMLEvent {
-    java.lang.String getData();
-    boolean	isCData();
-    boolean	isIgnorableWhiteSpace();
-    boolean	isWhiteSpace();
+	public String getData();
+
+	public boolean isCData();
+
+	public boolean isIgnorableWhiteSpace();
+
+	public boolean isWhiteSpace();
 }

Modified: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/Comment.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/Comment.java?view=diff&rev=516148&r1=516147&r2=516148
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/Comment.java (original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/Comment.java Thu Mar  8 11:04:47 2007
@@ -16,9 +16,9 @@
  ** KIND, either express or implied.  See the License for the
  ** specific language governing permissions and limitations
  ** under the License.
-*/
+ */
 package javax.xml.stream.events;
 
 public interface Comment extends XMLEvent {
-    java.lang.String getText();
+	public String getText();
 }

Modified: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/DTD.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/DTD.java?view=diff&rev=516148&r1=516147&r2=516148
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/DTD.java (original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/DTD.java Thu Mar  8 11:04:47 2007
@@ -16,12 +16,17 @@
  ** KIND, either express or implied.  See the License for the
  ** specific language governing permissions and limitations
  ** under the License.
-*/
+ */
 package javax.xml.stream.events;
 
+import java.util.List;
+
 public interface DTD extends XMLEvent {
-    java.lang.String getDocumentTypeDeclaration();
-    java.util.List getEntities();
-    java.util.List getNotations();
-    java.lang.Object getProcessedDTD(); 
+	public String getDocumentTypeDeclaration();
+
+	public List getEntities();
+
+	public List getNotations();
+
+	public Object getProcessedDTD();
 }

Modified: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/EndDocument.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/EndDocument.java?view=diff&rev=516148&r1=516147&r2=516148
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/EndDocument.java (original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/EndDocument.java Thu Mar  8 11:04:47 2007
@@ -16,10 +16,8 @@
  ** KIND, either express or implied.  See the License for the
  ** specific language governing permissions and limitations
  ** under the License.
-*/
+ */
 package javax.xml.stream.events;
-
-import java.io.Writer;
 
 public interface EndDocument extends XMLEvent {
 }

Modified: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/EndElement.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/EndElement.java?view=diff&rev=516148&r1=516147&r2=516148
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/EndElement.java (original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/EndElement.java Thu Mar  8 11:04:47 2007
@@ -19,7 +19,11 @@
 */
 package javax.xml.stream.events;
 
+import java.util.Iterator;
+
+import javax.xml.namespace.QName;
+
 public interface EndElement extends XMLEvent {
-    javax.xml.namespace.QName getName();
-    java.util.Iterator getNamespaces();
+    public QName getName();
+    public Iterator getNamespaces();
 }

Modified: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/EntityDeclaration.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/EntityDeclaration.java?view=diff&rev=516148&r1=516147&r2=516148
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/EntityDeclaration.java (original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/EntityDeclaration.java Thu Mar  8 11:04:47 2007
@@ -16,14 +16,19 @@
  ** KIND, either express or implied.  See the License for the
  ** specific language governing permissions and limitations
  ** under the License.
-*/
+ */
 package javax.xml.stream.events;
 
 public interface EntityDeclaration extends XMLEvent {
-    java.lang.String getBaseURI();
-    java.lang.String getName();
-    java.lang.String getNotationName();
-    java.lang.String getPublicId();
-    java.lang.String getReplacementText();
-    java.lang.String getSystemId();
- }
\ No newline at end of file
+	public String getBaseURI();
+
+	public String getName();
+
+	public String getNotationName();
+
+	public String getPublicId();
+
+	public String getReplacementText();
+
+	public String getSystemId();
+}
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/EntityReference.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/EntityReference.java?view=diff&rev=516148&r1=516147&r2=516148
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/EntityReference.java (original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/EntityReference.java Thu Mar  8 11:04:47 2007
@@ -16,10 +16,11 @@
  ** KIND, either express or implied.  See the License for the
  ** specific language governing permissions and limitations
  ** under the License.
-*/
+ */
 package javax.xml.stream.events;
 
 public interface EntityReference extends XMLEvent {
-    EntityDeclaration getDeclaration();
-    java.lang.String getName();
+	public EntityDeclaration getDeclaration();
+
+	public String getName();
 }

Modified: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/Namespace.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/Namespace.java?view=diff&rev=516148&r1=516147&r2=516148
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/Namespace.java (original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/Namespace.java Thu Mar  8 11:04:47 2007
@@ -16,11 +16,13 @@
  ** KIND, either express or implied.  See the License for the
  ** specific language governing permissions and limitations
  ** under the License.
-*/
-package javax.xml.stream;
+ */
+package javax.xml.stream.events;
 
 public interface Namespace extends Attribute {
-    public String getNamespaceURI();
-    public String getPrefix();
-    public boolean isDefaultNamespaceDeclaration();
+	public String getNamespaceURI();
+
+	public String getPrefix();
+
+	public boolean isDefaultNamespaceDeclaration();
 }

Copied: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/NotationDeclaration.java (from r515948, geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/NotationDecleration.java)
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/NotationDeclaration.java?view=diff&rev=516148&p1=geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/NotationDecleration.java&r1=515948&p2=geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/NotationDeclaration.java&r2=516148
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/NotationDecleration.java (original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/NotationDeclaration.java Thu Mar  8 11:04:47 2007
@@ -16,13 +16,13 @@
  ** KIND, either express or implied.  See the License for the
  ** specific language governing permissions and limitations
  ** under the License.
-*/
-package javax.xml.namespace;
+ */
+package javax.xml.stream.events;
 
-import java.util.Iterator;
+public interface NotationDeclaration extends XMLEvent {
+	public String getName();
 
-public interface NotationDecleration extends XMLEvent {
-    public String getName();
-    public String getPublicId();
-    public String getSystemId();
+	public String getPublicId();
+
+	public String getSystemId();
 }

Modified: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/ProcessingInstruction.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/ProcessingInstruction.java?view=diff&rev=516148&r1=516147&r2=516148
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/ProcessingInstruction.java (original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/ProcessingInstruction.java Thu Mar  8 11:04:47 2007
@@ -16,12 +16,11 @@
  ** KIND, either express or implied.  See the License for the
  ** specific language governing permissions and limitations
  ** under the License.
-*/
-package javax.xml.namespace;
-
-import java.util.Iterator;
+ */
+package javax.xml.stream.events;
 
 public interface ProcessingInstruction extends XMLEvent {
-    public String getData();
-    public String getTarget(); 
+	public String getData();
+
+	public String getTarget();
 }

Modified: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/StartDocument.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/StartDocument.java?view=diff&rev=516148&r1=516147&r2=516148
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/StartDocument.java (original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/StartDocument.java Thu Mar  8 11:04:47 2007
@@ -16,14 +16,19 @@
  ** KIND, either express or implied.  See the License for the
  ** specific language governing permissions and limitations
  ** under the License.
-*/
+ */
 package javax.xml.stream.events;
 
 public interface StartDocument extends XMLEvent {
-    public boolean encodingSet();
-    public String getCharacterEncodingScheme();
-    public String getSystemId();
-    public String getVersion();
-    public boolean isStandalone();
-    public boolean standaloneSet(); 
+	public boolean encodingSet();
+
+	public String getCharacterEncodingScheme();
+
+	public String getSystemId();
+
+	public String getVersion();
+
+	public boolean isStandalone();
+
+	public boolean standaloneSet();
 }

Modified: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/StartElement.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/StartElement.java?view=diff&rev=516148&r1=516147&r2=516148
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/StartElement.java (original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/StartElement.java Thu Mar  8 11:04:47 2007
@@ -16,7 +16,7 @@
  ** KIND, either express or implied.  See the License for the
  ** specific language governing permissions and limitations
  ** under the License.
-*/
+ */
 package javax.xml.stream.events;
 
 import java.util.Iterator;
@@ -24,10 +24,15 @@
 import javax.xml.namespace.QName;
 
 public interface StartElement extends XMLEvent {
-    public Attribute getAttributeByName(QName name);
-    public Iterator getAttributes();
-    public QName getName();
-    public NamespaceContext getNamespaceContext();
-    public Iterator getNamespaces();
-    public String getNamespaceURI(String prefix);
+	public Attribute getAttributeByName(QName name);
+
+	public Iterator getAttributes();
+
+	public QName getName();
+
+	public NamespaceContext getNamespaceContext();
+
+	public Iterator getNamespaces();
+
+	public String getNamespaceURI(String prefix);
 }

Modified: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/XMLEvent.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/XMLEvent.java?view=diff&rev=516148&r1=516147&r2=516148
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/XMLEvent.java (original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/events/XMLEvent.java Thu Mar  8 11:04:47 2007
@@ -26,20 +26,35 @@
 import javax.xml.stream.XMLStreamConstants;
 
 public interface XMLEvent extends XMLStreamConstants {
-	Characters asCharacters();
-	EndElement asEndElement();
-	StartElement asStartElement();
-	int getEventType();
-	Location getLocation();
-	QName getSchemaType();
-	boolean isAttribute();
-	boolean isCharacters();
-	boolean isEndDocument();
-	boolean isEndElement();
-	boolean isEntityReference();
-	boolean isNamespace();
-	boolean isProcessingInstruction();
-	boolean isStartDocument();
-	boolean isStartElement();
-	void writeAsEncodedUnicode(Writer writer);
+	public Characters asCharacters();
+
+	public EndElement asEndElement();
+
+	public StartElement asStartElement();
+
+	public int getEventType();
+
+	public Location getLocation();
+
+	public QName getSchemaType();
+
+	public boolean isAttribute();
+
+	public boolean isCharacters();
+
+	public boolean isEndDocument();
+
+	public boolean isEndElement();
+
+	public boolean isEntityReference();
+
+	public boolean isNamespace();
+
+	public boolean isProcessingInstruction();
+
+	public boolean isStartDocument();
+
+	public boolean isStartElement();
+
+	public void writeAsEncodedUnicode(Writer writer);
 }

Modified: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/util/EventReaderDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/util/EventReaderDelegate.java?view=diff&rev=516148&r1=516147&r2=516148
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/util/EventReaderDelegate.java (original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/util/EventReaderDelegate.java Thu Mar  8 11:04:47 2007
@@ -16,7 +16,7 @@
  ** KIND, either express or implied.  See the License for the
  ** specific language governing permissions and limitations
  ** under the License.
-*/
+ */
 package javax.xml.stream.util;
 
 import javax.xml.namespace.QName;
@@ -25,58 +25,57 @@
 import javax.xml.stream.events.XMLEvent;
 
 public class EventReaderDelegate implements XMLEventReader {
-private XMLEventReader r;
+	private XMLEventReader reader;
 
-    public EventReaderDelegate()
-    {
-    }
-    
-    public EventReaderDelegate(XMLEventReader r)
-    {
-        this.r = r;
-    }
-
-    public void close()  throws XMLStreamException {
-        r.close();
-    }
-    
-    public String getElementText()  throws XMLStreamException {
-        return r.getElementText();
-    }
-    
-    public XMLEventReader getParent() {
-        return r;
-    }
-    
-    public Object getProperty(java.lang.String name) throws java.lang.IllegalArgumentException {
-        return r.getProperty(name);
-   }
-   
-    public boolean hasNext() {
-        return r.hasNext();
-    }
-    
-    public Object next() {
-        return r.next();
-    }
-    
-    public XMLEvent nextEvent() throws XMLStreamException {
-        return r.nextEvent();
-    }
-    
-    public XMLEvent nextTag()  throws XMLStreamException {
-        return r.nextTag();
-    }
-    
-    public XMLEvent peek()  throws XMLStreamException {
-        return r.peek();
-    }
-    
-    public void remove() {
-        r.remove();
-    }
-    
-    public void setParent(XMLEventReader reader) {
-        r.setParent(reader);
-    }
+	public EventReaderDelegate() {
+	}
+
+	public EventReaderDelegate(XMLEventReader reader) {
+		this.reader = reader;
+	}
+
+	public void close() throws XMLStreamException {
+		reader.close();
+	}
+
+	public String getElementText() throws XMLStreamException {
+		return reader.getElementText();
+	}
+
+	public XMLEventReader getParent() {
+		return reader;
+	}
+
+	public Object getProperty(java.lang.String name)
+			throws IllegalArgumentException {
+		return reader.getProperty(name);
+	}
+
+	public boolean hasNext() {
+		return reader.hasNext();
+	}
+
+	public Object next() {
+		return reader.next();
+	}
+
+	public XMLEvent nextEvent() throws XMLStreamException {
+		return reader.nextEvent();
+	}
+
+	public XMLEvent nextTag() throws XMLStreamException {
+		return reader.nextTag();
+	}
+
+	public XMLEvent peek() throws XMLStreamException {
+		return reader.peek();
+	}
+
+	public void remove() {
+		reader.remove();
+	}
+
+	public void setParent(XMLEventReader reader) {
+		this.reader = reader;
+	}
 }

Modified: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/util/StreamReaderDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/util/StreamReaderDelegate.java?view=diff&rev=516148&r1=516147&r2=516148
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/util/StreamReaderDelegate.java (original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/util/StreamReaderDelegate.java Thu Mar  8 11:04:47 2007
@@ -26,194 +26,203 @@
 import javax.xml.stream.XMLStreamReader;
 
 public class StreamReaderDelegate implements XMLStreamReader {
-	XMLStreamReader r;
+	XMLStreamReader reader;
 
 	public StreamReaderDelegate() {
 	}
 
 	public StreamReaderDelegate(XMLStreamReader reader) {
-		r = reader;
+		this.reader = reader;
 	}
 
-	public void close() throws XMLStreamException {
-		r.close();
+	public void setParent(XMLStreamReader reader) {
+		this.reader = reader;
 	}
 
-	public int getAttributeCount() {
-		return r.getAttributeCount();
+	public XMLStreamReader getParent() {
+		return reader;
 	}
 
-	public String getAttributeLocalName(int index) {
-		return r.getAttributeLocalName(index);
+	public int next() throws XMLStreamException {
+		return reader.next();
 	}
 
-	public QName getAttributeName(int index) {
-		return r.getAttributeName(index);
+	public int nextTag() throws XMLStreamException {
+		return reader.nextTag();
 	}
 
-	public String getAttributeNamespace(int index) {
-		return r.getAttributeNamespace(index);
+	public String getElementText() throws XMLStreamException {
+		return reader.getElementText();
 	}
 
-	public String getAttributePrefix(int index) {
-		return r.getAttributePrefix(index);
+	public void require(int type, String namespaceURI, String localName)
+			throws XMLStreamException {
+		reader.require(type, namespaceURI, localName);
 	}
 
-	public String getAttributeType(int index) {
-		return r.getAttributeType(index);
+	public boolean hasNext() throws XMLStreamException {
+		return reader.hasNext();
 	}
 
-	public String getAttributeValue(int index) {
-		return r.getAttributeValue(index);
+	public void close() throws XMLStreamException {
+		reader.close();
 	}
 
-	public String getAttributeValue(String namespaceURI, String localName) {
-		return r.getAttributeValue(namespaceURI, localName);
+	public String getNamespaceURI(String prefix) {
+		return reader.getNamespaceURI(prefix);
 	}
 
-	public String getCharacterEncodingScheme() {
-		return r.getCharacterEncodingScheme();
+	public NamespaceContext getNamespaceContext() {
+		return reader.getNamespaceContext();
 	}
 
-	public String getElementText() throws XMLStreamException {
-		return r.getElementText();
+	public boolean isStartElement() {
+		return reader.isStartElement();
 	}
 
-	public String getEncoding() {
-		return r.getEncoding();
+	public boolean isEndElement() {
+		return reader.isEndElement();
 	}
 
-	public int getEventType() {
-		return r.getEventType();
+	public boolean isCharacters() {
+		return reader.isCharacters();
 	}
 
-	public String getLocalName() {
-		return r.getLocalName();
+	public boolean isWhiteSpace() {
+		return reader.isWhiteSpace();
 	}
 
-	public Location getLocation() {
-		return r.getLocation();
+	public String getAttributeValue(String namespaceURI, String localName) {
+		return reader.getAttributeValue(namespaceURI, localName);
 	}
 
-	public QName getName() {
-		return r.getName();
+	public int getAttributeCount() {
+		return reader.getAttributeCount();
 	}
 
-	public NamespaceContext getNamespaceContext() {
-		return r.getNamespaceContext();
+	public QName getAttributeName(int index) {
+		return reader.getAttributeName(index);
 	}
 
-	public int getNamespaceCount() {
-		return r.getNamespaceCount();
+	public String getAttributePrefix(int index) {
+		return reader.getAttributePrefix(index);
 	}
 
-	public String getNamespacePrefix(int index) {
-		return r.getNamespacePrefix(index);
+	public String getAttributeNamespace(int index) {
+		return reader.getAttributeNamespace(index);
 	}
 
-	public String getNamespaceURI() {
-		return r.getNamespaceURI();
+	public String getAttributeLocalName(int index) {
+		return reader.getAttributeLocalName(index);
 	}
 
-	public String getNamespaceURI(int index) {
-		return r.getNamespaceURI(index);
+	public String getAttributeType(int index) {
+		return reader.getAttributeType(index);
 	}
 
-	public String getNamespaceURI(String prefix) {
-		return r.getNamespaceURI(prefix);
+	public String getAttributeValue(int index) {
+		return reader.getAttributeValue(index);
 	}
 
-	public String getPIData() {
-		return r.getPIData();
+	public boolean isAttributeSpecified(int index) {
+		return reader.isAttributeSpecified(index);
 	}
 
-	public String getPITarget() {
-		return r.getPITarget();
+	public int getNamespaceCount() {
+		return reader.getNamespaceCount();
 	}
 
-	public String getPrefix() {
-		return r.getPrefix();
+	public String getNamespacePrefix(int index) {
+		return reader.getNamespacePrefix(index);
 	}
 
-	public Object getProperty(String name) throws IllegalArgumentException {
-		return r.getProperty(name);
+	public String getNamespaceURI(int index) {
+		return reader.getNamespaceURI(index);
 	}
 
-	public String getText() {
-		return r.getText();
+	public int getEventType() {
+		return reader.getEventType();
 	}
 
-	public char[] getTextCharacters() {
-		return r.getTextCharacters();
+	public String getText() {
+		return reader.getText();
 	}
 
 	public int getTextCharacters(int sourceStart, char[] target,
 			int targetStart, int length) throws XMLStreamException {
-		return r.getTextCharacters(sourceStart, target, targetStart, length);
+		return reader.getTextCharacters(sourceStart, target, targetStart,
+				length);
 	}
 
-	public int getTextLength() {
-		return r.getTextLength();
+	public char[] getTextCharacters() {
+		return reader.getTextCharacters();
 	}
 
 	public int getTextStart() {
-		return r.getTextStart();
+		return reader.getTextStart();
 	}
 
-	public String getVersion() {
-		return r.getVersion();
+	public int getTextLength() {
+		return reader.getTextLength();
 	}
 
-	public boolean hasName() {
-		return r.hasName();
+	public String getEncoding() {
+		return reader.getEncoding();
 	}
 
-	public boolean hasNext() throws XMLStreamException {
-		return r.hasNext();
+	public boolean hasText() {
+		return reader.hasText();
 	}
 
-	public boolean hasText() {
-		return r.hasText();
+	public Location getLocation() {
+		return reader.getLocation();
 	}
 
-	public boolean isAttributeSpecified(int index) {
-		return r.isAttributeSpecified(index);
+	public QName getName() {
+		return reader.getName();
 	}
 
-	public boolean isCharacters() {
-		return r.isCharacters();
+	public String getLocalName() {
+		return reader.getLocalName();
 	}
 
-	public boolean isEndElement() {
-		return r.isEndElement();
+	public boolean hasName() {
+		return reader.hasName();
 	}
 
-	public boolean isStandalone() {
-		return r.isStandalone();
+	public String getNamespaceURI() {
+		return reader.getNamespaceURI();
 	}
 
-	public boolean isStartElement() {
-		return r.isStartElement();
+	public String getPrefix() {
+		return reader.getPrefix();
 	}
 
-	public boolean isWhiteSpace() {
-		return r.isWhiteSpace();
+	public String getVersion() {
+		return reader.getVersion();
 	}
 
-	public int next() throws XMLStreamException {
-		return r.next();
+	public boolean isStandalone() {
+		return reader.isStandalone();
 	}
 
-	public int nextTag() throws XMLStreamException {
-		return r.nextTag();
+	public boolean standaloneSet() {
+		return reader.standaloneSet();
 	}
 
-	public void require(int type, String namespaceURI, String localName)
-			throws XMLStreamException {
-		r.require(type, namespaceURI, localName);
+	public String getCharacterEncodingScheme() {
+		return reader.getCharacterEncodingScheme();
 	}
 
-	public boolean standaloneSet() {
-		return r.standaloneSet();
+	public String getPITarget() {
+		return reader.getPITarget();
+	}
+
+	public String getPIData() {
+		return reader.getPIData();
+	}
+
+	public Object getProperty(String name) throws IllegalArgumentException {
+		return reader.getProperty(name);
 	}
 }

Modified: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/util/XMLEventAllocator.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/util/XMLEventAllocator.java?view=diff&rev=516148&r1=516147&r2=516148
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/util/XMLEventAllocator.java (original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/stream/util/XMLEventAllocator.java Thu Mar  8 11:04:47 2007
@@ -19,11 +19,15 @@
  */
 package javax.xml.stream.util;
 
+import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.events.XMLEvent;
 
 public interface XMLEventAllocator {
-	public XMLEvent allocate(XMLStreamReader reader);
-	public void allocate(XMLStreamReader reader, XMLEventConsumer consumer);
+	public XMLEvent allocate(XMLStreamReader reader) throws XMLStreamException;
+
+	public void allocate(XMLStreamReader reader, XMLEventConsumer consumer)
+			throws XMLStreamException;
+
 	public XMLEventAllocator newInstance();
 }



Mime
View raw message