db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r629661 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/ master/DerbyNet/ master/DerbyNetClient/ tests/derbynet/
Date Thu, 21 Feb 2008 00:04:46 GMT
Author: kmarsden
Date: Wed Feb 20 16:04:37 2008
New Revision: 629661

URL: http://svn.apache.org/viewvc?rev=629661&view=rev
Log:
DERBY-3443 With IBM 1.6 derbynet/sysinfo.java,
derbynet/sysinfo_withproperties and derbynet/getCurrentProperties fail
with missing line "listing properties"

Added sed file to delete the line and updated masters.


Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/sysinfo.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/sysinfo.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/getCurrentProperties.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/sysinfo_withproperties.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/getCurrentProperties_sed.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/sysinfo_sed.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/sysinfo_withproperties_sed.properties

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/sysinfo.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/sysinfo.out?rev=629661&r1=629660&r2=629661&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/sysinfo.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/sysinfo.out
Wed Feb 20 16:04:37 2008
@@ -1,7 +1,6 @@
 Testing Sysinfo
 org.apache.derby.drda.NetworkServerControl sysinfo 
 ----- Derby Network Server Information --------
------ listing properties --
 derby.drda.maxThreads=0
 derby.drda.sslMode=off
 derby.drda.keepAlive=true
@@ -33,7 +32,6 @@
 End test
 Testing Sysinfo (method)
 ----- Derby Network Server Information --------
------ listing properties --
 derby.drda.maxThreads=0
 derby.drda.sslMode=off
 derby.drda.keepAlive=true
@@ -66,7 +64,6 @@
 Testing Sysinfo (locale)
 -----Duser.language=err -Duser.country=DE org.apache.derby.drda.NetworkServerControl sysinfo

 ----- Derby Network Server Information --------
------ listing properties --
 derby.drda.maxThreads=0
 derby.drda.sslMode=off
 derby.drda.keepAlive=true

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/sysinfo.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/sysinfo.out?rev=629661&r1=629660&r2=629661&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/sysinfo.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/sysinfo.out
Wed Feb 20 16:04:37 2008
@@ -1,7 +1,6 @@
 Testing Sysinfo
 org.apache.derby.drda.NetworkServerControl sysinfo 
 ----- Derby Network Server Information --------
------ listing properties --
 derby.drda.maxThreads=0
 derby.drda.sslMode=off
 derby.drda.keepAlive=true
@@ -33,7 +32,6 @@
 End test
 Testing Sysinfo (method)
 ----- Derby Network Server Information --------
------ listing properties --
 derby.drda.maxThreads=0
 derby.drda.sslMode=off
 derby.drda.keepAlive=true
@@ -66,7 +64,6 @@
 Testing Sysinfo (locale)
 -----Duser.language=err -Duser.country=DE org.apache.derby.drda.NetworkServerControl sysinfo

 ----- Derby Network Server Information --------
------ listing properties --
 derby.drda.maxThreads=0
 derby.drda.sslMode=off
 derby.drda.keepAlive=true

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/getCurrentProperties.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/getCurrentProperties.out?rev=629661&r1=629660&r2=629661&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/getCurrentProperties.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/getCurrentProperties.out
Wed Feb 20 16:04:37 2008
@@ -1,4 +1,3 @@
------ listing properties --
 derby.drda.traceDirectory=MACHINE_SPECIFIC_DIR
 derby.drda.maxThreads=0
 derby.drda.sslMode=off
@@ -11,7 +10,6 @@
 derby.drda.host=xxxFILTERED_HOSTNAMExxx
 derby.drda.traceAll=false
 Properties with tracing on
------ listing properties --
 derby.drda.traceDirectory=MACHINE_SPECIFIC_DIR
 derby.drda.maxThreads=0
 derby.drda.sslMode=off
@@ -25,7 +23,6 @@
 derby.drda.host=xxxFILTERED_HOSTNAMExxx
 derby.drda.traceAll=false
 Properties with tracing on
------ listing properties --
 derby.drda.traceDirectory=MACHINE_SPECIFIC_DIR
 derby.drda.maxThreads=0
 derby.drda.sslMode=off

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/sysinfo_withproperties.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/sysinfo_withproperties.out?rev=629661&r1=629660&r2=629661&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/sysinfo_withproperties.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/sysinfo_withproperties.out
Wed Feb 20 16:04:37 2008
@@ -1,7 +1,6 @@
 Testing Sysinfo
 org.apache.derby.drda.NetworkServerControl sysinfo 
 ----- Derby Network Server Information --------
------ listing properties --
 derby.drda.securityMechanism=USER_ONLY_SECURITY
 derby.drda.maxThreads=0
 derby.drda.sslMode=off
@@ -34,7 +33,6 @@
 End test
 Testing Sysinfo (method)
 ----- Derby Network Server Information --------
------ listing properties --
 derby.drda.securityMechanism=USER_ONLY_SECURITY
 derby.drda.maxThreads=0
 derby.drda.sslMode=off
@@ -68,7 +66,6 @@
 Testing Sysinfo (locale)
 -----Duser.language=err -Duser.country=DE org.apache.derby.drda.NetworkServerControl sysinfo

 ----- Derby Network Server Information --------
------ listing properties --
 derby.drda.securityMechanism=USER_ONLY_SECURITY
 derby.drda.maxThreads=0
 derby.drda.sslMode=off

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/getCurrentProperties_sed.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/getCurrentProperties_sed.properties?rev=629661&r1=629660&r2=629661&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/getCurrentProperties_sed.properties
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/getCurrentProperties_sed.properties
Wed Feb 20 16:04:37 2008
@@ -21,4 +21,5 @@
 # Multiple patterns for SUBSTITUTE: comma separated <pattern;substitute> pair
 #   substitute=pattern1;substitute1,pattern2;substitute2,...,patternn;substituten
 # No commas or semicolons can be allowed in the patterns/subsitutes.
-substitute=derby.drda.traceDirectory=.*;derby.drda.traceDirectory=MACHINE_SPECIFIC_DIR
\ No newline at end of file
+substitute=derby.drda.traceDirectory=.*;derby.drda.traceDirectory=MACHINE_SPECIFIC_DIR
+delete=listing properties

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/sysinfo_sed.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/sysinfo_sed.properties?rev=629661&r1=629660&r2=629661&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/sysinfo_sed.properties
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/sysinfo_sed.properties
Wed Feb 20 16:04:37 2008
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-delete=Version,version,Java,OS,[0-9*].[0-9*].[0-9*],JRE - JDBC,traceDirectory,Unable to access
Protection Domain
+delete=Version,version,Java,OS,[0-9*].[0-9*].[0-9*],JRE - JDBC,traceDirectory,Unable to access
Protection Domain,listing properties

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/sysinfo_withproperties_sed.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/sysinfo_withproperties_sed.properties?rev=629661&r1=629660&r2=629661&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/sysinfo_withproperties_sed.properties
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/sysinfo_withproperties_sed.properties
Wed Feb 20 16:04:37 2008
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-delete=Version,version,Java,OS,[0-9*].[0-9*].[0-9*],JRE - JDBC,traceDirectory,Unable to access
Protection Domain
+delete=Version,version,Java,OS,[0-9*].[0-9*].[0-9*],JRE - JDBC,traceDirectory,Unable to access
Protection Domain,listing properties



Mime
View raw message