db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r449265 - in /db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master: NSinSameJVM.out testProperties.out
Date Sat, 23 Sep 2006 15:47:19 GMT
Author: rhillegas
Date: Sat Sep 23 08:47:18 2006
New Revision: 449265

URL: http://svn.apache.org/viewvc?view=rev&rev=449265
Log:
DERBY-1884: Fix problem with merging DERBY-1547 to the 10.2 branch.

Modified:
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/NSinSameJVM.out
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/NSinSameJVM.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/NSinSameJVM.out?view=diff&rev=449265&r1=449264&r2=449265
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/NSinSameJVM.out
(original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/NSinSameJVM.out
Sat Sep 23 08:47:18 2006
@@ -1,6 +1,6 @@
 main-NSinSameJVM: Derby drivers loaded
-Apache Derby Network Server - 10.2.1.4 - (1) started and ready to accept connections on port
20000 at xxxxxxFILTERED-TIMESTAMPxxxxxGMT 
+Apache Derby Network Server - 10.2.1.4 -(EXPECTED SUBVERSION INFO)  started and ready to
accept connections on port 20000 at xxxxxxFILTERED-TIMESTAMPxxxxxGMT 
 main-NSinSameJVM: NetworkServer started
 main-NSinSameJVM: Connected to database NSinSameJVMTestDB;create=true
 getting ready to shutdown
-Apache Derby Network Server - 10.2.1.4 - (1) shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
+Apache Derby Network Server - 10.2.1.4 -(EXPECTED SUBVERSION INFO)  shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out?view=diff&rev=449265&r1=449264&r2=449265
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out
(original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out
Sat Sep 23 08:47:18 2006
@@ -3,21 +3,21 @@
 org.apache.derby.drda.NetworkServerControl start 
 Successfully Connected
 org.apache.derby.drda.NetworkServerControl shutdown 
-Apache Derby Network Server - 10.2.1.4 - (1) shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
+Apache Derby Network Server - 10.2.1.4 -(EXPECTED SUBVERSION INFO)  shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
 Testing System properties  Port 1529 
 -----Dderby.drda.portNumber=1529 org.apache.derby.drda.NetworkServerControl start 
 Successfully Connected
 org.apache.derby.drda.NetworkServerControl shutdown -p 1529 
-Apache Derby Network Server - 10.2.1.4 - (1) shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
+Apache Derby Network Server - 10.2.1.4 -(EXPECTED SUBVERSION INFO)  shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
 Testing command line option. Port 1530
 org.apache.derby.drda.NetworkServerControl start -p 1530 
 Successfully Connected
 org.apache.derby.drda.NetworkServerControl shutdown -p 1530 
-Apache Derby Network Server - 10.2.1.4 - (1) shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
+Apache Derby Network Server - 10.2.1.4 -(EXPECTED SUBVERSION INFO)  shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
 Testing start server by specifying system properties without values
 First shutdown server started on default port by the test harness
 org.apache.derby.drda.NetworkServerControl shutdown -p 1527 
-Apache Derby Network Server - 10.2.1.4 - (1) shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
+Apache Derby Network Server - 10.2.1.4 -(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 
 ----- listing properties --
 derby.drda.maxThreads=0
@@ -58,7 +58,7 @@
 derby.drda.host=xxxFILTERED_HOSTNAMExxx
 derby.drda.traceAll=false
 org.apache.derby.drda.NetworkServerControl shutdown -p 1527 
-Apache Derby Network Server - 10.2.1.4 - (1) shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
+Apache Derby Network Server - 10.2.1.4 -(EXPECTED SUBVERSION INFO)  shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
 org.apache.derby.drda.NetworkServerControl 
 No arguments given.
 Usage: NetworkServerControl <commands> 



Mime
View raw message