geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r927955 - in /geronimo/specs/trunk/geronimo-stax-api_1.2_spec: ./ src/main/java/javax/xml/namespace/ src/main/java/javax/xml/stream/
Date Fri, 26 Mar 2010 16:32:39 GMT
Author: rickmcguire
Date: Fri Mar 26 16:32:39 2010
New Revision: 927955

URL: http://svn.apache.org/viewvc?rev=927955&view=rev
Log:
GERONIMO-5188 Uplevel the stax spec implementation to the 1.3 maintenance release level. 

spec jar creation. 

Added:
    geronimo/specs/trunk/geronimo-stax-api_1.2_spec/
      - copied from r926724, geronimo/specs/trunk/geronimo-stax-api_1.0_spec/
    geronimo/specs/trunk/geronimo-stax-api_1.2_spec/pom.xml
      - copied, changed from r926728, geronimo/specs/trunk/geronimo-stax-api_1.0_spec/pom.xml
    geronimo/specs/trunk/geronimo-stax-api_1.2_spec/src/main/java/javax/xml/namespace/QName.java
      - copied unchanged from r926728, geronimo/specs/trunk/geronimo-stax-api_1.0_spec/src/main/java/javax/xml/namespace/QName.java
Modified:
    geronimo/specs/trunk/geronimo-stax-api_1.2_spec/src/main/java/javax/xml/stream/XMLEventFactory.java
    geronimo/specs/trunk/geronimo-stax-api_1.2_spec/src/main/java/javax/xml/stream/XMLInputFactory.java
    geronimo/specs/trunk/geronimo-stax-api_1.2_spec/src/main/java/javax/xml/stream/XMLOutputFactory.java

Copied: geronimo/specs/trunk/geronimo-stax-api_1.2_spec/pom.xml (from r926728, geronimo/specs/trunk/geronimo-stax-api_1.0_spec/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.2_spec/pom.xml?p2=geronimo/specs/trunk/geronimo-stax-api_1.2_spec/pom.xml&p1=geronimo/specs/trunk/geronimo-stax-api_1.0_spec/pom.xml&r1=926728&r2=927955&rev=927955&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.2_spec/pom.xml Fri Mar 26 16:32:39 2010
@@ -33,10 +33,10 @@
     </parent>
 
     <groupId>org.apache.geronimo.specs</groupId>
-    <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+    <artifactId>geronimo-stax-api_1.2_spec</artifactId>
     <packaging>bundle</packaging>
-    <name>Streaming API for XML (STAX API 1.0)</name>
-    <version>1.0.2-SNAPSHOT</version>
+    <name>Streaming API for XML (STAX API 1.2)</name>
+    <version>1.0.0-SNAPSHOT</version>
 
     <description>Java STAX Spec API 1.0</description>
 
@@ -53,8 +53,8 @@
     </properties>
 
     <scm>
-        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-stax-api_1.0_spec</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-stax-api_1.0_spec</developerConnection>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-stax-api_1.2_spec</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-stax-api_1.2_spec</developerConnection>
         <url>https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-stax-api_1.0_spec</url>
     </scm>
 
@@ -75,10 +75,10 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${groupId}.${artifactId};singleton=true</Bundle-SymbolicName>
-                        <Specification-Title>JSR-137 Streaming API for XML 1.0</Specification-Title>
+                        <Specification-Title>JSR-137 Streaming API for XML 1.2</Specification-Title>
                         <Specification-Vendor>Sun Microsystems, Inc.</Specification-Vendor>
-                        <Specification-Version>1.0</Specification-Version>
-                        <Export-Package>javax.xml.stream*;version=1.0,javax.xml.namespace*;version=1.0</Export-Package>
+                        <Specification-Version>1.2</Specification-Version>
+                        <Export-Package>javax.xml.stream*;version=1.2,javax.xml.namespace*;version=1.0</Export-Package>
                         <Import-Package>org.apache.geronimo.osgi.registry.api;resolution:=optional,*</Import-Package>
                         <Private-Package>org.apache.geronimo.osgi.locator</Private-Package>
                         <Bundle-Activator>org.apache.geronimo.osgi.locator.Activator</Bundle-Activator>

Modified: geronimo/specs/trunk/geronimo-stax-api_1.2_spec/src/main/java/javax/xml/stream/XMLEventFactory.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.2_spec/src/main/java/javax/xml/stream/XMLEventFactory.java?rev=927955&r1=926724&r2=927955&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.2_spec/src/main/java/javax/xml/stream/XMLEventFactory.java
(original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.2_spec/src/main/java/javax/xml/stream/XMLEventFactory.java
Fri Mar 26 16:32:39 2010
@@ -41,16 +41,33 @@ public abstract class XMLEventFactory {
 	protected XMLEventFactory() {
 	}
 
-	public static XMLEventFactory newInstance()
-			throws FactoryConfigurationError {
+	public static XMLEventFactory newInstance() throws FactoryConfigurationError {
             return (XMLEventFactory)FactoryLocator.locate("javax.xml.stream.XMLEventFactory",
"com.ctc.wstx.stax.WstxEventFactory");
 	}
 
+	public static XMLEventFactory newFactory() throws FactoryConfigurationError {
+            return (XMLEventFactory)FactoryLocator.locate("javax.xml.stream.XMLEventFactory",
"com.ctc.wstx.stax.WstxEventFactory");
+	}
+
+	/**
+	 * Create a new XMLEventFactory
+	 *
+	 * @deprecated to maintain API consistency.  All newInstance methods are
+	 * replaced with corresponding newFactory methods.  The replacement
+	 * newFactory(String factoryId, ClassLoader classLoader)
+	 * method defines no changes in behavior from this method.
+         */
 	public static XMLEventFactory newInstance(String factoryId,
 			ClassLoader classLoader) throws FactoryConfigurationError {
             return (XMLEventFactory)FactoryLocator.locate(factoryId, "com.ctc.wstx.stax.WstxEventFactory",
classLoader);
 	}
 
+
+	public static XMLEventFactory newFactory(String factoryId,
+			ClassLoader classLoader) throws FactoryConfigurationError {
+            return (XMLEventFactory)FactoryLocator.locate(factoryId, "com.ctc.wstx.stax.WstxEventFactory",
classLoader);
+	}
+
 	public abstract void setLocation(Location location);
 
 	public abstract Attribute createAttribute(QName name, String value);

Modified: geronimo/specs/trunk/geronimo-stax-api_1.2_spec/src/main/java/javax/xml/stream/XMLInputFactory.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.2_spec/src/main/java/javax/xml/stream/XMLInputFactory.java?rev=927955&r1=926724&r2=927955&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.2_spec/src/main/java/javax/xml/stream/XMLInputFactory.java
(original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.2_spec/src/main/java/javax/xml/stream/XMLInputFactory.java
Fri Mar 26 16:32:39 2010
@@ -41,12 +41,34 @@ public abstract class XMLInputFactory {
 		return (XMLInputFactory)FactoryLocator.locate("javax.xml.stream.XMLInputFactory", "com.ctc.wstx.stax.WstxInputFactory");
 	}
 
+	public static XMLInputFactory newFactory()
+			throws FactoryConfigurationError {
+		// We'll assume the XMLInputFactory from the RI as a backup.
+		return (XMLInputFactory)FactoryLocator.locate("javax.xml.stream.XMLInputFactory", "com.ctc.wstx.stax.WstxInputFactory");
+	}
+
+
+	/**
+	 * Create a new XMLInputFactory
+	 *
+	 * @deprecated to maintain API consistency.  All newInstance methods are
+	 * replaced with corresponding newFactory methods.  The replacement
+	 * newFactory(String factoryId, ClassLoader classLoader)
+	 * method defines no changes in behavior from this method.
+	 */
 	public static XMLInputFactory newInstance(java.lang.String factoryId,
 			java.lang.ClassLoader classLoader) throws FactoryConfigurationError {
 		// We'll assume the XMLInputFactory from the RI as a backup.
 		return (XMLInputFactory)FactoryLocator.locate(factoryId, "com.ctc.wstx.stax.WstxInputFactory",
classLoader);
 	}
 
+
+	public static XMLInputFactory newFactory(java.lang.String factoryId,
+			java.lang.ClassLoader classLoader) throws FactoryConfigurationError {
+		// We'll assume the XMLInputFactory from the RI as a backup.
+		return (XMLInputFactory)FactoryLocator.locate(factoryId, "com.ctc.wstx.stax.WstxInputFactory",
classLoader);
+	}
+
 	public abstract XMLStreamReader createXMLStreamReader(java.io.Reader reader)
 			throws XMLStreamException;
 

Modified: geronimo/specs/trunk/geronimo-stax-api_1.2_spec/src/main/java/javax/xml/stream/XMLOutputFactory.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.2_spec/src/main/java/javax/xml/stream/XMLOutputFactory.java?rev=927955&r1=926724&r2=927955&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.2_spec/src/main/java/javax/xml/stream/XMLOutputFactory.java
(original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.2_spec/src/main/java/javax/xml/stream/XMLOutputFactory.java
Fri Mar 26 16:32:39 2010
@@ -23,15 +23,45 @@ public abstract class XMLOutputFactory {
 	public static final String IS_REPAIRING_NAMESPACES = "javax.xml.stream.isRepairingNamespaces";
 
 	protected XMLOutputFactory() { }
-	
-	public static XMLOutputFactory newInstance()
-			throws FactoryConfigurationError {
+
+	public static XMLOutputFactory newInstance() throws FactoryConfigurationError {
 		return (XMLOutputFactory) FactoryLocator.locate("javax.xml.stream.XMLOutputFactory", "com.ctc.wstx.stax.WstxOutputFactory");
 	}
 
+	/**
+	 * Create a new XMLOutputFactory
+	 *
+	 * @deprecated This method has been deprecated because
+     * it returns an instance of XMLInputFactory, which is of the
+     * wrong class.  Use the new method
+     * newFactory(java.lang.String factoryId,java.lang.ClassLoader classLoader)
+     * instead.
+	 */
 	public static XMLInputFactory newInstance(String factoryId,
 			java.lang.ClassLoader classLoader) throws FactoryConfigurationError {
 		return (XMLInputFactory) FactoryLocator.locate(factoryId, "com.ctc.wstx.stax.WstxOutputFactory",
classLoader);
+
+	}
+
+
+	/**
+	 * Create a new XMLOutputFactory
+	 *
+	 * This is the replacement for the deprecated newInstance() method
+	 */
+	public static XMLOutputFactory newFactory()	throws FactoryConfigurationError {
+		return (XMLOutputFactory) FactoryLocator.locate("javax.xml.stream.XMLOutputFactory", "com.ctc.wstx.stax.WstxOutputFactory");
+	}
+
+	/**
+	 * Create a new XMLOutputFactory
+	 *
+	 * This is the replacement for the deprecated newInstance() method
+	 */
+	public static XMLOutputFactory newFactory(String factoryId,	ClassLoader classLoader)
+			throws FactoryConfigurationError {
+		// essentially the same thing as deprecated newInstance(), but the correct return type.
+		return (XMLOutputFactory) FactoryLocator.locate(factoryId, "com.ctc.wstx.stax.WstxOutputFactory",
classLoader);
 	}
 
 	public abstract XMLStreamWriter createXMLStreamWriter(java.io.Writer stream)



Mime
View raw message