svn commit: r542866 - in /db/derby/code/trunk/java: drda/org/apache/derby/drda/NetworkServerControl.java drda/org/apache/derby/loc/drda/messages_en.properties testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java

[rh...@apache.org]

Author: rhillegas
Date: Wed May 30 09:37:40 2007
New Revision: 542866

URL: http://svn.apache.org/viewvc?view=rev&rev=542866
Log:
DERBY-2433: Change the message which the network server prints if it needs to install a security manager but you have not configured a user-authorization scheme.

Modified:
    db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_en.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java

Modified: db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java?view=diff&rev=542866&r1=542865&r2=542866
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java Wed May 30 09:37:40 2007
@@ -568,14 +568,7 @@
         
         if ( !authenticationRequired )
         {
-            String  errorMessage = server.localizeMessage
-                (
-                 "DRDA_NoAuthentication.S",
-                 new String[]
-                    {
-                        Property.REQUIRE_AUTHENTICATION_PARAMETER,
-                        NetworkServerControlImpl.DASHARGS[  NetworkServerControlImpl.DASHARG_UNSECURE ] }
-                );
+            String  errorMessage = server.localizeMessage( "DRDA_NoAuthentication.S", null );
 
             // this throws an exception and exits this method
             server.consoleError( errorMessage );

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_en.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_en.properties?view=diff&rev=542866&r1=542865&r2=542866
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_en.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_en.properties Wed May 30 09:37:40 2007
@@ -84,7 +84,7 @@
 DRDA_UnknownProtocol=Unknown Command Protocol version: {0}.
 DRDA_MissingLocale.I=Resources not found for current locale; switching to {0}.
 DRDA_MissingNetworkJar.S=Cannot find derbynet.jar on the classpath.
-DRDA_NoAuthentication.S=Network Server startup failed. User authentication should be enabled before the Network Server installs a security manager. Please either set the ''{0}'' system property to true or run the network server with the ''-{1}'' option.
+DRDA_NoAuthentication.S=Network Server startup failed. User authentication must be enabled before the Network Server installs a security manager. You must either enable user authentication or disable the installation of a security manager. For information on enabling user authentication, see the section of the Derby Developer's Guide entitled "Working with user authentication". Disabling the installation of a security manager is strongly discouraged in a client/server environment. However, if you must do this, you can disable the installation of a security manager by specifying the "-noSecurityManager" command line option when you bring up the Network Server.
 DRDA_SecurityInstalled.I=Security manager installed using the Basic server security policy.
 
 # Derby Network Server SYSINFO stuff

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java?view=diff&rev=542866&r1=542865&r2=542866
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java Wed May 30 09:37:40 2007
@@ -358,11 +358,17 @@
 
     private static  String  authenticationFailure()
     {
-        return "Network Server startup failed. " +
-            "User authentication should be enabled " +
-            "before the Network Server installs a security manager. " +
-            "Please either set the 'derby.connection.requireAuthentication' " +
-            "system property to true or run the network server with the '-noSecurityManager' option.";
+        return
+        "Network Server startup failed. User authentication " +
+        "must be enabled before the Network Server installs a security manager. " +
+        "You must either enable user authentication or disable the installation " +
+        "of a security manager. For information on enabling user authentication, " +
+        "see the section of the Derby Developer's Guide entitled \"Working with user authentication\". " +
+        "Disabling the installation of a security manager is strongly discouraged " +
+        "in a client/server environment. However, if you must do this, " +
+        "you can disable the installation of a security manager by specifying " +
+        "the \"-noSecurityManager\" command line option when you " +
+         "bring up the Network Server.";
     }
 
     private static  String  serverBootedOK()