Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 1764 invoked from network); 16 Jul 2010 11:04:43 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 16 Jul 2010 11:04:43 -0000 Received: (qmail 82278 invoked by uid 500); 16 Jul 2010 11:04:43 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 82181 invoked by uid 500); 16 Jul 2010 11:04:41 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 82173 invoked by uid 99); 16 Jul 2010 11:04:40 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Jul 2010 11:04:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Jul 2010 11:04:37 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B49A62388980; Fri, 16 Jul 2010 11:03:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r964754 - in /harmony/enhanced/java/trunk/classlib/modules/sql/src/main/java/javax/sql/rowset/spi: SyncFactory.java SyncProvider.java Date: Fri, 16 Jul 2010 11:03:14 -0000 To: commits@harmony.apache.org From: tellison@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100716110314.B49A62388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tellison Date: Fri Jul 16 11:03:14 2010 New Revision: 964754 URL: http://svn.apache.org/viewvc?rev=964754&view=rev Log: Apply fix for HARMONY-6591 ([classlib][sql]public static properties of SyncFactory and SyncProvider shoud NOT be "final" according to the specification) Modified: harmony/enhanced/java/trunk/classlib/modules/sql/src/main/java/javax/sql/rowset/spi/SyncFactory.java harmony/enhanced/java/trunk/classlib/modules/sql/src/main/java/javax/sql/rowset/spi/SyncProvider.java Modified: harmony/enhanced/java/trunk/classlib/modules/sql/src/main/java/javax/sql/rowset/spi/SyncFactory.java URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/sql/src/main/java/javax/sql/rowset/spi/SyncFactory.java?rev=964754&r1=964753&r2=964754&view=diff ============================================================================== --- harmony/enhanced/java/trunk/classlib/modules/sql/src/main/java/javax/sql/rowset/spi/SyncFactory.java (original) +++ harmony/enhanced/java/trunk/classlib/modules/sql/src/main/java/javax/sql/rowset/spi/SyncFactory.java Fri Jul 16 11:03:14 2010 @@ -43,17 +43,17 @@ public class SyncFactory { /** * The property name for the synchronization provider's implementation class. */ - public static final String ROWSET_SYNC_PROVIDER = "rowset.provider.classname"; //$NON-NLS-1$ + public static String ROWSET_SYNC_PROVIDER = "rowset.provider.classname"; //$NON-NLS-1$ /** * The property name for the synchronization provider's vendor name. */ - public static final String ROWSET_SYNC_VENDOR = "rowset.provider.vendor"; //$NON-NLS-1$ + public static String ROWSET_SYNC_VENDOR = "rowset.provider.vendor"; //$NON-NLS-1$ /** * The property name for the synchronization provider's version information. */ - public static final String ROWSET_SYNC_PROVIDER_VERSION = "rowset.provider.version"; //$NON-NLS-1$ + public static String ROWSET_SYNC_PROVIDER_VERSION = "rowset.provider.version"; //$NON-NLS-1$ private static SyncFactory instance = new SyncFactory(); Modified: harmony/enhanced/java/trunk/classlib/modules/sql/src/main/java/javax/sql/rowset/spi/SyncProvider.java URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/sql/src/main/java/javax/sql/rowset/spi/SyncProvider.java?rev=964754&r1=964753&r2=964754&view=diff ============================================================================== --- harmony/enhanced/java/trunk/classlib/modules/sql/src/main/java/javax/sql/rowset/spi/SyncProvider.java (original) +++ harmony/enhanced/java/trunk/classlib/modules/sql/src/main/java/javax/sql/rowset/spi/SyncProvider.java Fri Jul 16 11:03:14 2010 @@ -21,27 +21,27 @@ import javax.sql.RowSetReader; import javax.sql.RowSetWriter; public abstract class SyncProvider { - public static final int GRADE_NONE = 1; + public static int GRADE_NONE = 1; - public static final int GRADE_CHECK_MODIFIED_AT_COMMIT = 2; + public static int GRADE_CHECK_MODIFIED_AT_COMMIT = 2; - public static final int GRADE_CHECK_ALL_AT_COMMIT = 3; + public static int GRADE_CHECK_ALL_AT_COMMIT = 3; - public static final int GRADE_LOCK_WHEN_MODIFIED = 4; + public static int GRADE_LOCK_WHEN_MODIFIED = 4; - public static final int GRADE_LOCK_WHEN_LOADED = 5; + public static int GRADE_LOCK_WHEN_LOADED = 5; - public static final int DATASOURCE_NO_LOCK = 1; + public static int DATASOURCE_NO_LOCK = 1; - public static final int DATASOURCE_ROW_LOCK = 2; + public static int DATASOURCE_ROW_LOCK = 2; - public static final int DATASOURCE_TABLE_LOCK = 3; + public static int DATASOURCE_TABLE_LOCK = 3; - public static final int DATASOURCE_DB_LOCK = 4; + public static int DATASOURCE_DB_LOCK = 4; - public static final int UPDATABLE_VIEW_SYNC = 5; + public static int UPDATABLE_VIEW_SYNC = 5; - public static final int NONUPDATABLE_VIEW_SYNC = 6; + public static int NONUPDATABLE_VIEW_SYNC = 6; public SyncProvider() { super();