Merge "Remove unused javax.sql.rowset resources."
diff --git a/ojluni/src/main/resources/javax/sql/rowset/rowset.properties b/ojluni/src/main/resources/javax/sql/rowset/rowset.properties
deleted file mode 100755
index 68dd95b..0000000
--- a/ojluni/src/main/resources/javax/sql/rowset/rowset.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#Default JDBC RowSet sync providers listing
-#
-
-# Optimistic synchonriztaion provider
-rowset.provider.classname.0=com.sun.rowset.providers.RIOptimisticProvider
-rowset.provider.vendor.0=Oracle Corporation
-rowset.provider.version.0=1.0
-
-# XML Provider using standard XML schema
-rowset.provider.classname.1=com.sun.rowset.providers.RIXMLProvider
-rowset.provider.vendor.1=Oracle Corporation
-rowset.provider.version.1=1.0
diff --git a/ojluni/src/main/resources/javax/sql/rowset/sqlxml.xsd b/ojluni/src/main/resources/javax/sql/rowset/sqlxml.xsd
deleted file mode 100755
index 6296605..0000000
--- a/ojluni/src/main/resources/javax/sql/rowset/sqlxml.xsd
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.  Oracle designates this
- particular file as subject to the "Classpath" exception as provided
- by Oracle in the LICENSE file that accompanied this code.
-
- This code 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
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<xsd:schema 
-      xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-      targetNamespace="http://standards.iso.org/iso/9075/2002/12/sqlxml"
-      xmlns:sqlxml="http://standards.iso.org/iso/9075/2002/12/sqlxml">
-  <xsd:annotation>
-    <xsd:documentation>
-      ISO/IEC 9075-14:2003 (SQL/XML)
-      This document contains definitions of types and 
-      annotations as specified in ISO/IEC 9075-14:2003.
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:simpleType name="kindKeyword">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="PREDEFINED"/>
-      <xsd:enumeration value="DOMAIN"/>
-      <xsd:enumeration value="ROW"/>
-      <xsd:enumeration value="DISTINCT"/>
-      <xsd:enumeration value="ARRAY"/>
-      <xsd:enumeration value="MULTISET"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="typeKeyword">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="CHAR"/>
-      <xsd:enumeration value="VARCHAR"/>
-      <xsd:enumeration value="CLOB"/>
-      <xsd:enumeration value="BLOB"/>
-      <xsd:enumeration value="NUMERIC"/>
-      <xsd:enumeration value="DECIMAL"/>
-      <xsd:enumeration value="INTEGER"/>
-      <xsd:enumeration value="SMALLINT"/>
-      <xsd:enumeration value="BIGINT"/>
-      <xsd:enumeration value="FLOAT"/>
-      <xsd:enumeration value="REAL"/>
-      <xsd:enumeration value="DOUBLE PRECISION"/>
-      <xsd:enumeration value="BOOLEAN"/>
-      <xsd:enumeration value="DATE"/>
-      <xsd:enumeration value="TIME"/>
-      <xsd:enumeration value="TIME WITH TIME ZONE"/>
-      <xsd:enumeration value="TIMESTAMP"/>
-      <xsd:enumeration value="TIMESTAMP WITH TIME ZONE"/>
-      <xsd:enumeration value="INTERVAL YEAR"/>
-      <xsd:enumeration value="INTERVAL YEAR TO MONTH"/>
-      <xsd:enumeration value="INTERVAL MONTH"/>
-      <xsd:enumeration value="INTERVAL DAY"/>
-      <xsd:enumeration value="INTERVAL DAY TO HOUR"/>
-      <xsd:enumeration value="INTERVAL DAY TO MINUTE"/>
-      <xsd:enumeration value="INTERVAL DAY TO SECOND"/>
-      <xsd:enumeration value="INTERVAL HOUR"/>
-      <xsd:enumeration value="INTERVAL HOUR TO MINUTE"/>
-      <xsd:enumeration value="INTERVAL HOUR TO SECOND"/>
-      <xsd:enumeration value="INTERVAL MINUTE"/>
-      <xsd:enumeration value="INTERVAL MINUTE TO SECOND"/>
-      <xsd:enumeration value="INTERVAL SECOND"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:complexType name="fieldType">
-    <xsd:attribute name="name" type="xsd:string"/>
-    <xsd:attribute name="mappedType" type="xsd:string"/>
-  </xsd:complexType>
-
-  <xsd:element name="sqltype">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="field" type="sqlxml:fieldType"
-                        minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-      <xsd:attribute name="kind"
-                        type="sqlxml:kindKeyword"/>
-      <xsd:attribute name="name" 
-                        type="sqlxml:typeKeyword" use="optional"/>
-      <xsd:attribute name="length" type="xsd:integer"
-                        use="optional"/>
-      <xsd:attribute name="maxLength" type="xsd:integer"
-                        use="optional"/>
-      <xsd:attribute name="characterSetName" type="xsd:string"
-                        use="optional"/>
-      <xsd:attribute name="collation" type="xsd:string"
-                        use="optional"/>
-      <xsd:attribute name="precision" type="xsd:integer"
-                        use="optional"/>
-      <xsd:attribute name="scale" type="xsd:integer"
-                        use="optional"/>
-      <xsd:attribute name="maxExponent" type="xsd:integer"
-                        use="optional"/>
-      <xsd:attribute name="minExponent" type="xsd:integer"
-                        use="optional"/>
-      <xsd:attribute name="userPrecision" type="xsd:integer"
-                        use="optional"/>
-      <xsd:attribute name="leadingPrecision" type="xsd:integer"
-                        use="optional"/>
-      <xsd:attribute name="maxElements" type="xsd:integer"
-                        use="optional"/>
-      <xsd:attribute name="catalogName" type="xsd:string"
-                        use="optional"/>
-      <xsd:attribute name="schemaName" type="xsd:string"
-                        use="optional"/>
-      <xsd:attribute name="domainName" type="xsd:string"
-                        use="optional"/>
-      <xsd:attribute name="typeName" type="xsd:string"
-                        use="optional"/>
-      <xsd:attribute name="mappedType" type="xsd:string"
-                        use="optional"/>
-      <xsd:attribute name="mappedElementType" type="xsd:string"
-                        use="optional"/>
-      <xsd:attribute name="final" type="xsd:boolean"
-                        use="optional"/>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:simpleType name="objectType">
-     <xsd:restriction base="xsd:string">
-        <xsd:enumeration value="CATALOG" />
-        <xsd:enumeration value="SCHEMA" />
-        <xsd:enumeration value="BASE TABLE" />
-        <xsd:enumeration value="VIEWED TABLE" />
-        <xsd:enumeration value="CHARACTER SET" />
-        <xsd:enumeration value="COLLATION" />
-     </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:element name="sqlname">
-     <xsd:complexType>
-        <xsd:attribute name="type" type="sqlxml:objectType"
-                          use="required" />
-        <xsd:attribute name="catalogName" type="xsd:string" />
-        <xsd:attribute name="schemaName" type="xsd:string" />
-        <xsd:attribute name="localName" type="xsd:string" />
-     </xsd:complexType>
-  </xsd:element>
-
-</xsd:schema>
diff --git a/ojluni/src/main/resources/javax/sql/rowset/webrowset.xsd b/ojluni/src/main/resources/javax/sql/rowset/webrowset.xsd
deleted file mode 100755
index a7139ef..0000000
--- a/ojluni/src/main/resources/javax/sql/rowset/webrowset.xsd
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.  Oracle designates this
- particular file as subject to the "Classpath" exception as provided
- by Oracle in the LICENSE file that accompanied this code.
-
- This code 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
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<!-- WebRowSet XML Schema by Jonathan Bruce (Sun Microsystems Inc.) -->
-<xs:schema targetNamespace="http://java.sun.com/xml/ns/jdbc" xmlns:wrs="http://java.sun.com/xml/ns/jdbc" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-	
-	<xs:element name="webRowSet">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="wrs:properties"/>
-				<xs:element ref="wrs:metadata"/>
-				<xs:element ref="wrs:data"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	
-	<xs:element name="columnValue" type="xs:anyType"/>
-	<xs:element name="updateValue" type="xs:anyType"/>
-	
-	<xs:element name="properties">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="command" type="xs:string"/>
-				<xs:element name="concurrency" type="xs:string"/>
-				<xs:element name="datasource" type="xs:string"/>
-				<xs:element name="escape-processing" type="xs:string"/>
-				<xs:element name="fetch-direction" type="xs:string"/>
-				<xs:element name="fetch-size" type="xs:string"/>
-				<xs:element name="isolation-level" type="xs:string"/>
-				<xs:element name="key-columns">
-					<xs:complexType>
-						<xs:sequence minOccurs="0" maxOccurs="unbounded">
-							<xs:element name="column" type="xs:string"/>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="map">
-					<xs:complexType>
-						<xs:sequence minOccurs="0" maxOccurs="unbounded">
-							<xs:element name="type" type="xs:string"/>
-							<xs:element name="class" type="xs:string"/>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="max-field-size" type="xs:string"/>
-				<xs:element name="max-rows" type="xs:string"/>
-				<xs:element name="query-timeout" type="xs:string"/>
-				<xs:element name="read-only" type="xs:string"/>
-				<xs:element name="rowset-type" type="xs:string"/>
-				<xs:element name="show-deleted" type="xs:string"/>
-				<xs:element name="table-name" type="xs:string"/>
-				<xs:element name="url" type="xs:string"/>
-				<xs:element name="sync-provider">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="sync-provider-name" type="xs:string"/>
-							<xs:element name="sync-provider-vendor" type="xs:string"/>
-							<xs:element name="sync-provider-version" type="xs:string"/>
-							<xs:element name="sync-provider-grade" type="xs:string"/>
-							<xs:element name="data-source-lock" type="xs:string"/>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="metadata">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="column-count" type="xs:string"/>
-				<xs:choice>
-					<xs:element name="column-definition" minOccurs="0" maxOccurs="unbounded">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="column-index" type="xs:string"/>
-								<xs:element name="auto-increment" type="xs:string"/>
-								<xs:element name="case-sensitive" type="xs:string"/>
-								<xs:element name="currency" type="xs:string"/>
-								<xs:element name="nullable" type="xs:string"/>
-								<xs:element name="signed" type="xs:string"/>
-								<xs:element name="searchable" type="xs:string"/>
-								<xs:element name="column-display-size" type="xs:string"/>
-								<xs:element name="column-label" type="xs:string"/>
-								<xs:element name="column-name" type="xs:string"/>
-								<xs:element name="schema-name" type="xs:string"/>
-								<xs:element name="column-precision" type="xs:string"/>
-								<xs:element name="column-scale" type="xs:string"/>
-								<xs:element name="table-name" type="xs:string"/>
-								<xs:element name="catalog-name" type="xs:string"/>
-								<xs:element name="column-type" type="xs:string"/>
-								<xs:element name="column-type-name" type="xs:string"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:choice>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="data">
-		<xs:complexType>
-			<xs:sequence minOccurs="0" maxOccurs="unbounded">
-				<xs:element name="currentRow" minOccurs="0" maxOccurs="unbounded">
-					<xs:complexType>
-						<xs:sequence minOccurs="0" maxOccurs="unbounded">
-							<xs:element ref="wrs:columnValue"/>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="insertRow" minOccurs="0" maxOccurs="unbounded">
-					<xs:complexType>
-						<xs:choice minOccurs="0" maxOccurs="unbounded">
-							<xs:element ref="wrs:columnValue"/>
-							<xs:element ref="wrs:updateValue"/>
-						</xs:choice>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="deleteRow" minOccurs="0" maxOccurs="unbounded">
-					<xs:complexType>
-						<xs:sequence minOccurs="0" maxOccurs="unbounded">
-							<xs:element ref="wrs:columnValue"/>
-							<xs:element ref="wrs:updateValue"/>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="modifyRow" minOccurs="0" maxOccurs="unbounded">
-					<xs:complexType>
-						<xs:sequence minOccurs="0" maxOccurs="unbounded">
-							<xs:element ref="wrs:columnValue"/>
-							<xs:element ref="wrs:updateValue"/>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>