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 2006/08/11 23:34:30 UTC

svn commit: r430902 - in /db/derby/code/branches/10.2: java/testing/org/apache/derbyTesting/functionTests/master/ java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClie...

Author: rhillegas
Date: Fri Aug 11 14:34:29 2006
New Revision: 430902

URL: http://svn.apache.org/viewvc?rev=430902&view=rev
Log:
DERBY-1678: Second attempt to bump the beta release id and update test canons accordingly. Checking in derby-1678_bumpVersionNumbers_v02.diff.

Modified:
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dbMetaDataJdbc30.out
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.out
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out
    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/dbMetaDataJdbc30.out
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out
    db/derby/code/branches/10.2/tools/ant/properties/release.properties

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out?rev=430902&r1=430901&r2=430902&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out Fri Aug 11 14:34:29 2006
@@ -62,7 +62,7 @@
 nullsAreSortedAtStart(): false
 nullsAreSortedAtEnd(): false
 getDatabaseProductName(): Apache Derby
-getDatabaseProductVersion(): 10.2.${interim}.${point} alpha
+getDatabaseProductVersion(): 10.2.1.0 beta
 getDriverVersion(): EXPECTED VERSION
 usesLocalFiles(): true
 usesLocalFilePerTable(): true

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out?rev=430902&r1=430901&r2=430902&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out Fri Aug 11 14:34:29 2006
@@ -92,7 +92,7 @@
 nullsAreSortedAtStart(): false
 nullsAreSortedAtEnd(): false
 getDatabaseProductName(): Apache Derby
-getDatabaseProductVersion(): 10.2.${interim}.${point} alpha
+getDatabaseProductVersion(): 10.2.1.0 beta
 getDriverVersion(): EXPECTED VERSION
 usesLocalFiles(): true
 usesLocalFilePerTable(): true

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dbMetaDataJdbc30.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dbMetaDataJdbc30.out?rev=430902&r1=430901&r2=430902&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dbMetaDataJdbc30.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dbMetaDataJdbc30.out Fri Aug 11 14:34:29 2006
@@ -1,5 +1,5 @@
 Test dbMetaDataJdbc30 starting
-JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.2 (10.2.${interim}.${point} alpha)
+JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.2 (10.2.1.0 beta)
 DatabaseMetaData.getURL test passed
 supportsSavepoints() : true
 supportsNamedParameters() : false

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.out?rev=430902&r1=430901&r2=430902&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.out Fri Aug 11 14:34:29 2006
@@ -13,7 +13,7 @@
 Column result scale after division is: 23
 dc / 2 = 5.55000000000000000000000
 dc / 2 = 5.55500000000000000000000
-JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.2 (10.2.${interim}.${point} alpha)
+JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.2 (10.2.1.0 beta)
 DatabaseMetaData.getURL test passed
 allTablesAreSelectable(): true
 maxColumnNameLength(): 128
@@ -149,8 +149,8 @@
 nullsAreSortedAtStart(): false
 nullsAreSortedAtEnd(): false
 getDatabaseProductName(): Apache Derby
-getDatabaseProductVersion(): 10.2.${interim}.${point} alpha
-getDriverVersion(): 10.2.${interim}.${point} alpha
+getDatabaseProductVersion(): 10.2.1.0 beta
+getDriverVersion(): 10.2.1.0 beta
 usesLocalFiles(): true
 usesLocalFilePerTable(): true
 supportsMixedCaseIdentifiers(): false

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out?rev=430902&r1=430901&r2=430902&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out Fri Aug 11 14:34:29 2006
@@ -13,7 +13,7 @@
 Column result scale after division is: 23
 dc / 2 = 5.55000000000000000000000
 dc / 2 = 5.55500000000000000000000
-JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.2 (10.2.${interim}.${point} alpha)
+JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.2 (10.2.1.0 beta)
 DatabaseMetaData.getURL test passed
 allTablesAreSelectable(): true
 maxColumnNameLength(): 128
@@ -149,8 +149,8 @@
 nullsAreSortedAtStart(): false
 nullsAreSortedAtEnd(): false
 getDatabaseProductName(): Apache Derby
-getDatabaseProductVersion(): 10.2.${interim}.${point} alpha
-getDriverVersion(): 10.2.${interim}.${point} alpha
+getDatabaseProductVersion(): 10.2.1.0 beta
+getDriverVersion(): 10.2.1.0 beta
 usesLocalFiles(): true
 usesLocalFilePerTable(): true
 supportsMixedCaseIdentifiers(): false

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out?rev=430902&r1=430901&r2=430902&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out Fri Aug 11 14:34:29 2006
@@ -43,7 +43,7 @@
 Column result scale after division is: 23
 dc / 2 = 5.55000000000000000000000
 dc / 2 = 5.55500000000000000000000
-JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.2 (10.2.${interim}.${point} alpha)
+JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.2 (10.2.1.0 beta)
 DatabaseMetaData.getURL test passed
 allTablesAreSelectable(): true
 maxColumnNameLength(): 128
@@ -179,8 +179,8 @@
 nullsAreSortedAtStart(): false
 nullsAreSortedAtEnd(): false
 getDatabaseProductName(): Apache Derby
-getDatabaseProductVersion(): 10.2.${interim}.${point} alpha
-getDriverVersion(): 10.2.${interim}.${point} alpha
+getDatabaseProductVersion(): 10.2.1.0 beta
+getDriverVersion(): 10.2.1.0 beta
 usesLocalFiles(): true
 usesLocalFilePerTable(): true
 supportsMixedCaseIdentifiers(): false

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?rev=430902&r1=430901&r2=430902&view=diff
==============================================================================
--- 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 Fri Aug 11 14:34:29 2006
@@ -1,6 +1,6 @@
 main-NSinSameJVM: Derby drivers loaded
-Apache Derby Network Server - 10.2.${interim}.${point} alpha started and ready to accept connections on port 20000 at xxxxxxFILTERED-TIMESTAMPxxxxxGMT 
+Apache Derby Network Server - 10.2.1.0 beta 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.${interim}.${point} alpha shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
+Apache Derby Network Server - 10.2.1.0 beta shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/dbMetaDataJdbc30.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/dbMetaDataJdbc30.out?rev=430902&r1=430901&r2=430902&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/dbMetaDataJdbc30.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/dbMetaDataJdbc30.out Fri Aug 11 14:34:29 2006
@@ -1,5 +1,5 @@
 Test dbMetaDataJdbc30 starting
-JDBC Driver 'Apache Derby Embedded JDBC Driver', version 10.2 (10.2.${interim}.${point} alpha)
+JDBC Driver 'Apache Derby Embedded JDBC Driver', version 10.2 (10.2.1.0 beta)
 DatabaseMetaData.getURL test passed
 supportsSavepoints() : true
 supportsNamedParameters() : false

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out?rev=430902&r1=430901&r2=430902&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out Fri Aug 11 14:34:29 2006
@@ -13,7 +13,7 @@
 Column result scale after division is: 23
 dc / 2 = 5.55000000000000000000000
 dc / 2 = 5.55500000000000000000000
-JDBC Driver 'Apache Derby Embedded JDBC Driver', version 10.2 (10.2.${interim}.${point} alpha)
+JDBC Driver 'Apache Derby Embedded JDBC Driver', version 10.2 (10.2.1.0 beta)
 DatabaseMetaData.getURL test passed
 allTablesAreSelectable(): true
 maxColumnNameLength(): 128
@@ -149,8 +149,8 @@
 nullsAreSortedAtStart(): false
 nullsAreSortedAtEnd(): false
 getDatabaseProductName(): Apache Derby
-getDatabaseProductVersion(): 10.2.${interim}.${point} alpha
-getDriverVersion(): 10.2.${interim}.${point} alpha
+getDatabaseProductVersion(): 10.2.1.0 beta
+getDriverVersion(): 10.2.1.0 beta
 usesLocalFiles(): true
 usesLocalFilePerTable(): true
 supportsMixedCaseIdentifiers(): false

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out?rev=430902&r1=430901&r2=430902&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out Fri Aug 11 14:34:29 2006
@@ -43,7 +43,7 @@
 Column result scale after division is: 23
 dc / 2 = 5.55000000000000000000000
 dc / 2 = 5.55500000000000000000000
-JDBC Driver 'Apache Derby Embedded JDBC Driver', version 10.2 (10.2.${interim}.${point} alpha)
+JDBC Driver 'Apache Derby Embedded JDBC Driver', version 10.2 (10.2.1.0 beta)
 DatabaseMetaData.getURL test passed
 allTablesAreSelectable(): true
 maxColumnNameLength(): 128
@@ -179,8 +179,8 @@
 nullsAreSortedAtStart(): false
 nullsAreSortedAtEnd(): false
 getDatabaseProductName(): Apache Derby
-getDatabaseProductVersion(): 10.2.${interim}.${point} alpha
-getDriverVersion(): 10.2.${interim}.${point} alpha
+getDatabaseProductVersion(): 10.2.1.0 beta
+getDriverVersion(): 10.2.1.0 beta
 usesLocalFiles(): true
 usesLocalFilePerTable(): true
 supportsMixedCaseIdentifiers(): false

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?rev=430902&r1=430901&r2=430902&view=diff
==============================================================================
--- 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 Fri Aug 11 14:34:29 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.${interim}.${point} alpha shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
+Apache Derby Network Server - 10.2.1.0 beta 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.${interim}.${point} alpha shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
+Apache Derby Network Server - 10.2.1.0 beta 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.${interim}.${point} alpha shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
+Apache Derby Network Server - 10.2.1.0 beta 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.${interim}.${point} alpha shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
+Apache Derby Network Server - 10.2.1.0 beta 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.${interim}.${point} alpha shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
+Apache Derby Network Server - 10.2.1.0 beta shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
 org.apache.derby.drda.NetworkServerControl 
 No arguments given.
 Usage: NetworkServerControl <commands> 

Modified: db/derby/code/branches/10.2/tools/ant/properties/release.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/tools/ant/properties/release.properties?rev=430902&r1=430901&r2=430902&view=diff
==============================================================================
--- db/derby/code/branches/10.2/tools/ant/properties/release.properties (original)
+++ db/derby/code/branches/10.2/tools/ant/properties/release.properties Fri Aug 11 14:34:29 2006
@@ -1,9 +1,9 @@
-#Wed Jul 19 08:21:42 PDT 2006
-drdamaint=0
-maint=1000000
+#Fri Aug 11 13:56:32 PDT 2006
 major=10
+maint=1000000
+drdamaint=0
 minor=2
 eversion=10.2
-beta=true
 copyright.comment=Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+beta=true
 vendor=The Apache Software Foundation