db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1339869 - in /db/derby/code/trunk/java: engine/org/apache/derby/impl/jdbc/authentication/AuthenticationServiceBase.java engine/org/apache/derby/loc/messages.xml shared/org/apache/derby/shared/common/reference/SQLState.java
Date Thu, 17 May 2012 21:24:21 GMT
Author: rhillegas
Date: Thu May 17 21:24:20 2012
New Revision: 1339869

URL: http://svn.apache.org/viewvc?rev=1339869&view=rev
Log:
DERBY-5768: Remove references to NATIVE::LOCAL from Derby messages.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/AuthenticationServiceBase.java
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml
    db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/AuthenticationServiceBase.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/AuthenticationServiceBase.java?rev=1339869&r1=1339868&r2=1339869&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/AuthenticationServiceBase.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/AuthenticationServiceBase.java
Thu May 17 21:24:20 2012
@@ -403,7 +403,7 @@ public abstract class AuthenticationServ
                 !settingToNativeLocal
                 )
             {
-                throw  StandardException.newException( SQLState.PROPERTY_BAD_NATIVE_VALUE
);
+                throw  StandardException.newException( SQLState.PROPERTY_DBO_LACKS_CREDENTIALS
);
             }
 
             // once set to NATIVE authentication, you can't change it

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml?rev=1339869&r1=1339868&r2=1339869&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml Thu May 17 21:24:20
2012
@@ -1258,7 +1258,7 @@ Guide.
 
             <msg>
                 <name>4251H</name>
-                <text>Invalid NATIVE authentication specification. Please set derby.authentication.provider
to a value of the form NATIVE:$credentialsDB or NATIVE:$credentialsDB:LOCAL (at the system
level) or NATIVE::LOCAL (at the database level).</text>
+                <text>Invalid NATIVE authentication specification. Please set derby.authentication.provider
to a value of the form NATIVE:$credentialsDB or NATIVE:$credentialsDB:LOCAL (at the system
level).</text>
            </msg>
 
             <msg>
@@ -4258,13 +4258,8 @@ ln=lower-case two-letter ISO-639 languag
             </msg>
 
             <msg>
-                <name>XCY05.S.1</name>
-                <text>Invalid setting of the derby.authentication.provider property.
NATIVE::LOCAL is the only NATIVE value accepted by derby.authentication.provider.</text>
-            </msg>
-
-            <msg>
                 <name>XCY05.S.2</name>
-                <text>Invalid setting of the derby.authentication.provider property.
This property is already set to NATIVE::LOCAL and cannot be changed.</text>
+                <text>Invalid setting of the derby.authentication.provider property.
This property is already set to enable NATIVE authentication and cannot be changed.</text>
             </msg>
 
             <msg>

Modified: db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java?rev=1339869&r1=1339868&r2=1339869&view=diff
==============================================================================
--- db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
(original)
+++ db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
Thu May 17 21:24:20 2012
@@ -261,7 +261,6 @@ public interface SQLState {
 	String PROPERTY_UNSUPPORTED_CHANGE  = "XCY02.S";
 	String PROPERTY_MISSING				= "XCY03.S";
 	String PROPERTY_SYNTAX_INVALID		= "XCY04.S";
-	String PROPERTY_BAD_NATIVE_VALUE  = "XCY05.S.1";
 	String PROPERTY_CANT_UNDO_NATIVE  = "XCY05.S.2";
 	String PROPERTY_DBO_LACKS_CREDENTIALS  = "XCY05.S.3";
 



Mime
View raw message