You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2007/02/22 16:25:19 UTC
svn commit: r510549 - in /db/derby/code/trunk/java:
drda/org/apache/derby/drda/ drda/org/apache/derby/impl/drda/
drda/org/apache/derby/loc/drda/
testing/org/apache/derbyTesting/functionTests/master/
testing/org/apache/derbyTesting/functionTests/tests/d...
Author: rhillegas
Date: Thu Feb 22 07:25:17 2007
New Revision: 510549
URL: http://svn.apache.org/viewvc?view=rev&rev=510549
Log:
DERBY-2196: Commit derby-2196-10-renameOption-01.diff, which renames the security-disabling option to noSecurityManager.
Modified:
db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.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/master/derbyrunjartest.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/maxthreads.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/timeslice.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/testScript.xml
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=510549&r1=510548&r2=510549
==============================================================================
--- 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 Thu Feb 22 07:25:17 2007
@@ -534,7 +534,7 @@
* by main().</li>
* <li>The VM isn't already running a SecurityManager.</li>
* <li>The command must be "start".</li>
- * <li>The customer didn't specify the -unsecure flag on the startup command
+ * <li>The customer didn't specify the -noSecurityManager flag on the startup command
* line.</li>
* </ul>
*/
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java?view=diff&rev=510549&r1=510548&r2=510549
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java Thu Feb 22 07:25:17 2007
@@ -101,7 +101,7 @@
public final static int COMMAND_PROPERTIES = 10;
public final static int COMMAND_UNKNOWN = -1;
public final static String [] DASHARGS =
- {"p","d","u","ld","ea","ep", "b", "h", "s", "unsecure", "ssl"};
+ {"p","d","u","ld","ea","ep", "b", "h", "s", "noSecurityManager", "ssl"};
public final static int DASHARG_PORT = 0;
public final static int DASHARG_DATABASE = 1;
public final static int DASHARG_USER = 2;
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=510549&r1=510548&r2=510549
==============================================================================
--- 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 Thu Feb 22 07:25:17 2007
@@ -114,7 +114,7 @@
#
DRDA_Usage1.I=Usage: NetworkServerControl <commands>
DRDA_Usage2.I=Commands:
-DRDA_Usage3.I=start [-h <host>] [-p <portnumber>] [-unsecure] [-ssl <sslmode>]
+DRDA_Usage3.I=start [-h <host>] [-p <portnumber>] [-noSecurityManager] [-ssl <sslmode>]
DRDA_Usage4.I=shutdown [-h <host>][-p <portnumber>] [-ssl <sslmode>]
DRDA_Usage5.I=ping [-h <host>][-p <portnumber>] [-ssl <sslmode>]
DRDA_Usage6.I=sysinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/derbyrunjartest.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/derbyrunjartest.out?view=diff&rev=510549&r1=510548&r2=510549
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/derbyrunjartest.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/derbyrunjartest.out Thu Feb 22 07:25:17 2007
@@ -29,7 +29,7 @@
No arguments given.
Usage: NetworkServerControl <commands>
Commands:
-start [-h <host>] [-p <portnumber>] [-unsecure] [-ssl <sslmode>]
+start [-h <host>] [-p <portnumber>] [-noSecurityManager] [-ssl <sslmode>]
shutdown [-h <host>][-p <portnumber>] [-ssl <sslmode>]
ping [-h <host>][-p <portnumber>] [-ssl <sslmode>]
sysinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/maxthreads.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/maxthreads.out?view=diff&rev=510549&r1=510548&r2=510549
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/maxthreads.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/maxthreads.out Thu Feb 22 07:25:17 2007
@@ -9,7 +9,7 @@
Invalid value, -12, for maxthreads.
Usage: NetworkServerControl <commands>
Commands:
-start [-h <host>] [-p <portnumber>] [-unsecure] [-ssl <sslmode>]
+start [-h <host>] [-p <portnumber>] [-noSecurityManager] [-ssl <sslmode>]
shutdown [-h <host>][-p <portnumber>] [-ssl <sslmode>]
ping [-h <host>][-p <portnumber>] [-ssl <sslmode>]
sysinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]
@@ -30,7 +30,7 @@
Invalid value, a, for maxthreads.
Usage: NetworkServerControl <commands>
Commands:
-start [-h <host>] [-p <portnumber>] [-unsecure] [-ssl <sslmode>]
+start [-h <host>] [-p <portnumber>] [-noSecurityManager] [-ssl <sslmode>]
shutdown [-h <host>][-p <portnumber>] [-ssl <sslmode>]
ping [-h <host>][-p <portnumber>] [-ssl <sslmode>]
sysinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out?view=diff&rev=510549&r1=510548&r2=510549
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out Thu Feb 22 07:25:17 2007
@@ -1,16 +1,16 @@
Start testProperties to test property priority
Testing derby.properties Port 1528
-org.apache.derby.drda.NetworkServerControl start -unsecure
+org.apache.derby.drda.NetworkServerControl start -noSecurityManager
Successfully Connected
org.apache.derby.drda.NetworkServerControl shutdown
Apache Derby Network Server - 10.3.0.0 alpha -(EXPECTED SUBVERSION INFO) shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
Testing System properties Port 1529
------Dderby.drda.portNumber=1529 org.apache.derby.drda.NetworkServerControl start -unsecure
+-----Dderby.drda.portNumber=1529 org.apache.derby.drda.NetworkServerControl start -noSecurityManager
Successfully Connected
org.apache.derby.drda.NetworkServerControl shutdown -p 1529
Apache Derby Network Server - 10.3.0.0 alpha -(EXPECTED SUBVERSION INFO) shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
Testing command line option. Port 1530
-org.apache.derby.drda.NetworkServerControl start -p 1530 -unsecure
+org.apache.derby.drda.NetworkServerControl start -p 1530 -noSecurityManager
Successfully Connected
org.apache.derby.drda.NetworkServerControl shutdown -p 1530
Apache Derby Network Server - 10.3.0.0 alpha -(EXPECTED SUBVERSION INFO) shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
@@ -18,7 +18,7 @@
First shutdown server started on default port by the test harness
org.apache.derby.drda.NetworkServerControl shutdown -p 1527
Apache Derby Network Server - 10.3.0.0 alpha -(EXPECTED SUBVERSION INFO) shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
------Dderby.drda.logConnections -Dderby.drda.traceAll -Dderby.drda.traceDirectory -Dderby.drda.keepAlive -Dderby.drda.timeSlice -Dderby.drda.host -Dderby.drda.portNumber -Dderby.drda.minThreads -Dderby.drda.maxThreads -Dderby.drda.startNetworkServer -Dderby.drda.debug org.apache.derby.drda.NetworkServerControl start -unsecure
+-----Dderby.drda.logConnections -Dderby.drda.traceAll -Dderby.drda.traceDirectory -Dderby.drda.keepAlive -Dderby.drda.timeSlice -Dderby.drda.host -Dderby.drda.portNumber -Dderby.drda.minThreads -Dderby.drda.maxThreads -Dderby.drda.startNetworkServer -Dderby.drda.debug org.apache.derby.drda.NetworkServerControl start -noSecurityManager
----- listing properties --
derby.drda.maxThreads=0
derby.drda.sslMode=off
@@ -66,7 +66,7 @@
No arguments given.
Usage: NetworkServerControl <commands>
Commands:
-start [-h <host>] [-p <portnumber>] [-unsecure] [-ssl <sslmode>]
+start [-h <host>] [-p <portnumber>] [-noSecurityManager] [-ssl <sslmode>]
shutdown [-h <host>][-p <portnumber>] [-ssl <sslmode>]
ping [-h <host>][-p <portnumber>] [-ssl <sslmode>]
sysinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]
@@ -80,7 +80,7 @@
Command unknowncmd is unknown.
Usage: NetworkServerControl <commands>
Commands:
-start [-h <host>] [-p <portnumber>] [-unsecure] [-ssl <sslmode>]
+start [-h <host>] [-p <portnumber>] [-noSecurityManager] [-ssl <sslmode>]
shutdown [-h <host>][-p <portnumber>] [-ssl <sslmode>]
ping [-h <host>][-p <portnumber>] [-ssl <sslmode>]
sysinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]
@@ -94,7 +94,7 @@
Invalid number of arguments for command ping.
Usage: NetworkServerControl <commands>
Commands:
-start [-h <host>] [-p <portnumber>] [-unsecure] [-ssl <sslmode>]
+start [-h <host>] [-p <portnumber>] [-noSecurityManager] [-ssl <sslmode>]
shutdown [-h <host>][-p <portnumber>] [-ssl <sslmode>]
ping [-h <host>][-p <portnumber>] [-ssl <sslmode>]
sysinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/timeslice.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/timeslice.out?view=diff&rev=510549&r1=510548&r2=510549
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/timeslice.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/timeslice.out Thu Feb 22 07:25:17 2007
@@ -9,7 +9,7 @@
Invalid value, -12, for timeslice.
Usage: NetworkServerControl <commands>
Commands:
-start [-h <host>] [-p <portnumber>] [-unsecure] [-ssl <sslmode>]
+start [-h <host>] [-p <portnumber>] [-noSecurityManager] [-ssl <sslmode>]
shutdown [-h <host>][-p <portnumber>] [-ssl <sslmode>]
ping [-h <host>][-p <portnumber>] [-ssl <sslmode>]
sysinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]
@@ -30,7 +30,7 @@
Invalid value, a, for timeslice.
Usage: NetworkServerControl <commands>
Commands:
-start [-h <host>] [-p <portnumber>] [-unsecure] [-ssl <sslmode>]
+start [-h <host>] [-p <portnumber>] [-noSecurityManager] [-ssl <sslmode>]
shutdown [-h <host>][-p <portnumber>] [-ssl <sslmode>]
ping [-h <host>][-p <portnumber>] [-ssl <sslmode>]
sysinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties.java?view=diff&rev=510549&r1=510548&r2=510549
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties.java Thu Feb 22 07:25:17 2007
@@ -81,7 +81,7 @@
"-Dderby.drda.debug",
"org.apache.derby.drda.NetworkServerControl",
"start",
- "-unsecure",};
+ "-noSecurityManager",};
//No arguments
private static String[] cmdWithoutArgs =
@@ -219,11 +219,11 @@
}
/**
- * Add the "-unsecure" option to the arguments of the start command. This
+ * Add the "-noSecurityManager" option to the arguments of the start command. This
* prevents the server from choking on the fact that authentication isn't
* required. This allows the test to go ahead and test what it intends to,
* viz., the precedence of various property-setting techniques.
- * The authentication requirement and the "-unsecure" option were added as
+ * The authentication requirement and the "-noSecurityManager" option were added as
* part of the work for DERBY-2196.
*/
private static String[] unsecure( String cmd, String[] originalArgs )
@@ -236,7 +236,7 @@
for ( int i = 0; i < count; i++ ) { cooked[ i ] = originalArgs[ i ]; }
- cooked[ count ] = "-unsecure";
+ cooked[ count ] = "-noSecurityManager";
return cooked;
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/testScript.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/testScript.xml?view=diff&rev=510549&r1=510548&r2=510549
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/testScript.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/testScript.xml Thu Feb 22 07:25:17 2007
@@ -216,6 +216,7 @@
<antcall target="_startServer">
<param name="svrVM" value="${serverVM}"/>
<param name="srvClasspath" value="${serverClasspath}"/>
+ <param name="srvSecurity" value="-noSecurityManager"/>
</antcall>
<antcall target="_recreateDatabase"/>
@@ -302,7 +303,7 @@
<param name="fsvnVM" value="${fsvVM}"/>
<param name="fsvnCP" value="${SERVER_TRUNK}"/>
<param name="fsvnName" value="${fsvName}_serverTrunk"/>
- <param name="fsvnSecurity" value="-unsecure"/>
+ <param name="fsvnSecurity" value="-noSecurityManager"/>
</antcall>
<antcall target="_forServerVersion">