db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1343384 - in /db/derby/code/trunk/java: engine/org/apache/derby/iapi/sql/dictionary/ engine/org/apache/derby/impl/sql/catalog/ testing/org/apache/derbyTesting/functionTests/tests/lang/
Date Mon, 28 May 2012 20:11:08 GMT
Author: rhillegas
Date: Mon May 28 20:11:08 2012
New Revision: 1343384

URL: http://svn.apache.org/viewvc?rev=1343384&view=rev
Log:
DERBY-5688: Bump version on trunk to 10.10.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/NativeAuthenticationServiceTest.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java?rev=1343384&r1=1343383&r2=1343384&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java
Mon May 28 20:11:08 2012
@@ -123,6 +123,9 @@ public interface DataDictionary
 	/** Derby 10.9 System Catalog version */
 	public static final int DD_VERSION_DERBY_10_9		= 210;
 
+	/** Derby 10.10 System Catalog version */
+	public static final int DD_VERSION_DERBY_10_10		= 220;
+
 	// general info
 	public	static	final	String	DATABASE_ID = "derby.databaseID";
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java?rev=1343384&r1=1343383&r2=1343384&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java Mon
May 28 20:11:08 2012
@@ -162,6 +162,8 @@ public	class DD_Version implements	Forma
 			return "10.8";
 		case DataDictionary.DD_VERSION_DERBY_10_9:
 			return "10.9";
+		case DataDictionary.DD_VERSION_DERBY_10_10:
+			return "10.10";
 		default:
 			return null;
 		}

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java?rev=1343384&r1=1343383&r2=1343384&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
Mon May 28 20:11:08 2012
@@ -526,7 +526,7 @@ public final class	DataDictionaryImpl
 	public void boot(boolean create, Properties startParams) 
 			throws StandardException
 	{
-		softwareVersion = new DD_Version(this, DataDictionary.DD_VERSION_DERBY_10_9);
+		softwareVersion = new DD_Version(this, DataDictionary.DD_VERSION_DERBY_10_10);
 
 		startupParameters = startParams;
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/NativeAuthenticationServiceTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/NativeAuthenticationServiceTest.java?rev=1343384&r1=1343383&r2=1343384&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/NativeAuthenticationServiceTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/NativeAuthenticationServiceTest.java
Mon May 28 20:11:08 2012
@@ -123,6 +123,7 @@ public class NativeAuthenticationService
     private static  final   String  PROVIDER_PROPERTY = "derby.authentication.provider";
     private static  final   String  REQUIRE_AUTHENTICATION_PROPERTY = "derby.connection.requireAuthentication";
     private static  final   String  SQL_AUTHORIZATION_PROPERTY = "derby.database.sqlAuthorization";
+    private static  final   String  UPGRADE_TO_BETA_PROPERTY = "derby.database.allowPreReleaseUpgrade";
 
     private static  final   String  CREDENTIALS_DB_DOES_NOT_EXIST = "4251I";
     private static  final   String  BAD_NETWORK_AUTHENTICATION = "08001";
@@ -250,6 +251,7 @@ public class NativeAuthenticationService
             if ( _localAuthentication ) { authenticationProvider = authenticationProvider
+ ":LOCAL"; }
         }
 
+        result.put( UPGRADE_TO_BETA_PROPERTY, "true" );
         result.put( PROVIDER_PROPERTY, authenticationProvider );
 
         //



Mime
View raw message