# HG changeset patch # User lancea # Date 1284804588 14400 # Node ID c5fbc05d734780429fb16e6cd0801c37248da05d # Parent ae13809f3ce735eceef0875d4891a66698d8f069 6984044: RowSet source needs to rebrand vendor references Reviewed-by: darcy, ohair diff -r ae13809f3ce7 -r c5fbc05d7347 jdk/src/share/classes/com/sun/rowset/internal/WebRowSetXmlWriter.java --- a/jdk/src/share/classes/com/sun/rowset/internal/WebRowSetXmlWriter.java Fri Sep 17 14:40:38 2010 -0700 +++ b/jdk/src/share/classes/com/sun/rowset/internal/WebRowSetXmlWriter.java Sat Sep 18 06:09:48 2010 -0400 @@ -248,7 +248,7 @@ String strProvider = strProviderInstance.substring(0, (caller.getSyncProvider()).toString().indexOf("@")); propString("sync-provider-name", strProvider); - propString("sync-provider-vendor", "Sun Microsystems Inc."); + propString("sync-provider-vendor", "Oracle Corporation"); propString("sync-provider-version", "1.0"); propInteger("sync-provider-grade", caller.getSyncProvider().getProviderGrade()); propInteger("data-source-lock", caller.getSyncProvider().getDataSourceLock()); diff -r ae13809f3ce7 -r c5fbc05d7347 jdk/src/share/classes/com/sun/rowset/providers/RIOptimisticProvider.java --- a/jdk/src/share/classes/com/sun/rowset/providers/RIOptimisticProvider.java Fri Sep 17 14:40:38 2010 -0700 +++ b/jdk/src/share/classes/com/sun/rowset/providers/RIOptimisticProvider.java Sat Sep 18 06:09:48 2010 -0400 @@ -93,14 +93,14 @@ private CachedRowSetWriter writer; /** - * The unique provider indentifier. + * The unique provider identifier. */ private String providerID = "com.sun.rowset.providers.RIOptimisticProvider"; /** * The vendor name of this SyncProvider implementation */ - private String vendorName = "Sun Microsystems Inc."; + private String vendorName = "Oracle Corporation"; /** * The version number of this SyncProvider implementation @@ -236,8 +236,8 @@ } /** - * Returns the vendor name of the Reference Implemntation Optimistic - * Syncchronication Provider + * Returns the vendor name of the Reference Implementation Optimistic + * Synchronization Provider * * @return the String detailing the vendor name of this * SyncProvider diff -r ae13809f3ce7 -r c5fbc05d7347 jdk/src/share/classes/com/sun/rowset/providers/RIXMLProvider.java --- a/jdk/src/share/classes/com/sun/rowset/providers/RIXMLProvider.java Fri Sep 17 14:40:38 2010 -0700 +++ b/jdk/src/share/classes/com/sun/rowset/providers/RIXMLProvider.java Sat Sep 18 06:09:48 2010 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, 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 @@ -85,7 +85,7 @@ /** * The vendor name of this SyncProvider implementation. */ - private String vendorName = "Sun Microsystems Inc."; + private String vendorName = "Oracle Corporation"; /** * The version number of this SyncProvider implementation. diff -r ae13809f3ce7 -r c5fbc05d7347 jdk/src/share/classes/javax/sql/rowset/CachedRowSet.java --- a/jdk/src/share/classes/javax/sql/rowset/CachedRowSet.java Fri Sep 17 14:40:38 2010 -0700 +++ b/jdk/src/share/classes/javax/sql/rowset/CachedRowSet.java Sat Sep 18 06:09:48 2010 -0400 @@ -39,7 +39,7 @@ * CachedRowSet must implement. *

* The reference implementation of the CachedRowSet interface provided - * by Sun Microsystems is a standard implementation. Developers may use this implementation + * by Oracle Corporation is a standard implementation. Developers may use this implementation * just as it is, they may extend it, or they may choose to write their own implementations * of this interface. *

@@ -1623,4 +1623,3 @@ public boolean previousPage() throws SQLException; } - diff -r ae13809f3ce7 -r c5fbc05d7347 jdk/src/share/classes/javax/sql/rowset/WebRowSet.java --- a/jdk/src/share/classes/javax/sql/rowset/WebRowSet.java Fri Sep 17 14:40:38 2010 -0700 +++ b/jdk/src/share/classes/javax/sql/rowset/WebRowSet.java Sat Sep 18 06:09:48 2010 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, 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 @@ -115,7 +115,7 @@ * <url>jdbc:thin:oracle</url> * <sync-provider> * <sync-provider-name>.com.rowset.provider.RIOptimisticProvider</sync-provider-name> - * <sync-provider-vendor>Sun Microsystems</sync-provider-vendor> + * <sync-provider-vendor>Oracle Corporation</sync-provider-vendor> * <sync-provider-version>1.0</sync-provider-name> * <sync-provider-grade>LOW</sync-provider-grade> * <data-source-lock>NONE</data-source-lock> @@ -489,7 +489,7 @@ * tags and their valid values for a WebRowSet implementation. */ public static String PUBLIC_XML_SCHEMA = - "--//Sun Microsystems, Inc.//XSD Schema//EN"; + "--//Oracle Corporation//XSD Schema//EN"; /** * The URL for the XML Schema definition file that defines the XML tags and diff -r ae13809f3ce7 -r c5fbc05d7347 jdk/src/share/classes/javax/sql/rowset/rowset.properties --- a/jdk/src/share/classes/javax/sql/rowset/rowset.properties Fri Sep 17 14:40:38 2010 -0700 +++ b/jdk/src/share/classes/javax/sql/rowset/rowset.properties Sat Sep 18 06:09:48 2010 -0400 @@ -3,10 +3,10 @@ # Optimistic synchonriztaion provider rowset.provider.classname.0=com.sun.rowset.providers.RIOptimisticProvider -rowset.provider.vendor.0=Sun Microsystems Inc +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=Sun Microsystems Inc. +rowset.provider.vendor.1=Oracle Corporation rowset.provider.version.1=1.0 diff -r ae13809f3ce7 -r c5fbc05d7347 jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java --- a/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java Fri Sep 17 14:40:38 2010 -0700 +++ b/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java Sat Sep 18 06:09:48 2010 -0400 @@ -125,12 +125,12 @@ * * # Optimistic synchronization provider * rowset.provider.classname.0=com.sun.rowset.providers.RIOptimisticProvider - * rowset.provider.vendor.0=Sun Microsystems Inc + * 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=Sun Microsystems Inc. + * rowset.provider.vendor.1=Oracle Corporation * rowset.provider.version.1=1.0 * * The SyncFactory checks this file and registers the @@ -369,7 +369,7 @@ try { // check if user is supplying his Synchronisation Provider - // Implementation if not use Sun's implementation. + // Implementation if not using Oracle's implementation. // properties.load(new FileInputStream(ROWSET_PROPERTIES)); // The rowset.properties needs to be in jdk/jre/lib when diff -r ae13809f3ce7 -r c5fbc05d7347 jdk/src/share/classes/javax/sql/rowset/spi/SyncProvider.java --- a/jdk/src/share/classes/javax/sql/rowset/spi/SyncProvider.java Fri Sep 17 14:40:38 2010 -0700 +++ b/jdk/src/share/classes/javax/sql/rowset/spi/SyncProvider.java Sat Sep 18 06:09:48 2010 -0400 @@ -91,8 +91,8 @@ * *

* A vendor can register a SyncProvider implementation class name - * with Sun Microsystems, Inc. by sending email to jdbc@sun.com. - * Sun will maintain a database listing the + * with Oracle Corporation by sending email to jdbc@sun.com. + * Oracle will maintain a database listing the * available SyncProvider implementations for use with compliant * RowSet implementations. This database will be similar to the * one already maintained to list available JDBC drivers. diff -r ae13809f3ce7 -r c5fbc05d7347 jdk/src/share/classes/javax/sql/rowset/spi/package.html --- a/jdk/src/share/classes/javax/sql/rowset/spi/package.html Fri Sep 17 14:40:38 2010 -0700 +++ b/jdk/src/share/classes/javax/sql/rowset/spi/package.html Sat Sep 18 06:09:48 2010 -0400 @@ -8,7 +8,7 @@