db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bakk...@apache.org
Subject svn commit: r329187 [49/66] - in /db/derby/code/trunk: ./ frameworks/NetworkServer/ frameworks/NetworkServer/bin/ frameworks/embedded/bin/ java/build/ java/build/org/apache/derbyBuild/ java/build/org/apache/derbyBuild/eclipse/ java/build/org/apache/der...
Date Fri, 28 Oct 2005 12:52:21 GMT
Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/LobLimits.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/LobLimits_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/LobLimits_app.properties?rev=329187&r1=329186&r2=329187&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/LobLimits_app.properties (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/LobLimits_app.properties Fri Oct 28 04:51:50 2005
@@ -1,13 +1,13 @@
-#
-# This is the system properties file for LobLimits.java
-#
-# *** DO NOT PUT PROPERTIES FOR THE DERBY SYSTEM IN THIS FILE.  
-# *** THEY BELONG IN LobLimits_derby.properties.
-#
-# This file will get handed to the test on the command line in a -p <filename>
-# argument.
-#
-# The .java test has to call util.getPropertyArg and util.startJBMS
-# to process the property file.  See any of the .java tests for this code.
-#
-database=jdbc:derby:wombat;create=true
+#
+# This is the system properties file for LobLimits.java
+#
+# *** DO NOT PUT PROPERTIES FOR THE DERBY SYSTEM IN THIS FILE.  
+# *** THEY BELONG IN LobLimits_derby.properties.
+#
+# This file will get handed to the test on the command line in a -p <filename>
+# argument.
+#
+# The .java test has to call util.getPropertyArg and util.startJBMS
+# to process the property file.  See any of the .java tests for this code.
+#
+database=jdbc:derby:wombat;create=true

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/LobLimits_app.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/build.xml?rev=329187&r1=329186&r2=329187&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/build.xml Fri Oct 28 04:51:50 2005
@@ -1,85 +1,85 @@
-<?xml version="1.0"?>
-
-<!-- ==================================================================== -->
-<!--                       Derby build file                          -->
-<!-- ==================================================================== -->
-
-<project default="FTOtestsubdir" basedir="../../../../../../../.." >
-
-<!-- ==================================================================== -->
-<!--                           Set properties                             -->
-<!-- ==================================================================== -->
-
-  <!-- User settings -->
-  <property file="${user.home}/ant.properties"/>
-
-  <!-- Set property lib dir -->
-  <property name="properties.dir" value="tools/ant/properties" />
-
-  <!-- Significant dirs -->
-  <property file="${properties.dir}/dirs.properties"/>
-  <property file="${properties.dir}/derbytesting.properties"/>
-
-  <!-- Compiler settings -->
-  <property file="${properties.dir}/sane${sanity}.properties"/>
-  <property file="${properties.dir}/defaultcompiler.properties"/>
-  <property file="${properties.dir}/${build.compiler}.properties"/>
-
-  <!-- Parser properties -->
-  <!--property file="${properties.dir}/parser.properties"/-->
-
-  <!-- Compile-time classpath properties files -->
-  <property file="${properties.dir}/extrapath.properties"/>
-  <property file="${properties.dir}/compilepath.properties"/>
-
-  <!-- Release and Version info -->
-  <property file="${properties.dir}/release.properties"/>
-
-  <!-- derby testing specific properties files -->
-  <property file="${ant.home}/properties/derbytesting.properties"/>
-  <property file="${user.home}/properties/derbytesting.properties"/>
-  <property name="this.dir" value="${derby.testing.functest.dir}/tests/largedata"/>
-
-<!--             ============ Begin Targets ==============                -->
- 
-  <target name="FTOtestsubdir" depends="compilet1,copyfiles"/>
-
-  <!-- mkdir / init target may not be necessary, just here for reference... -->
-  <target name="init">
-    <mkdir dir="${out.dir}/${derby.testing.functest.dir}/tests/largedata"/>
-  </target>
-
-  <target name="compilet1">
-    <javac
-      bootclasspath="${empty}"
-      nowarn="on"
-      debug="${debug}"
-      depend="${depend}"
-      deprecation="${deprecation}"
-      optimize="${optimize}"
-      proceed="${proceed}"
-      verbose="${verbose}" 
-      srcdir="${derby.testing.src.dir}"
-      destdir="${out.dir}">
-      <classpath>
-        <!--pathelement location="${oro}"/-->
-        <pathelement path="${compile.classpath}"/>
-      </classpath>
-      <include name="${this.dir}/*.java"/>
-    </javac>
-  </target>
-
-  <target name="copyfiles">
-    <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/largedata">
-      <fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/largedata" 
-        includesfile="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/largedata/copyfiles.ant"/>  
-    </copy>
-  </target> 
-
-
-<!--             ============= End Targets ==============                -->
-
-<!--             ============= End Project ==============                -->
-
-</project>
-
+<?xml version="1.0"?>
+
+<!-- ==================================================================== -->
+<!--                       Derby build file                          -->
+<!-- ==================================================================== -->
+
+<project default="FTOtestsubdir" basedir="../../../../../../../.." >
+
+<!-- ==================================================================== -->
+<!--                           Set properties                             -->
+<!-- ==================================================================== -->
+
+  <!-- User settings -->
+  <property file="${user.home}/ant.properties"/>
+
+  <!-- Set property lib dir -->
+  <property name="properties.dir" value="tools/ant/properties" />
+
+  <!-- Significant dirs -->
+  <property file="${properties.dir}/dirs.properties"/>
+  <property file="${properties.dir}/derbytesting.properties"/>
+
+  <!-- Compiler settings -->
+  <property file="${properties.dir}/sane${sanity}.properties"/>
+  <property file="${properties.dir}/defaultcompiler.properties"/>
+  <property file="${properties.dir}/${build.compiler}.properties"/>
+
+  <!-- Parser properties -->
+  <!--property file="${properties.dir}/parser.properties"/-->
+
+  <!-- Compile-time classpath properties files -->
+  <property file="${properties.dir}/extrapath.properties"/>
+  <property file="${properties.dir}/compilepath.properties"/>
+
+  <!-- Release and Version info -->
+  <property file="${properties.dir}/release.properties"/>
+
+  <!-- derby testing specific properties files -->
+  <property file="${ant.home}/properties/derbytesting.properties"/>
+  <property file="${user.home}/properties/derbytesting.properties"/>
+  <property name="this.dir" value="${derby.testing.functest.dir}/tests/largedata"/>
+
+<!--             ============ Begin Targets ==============                -->
+ 
+  <target name="FTOtestsubdir" depends="compilet1,copyfiles"/>
+
+  <!-- mkdir / init target may not be necessary, just here for reference... -->
+  <target name="init">
+    <mkdir dir="${out.dir}/${derby.testing.functest.dir}/tests/largedata"/>
+  </target>
+
+  <target name="compilet1">
+    <javac
+      bootclasspath="${empty}"
+      nowarn="on"
+      debug="${debug}"
+      depend="${depend}"
+      deprecation="${deprecation}"
+      optimize="${optimize}"
+      proceed="${proceed}"
+      verbose="${verbose}" 
+      srcdir="${derby.testing.src.dir}"
+      destdir="${out.dir}">
+      <classpath>
+        <!--pathelement location="${oro}"/-->
+        <pathelement path="${compile.classpath}"/>
+      </classpath>
+      <include name="${this.dir}/*.java"/>
+    </javac>
+  </target>
+
+  <target name="copyfiles">
+    <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/largedata">
+      <fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/largedata" 
+        includesfile="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/largedata/copyfiles.ant"/>  
+    </copy>
+  </target> 
+
+
+<!--             ============= End Targets ==============                -->
+
+<!--             ============= End Project ==============                -->
+
+</project>
+

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/copyfiles.ant
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/copyfiles.ant?rev=329187&r1=329186&r2=329187&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/copyfiles.ant (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/copyfiles.ant Fri Oct 28 04:51:50 2005
@@ -1,2 +1,2 @@
-lobLengthTests_app.properties
-LobLimits_app.properties
+lobLengthTests_app.properties
+LobLimits_app.properties

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/copyfiles.ant
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/lobLengthTests.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/lobLengthTests.java?rev=329187&r1=329186&r2=329187&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/lobLengthTests.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/lobLengthTests.java Fri Oct 28 04:51:50 2005
@@ -1,142 +1,142 @@
-/*
-
-   Derby - Class org.apache.derbyTesting.functionTests.tests.largedata.lobLengthTests
-
-   Copyright 2003, 2005 The Apache Software Foundation or its licensors, as applicable.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
- */
-
-package org.apache.derbyTesting.functionTests.tests.largedata;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.Statement;
-import java.sql.SQLException;
-
-import java.io.ByteArrayInputStream;
-
-import org.apache.derby.tools.ij;
-import org.apache.derby.tools.JDBCDisplayUtil;
-
-/**
- * This test is part of the "largedata" suite because the use of
- * very large LOBs can require extra memory for the server JVM.
- * If this test was run as part of the normal 'derbyall' suite,
- * it would require that any developer running the derbyall suite
- * have a machine with a good deal of memory.  And since _every_
- * developer is encouraged to run 'derbyall' before submitting
- * any patches, that would mean that _every_ developer would
- * need a machine with lots of memory--and that's something we
- * do NOT want to require.
- * 
- * The specific JVM memory requirements for this test are set in the
- * properties file for this test (lobLengthTests_app.properties).
- * It started out as -mx128M -ms128M, but that could change in the
- * future as more test cases are added to this class.  If it's not
- * at least 128M, the result will be OutOfMemory exceptions when
- * running against Network Server.
- */
-
-public class lobLengthTests {
-
-    /**
-     * Create an instance of this class and do the test.
-     */
-    public static void main(String [] args)
-    {
-        new lobLengthTests().go(args);
-    }
-
-    /**
-     * Create a JDBC connection using the arguments passed
-     * in from the harness, and then run the LOB length
-     * tests.
-     * @param args Arguments from the harness.
-     */
-    public void go(String [] args)
-    {
-        try {
-
-            // use the ij utility to read the property file and
-            // make the initial connection.
-            ij.getPropertyArg(args);
-            Connection conn = ij.startJBMS();
-
-            // Add additional tests here.
-            derby_121Test(conn);
-
-        } catch (Exception e) {
-
-            System.out.println("FAIL -- Unexpected exception:");
-            e.printStackTrace(System.out);
-
-        }
-    }
-
-    /**
-     * There was a defect (DERBY-121) where the server and client
-     * were processing lob lengths incorrectly.  For lob lengths
-     * that are represented by 24 or more bits, the server and
-     * Derby client were doing incorrect bit-shifting.  This
-     * test makes sure that problem no longer occurs.
-     */
-    private static void derby_121Test(Connection conn)
-        throws SQLException
-    {
-        System.out.println("Testing server read of lob length > 2^24 bytes.");
-
-        boolean autoc = conn.getAutoCommit();
-        conn.setAutoCommit(false);
-
-        // Create a test table.
-        Statement st = conn.createStatement();
-        st.execute("create table lobTable100M(bl blob(100M))");
-
-        PreparedStatement pSt = conn.prepareStatement(
-            "insert into lobTable100M(bl) values (?)");
-
-        // The error we're testing occurs when the server
-        // is shifting bits 24 and higher of the lob's
-        // length (in bytes).  This means that, in order
-        // to check for the error, we have to specify a
-        // lob length (in bytes) that requires at least
-        // 24 bits to represent.  Thus for a blob the
-        // length of the test data must be specified as
-        // at least 2^24 bytes (hence the '16800000' in
-        // the next line).
-        byte [] bA = new byte[16800000];
-        pSt.setBinaryStream(1,
-            new java.io.ByteArrayInputStream(bA), bA.length);
-
-        // Now try the insert; this is where the server processes
-        // the lob length.
-        try {
-            pSt.execute();
-            System.out.println("PASS.");
-        } catch (Exception e) {
-            System.out.println("FAIL -- unexpected exception:");
-            e.printStackTrace(System.out);
-        }
-
-        // Clean up.
-        try {
-            st.execute("drop table lobTable100M");
-        } catch (SQLException se) {}
-
-        conn.setAutoCommit(autoc);
-        return;
-
-    }
-}
+/*
+
+   Derby - Class org.apache.derbyTesting.functionTests.tests.largedata.lobLengthTests
+
+   Copyright 2003, 2005 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+ */
+
+package org.apache.derbyTesting.functionTests.tests.largedata;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.Statement;
+import java.sql.SQLException;
+
+import java.io.ByteArrayInputStream;
+
+import org.apache.derby.tools.ij;
+import org.apache.derby.tools.JDBCDisplayUtil;
+
+/**
+ * This test is part of the "largedata" suite because the use of
+ * very large LOBs can require extra memory for the server JVM.
+ * If this test was run as part of the normal 'derbyall' suite,
+ * it would require that any developer running the derbyall suite
+ * have a machine with a good deal of memory.  And since _every_
+ * developer is encouraged to run 'derbyall' before submitting
+ * any patches, that would mean that _every_ developer would
+ * need a machine with lots of memory--and that's something we
+ * do NOT want to require.
+ * 
+ * The specific JVM memory requirements for this test are set in the
+ * properties file for this test (lobLengthTests_app.properties).
+ * It started out as -mx128M -ms128M, but that could change in the
+ * future as more test cases are added to this class.  If it's not
+ * at least 128M, the result will be OutOfMemory exceptions when
+ * running against Network Server.
+ */
+
+public class lobLengthTests {
+
+    /**
+     * Create an instance of this class and do the test.
+     */
+    public static void main(String [] args)
+    {
+        new lobLengthTests().go(args);
+    }
+
+    /**
+     * Create a JDBC connection using the arguments passed
+     * in from the harness, and then run the LOB length
+     * tests.
+     * @param args Arguments from the harness.
+     */
+    public void go(String [] args)
+    {
+        try {
+
+            // use the ij utility to read the property file and
+            // make the initial connection.
+            ij.getPropertyArg(args);
+            Connection conn = ij.startJBMS();
+
+            // Add additional tests here.
+            derby_121Test(conn);
+
+        } catch (Exception e) {
+
+            System.out.println("FAIL -- Unexpected exception:");
+            e.printStackTrace(System.out);
+
+        }
+    }
+
+    /**
+     * There was a defect (DERBY-121) where the server and client
+     * were processing lob lengths incorrectly.  For lob lengths
+     * that are represented by 24 or more bits, the server and
+     * Derby client were doing incorrect bit-shifting.  This
+     * test makes sure that problem no longer occurs.
+     */
+    private static void derby_121Test(Connection conn)
+        throws SQLException
+    {
+        System.out.println("Testing server read of lob length > 2^24 bytes.");
+
+        boolean autoc = conn.getAutoCommit();
+        conn.setAutoCommit(false);
+
+        // Create a test table.
+        Statement st = conn.createStatement();
+        st.execute("create table lobTable100M(bl blob(100M))");
+
+        PreparedStatement pSt = conn.prepareStatement(
+            "insert into lobTable100M(bl) values (?)");
+
+        // The error we're testing occurs when the server
+        // is shifting bits 24 and higher of the lob's
+        // length (in bytes).  This means that, in order
+        // to check for the error, we have to specify a
+        // lob length (in bytes) that requires at least
+        // 24 bits to represent.  Thus for a blob the
+        // length of the test data must be specified as
+        // at least 2^24 bytes (hence the '16800000' in
+        // the next line).
+        byte [] bA = new byte[16800000];
+        pSt.setBinaryStream(1,
+            new java.io.ByteArrayInputStream(bA), bA.length);
+
+        // Now try the insert; this is where the server processes
+        // the lob length.
+        try {
+            pSt.execute();
+            System.out.println("PASS.");
+        } catch (Exception e) {
+            System.out.println("FAIL -- unexpected exception:");
+            e.printStackTrace(System.out);
+        }
+
+        // Clean up.
+        try {
+            st.execute("drop table lobTable100M");
+        } catch (SQLException se) {}
+
+        conn.setAutoCommit(autoc);
+        return;
+
+    }
+}

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/lobLengthTests.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/lobLengthTests_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/lobLengthTests_app.properties?rev=329187&r1=329186&r2=329187&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/lobLengthTests_app.properties (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/lobLengthTests_app.properties Fri Oct 28 04:51:50 2005
@@ -1,14 +1,14 @@
-#
-# This is the system properties file for lobLengthTests.java
-#
-# *** DO NOT PUT PROPERTIES FOR THE DERBY SYSTEM IN THIS FILE.  
-# *** THEY BELONG IN lobLengthTests_derby.properties.
-#
-# This file will get handed to the test on the command line in a -p <filename>
-# argument.
-#
-# The .java test has to call util.getPropertyArg and util.startJBMS
-# to process the property file.  See any of the .java tests for this code.
-#
-database=jdbc:derby:wombat;create=true
-jvmflags=-mx128M -ms128M
+#
+# This is the system properties file for lobLengthTests.java
+#
+# *** DO NOT PUT PROPERTIES FOR THE DERBY SYSTEM IN THIS FILE.  
+# *** THEY BELONG IN lobLengthTests_derby.properties.
+#
+# This file will get handed to the test on the command line in a -p <filename>
+# argument.
+#
+# The .java test has to call util.getPropertyArg and util.startJBMS
+# to process the property file.  See any of the .java tests for this code.
+#
+database=jdbc:derby:wombat;create=true
+jvmflags=-mx128M -ms128M

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/lobLengthTests_app.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/default_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/default_app.properties?rev=329187&r1=329186&r2=329187&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/default_app.properties (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/default_app.properties Fri Oct 28 04:51:50 2005
@@ -1,22 +1,22 @@
-#
-# This is the default system properties file for JSQL and JAVA tests.
-#
-# It will get handed to the test on the command line in a -p <filename>
-# argument.
-#
-# This causes ij (or the GUI on ij) to load the driver and make an
-# initial connection to the database.
-#
-# If you want to alter these to use a different driver, connect to a different
-# database, or to not be used, override this file by creating
-# a file <testname>.sysprop to be used instead of this file.
-#
-ij.defaultResourcePackage=/org/apache/derbyTesting/functionTests/tests/nist/
-ij.database=jdbc:derby:wombat
-ij.user=HU
-ij.password=HUPWD
-ij.showNoConnectionsAtStart=true
-ij.showNoCountForSelect=true
-
-# DataSource properties, only used if ij.dataSource is set
-ij.dataSource.databaseName=wombat
+#
+# This is the default system properties file for JSQL and JAVA tests.
+#
+# It will get handed to the test on the command line in a -p <filename>
+# argument.
+#
+# This causes ij (or the GUI on ij) to load the driver and make an
+# initial connection to the database.
+#
+# If you want to alter these to use a different driver, connect to a different
+# database, or to not be used, override this file by creating
+# a file <testname>.sysprop to be used instead of this file.
+#
+ij.defaultResourcePackage=/org/apache/derbyTesting/functionTests/tests/nist/
+ij.database=jdbc:derby:wombat
+ij.user=HU
+ij.password=HUPWD
+ij.showNoConnectionsAtStart=true
+ij.showNoCountForSelect=true
+
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/default_app.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/default_derby.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/default_derby.properties?rev=329187&r1=329186&r2=329187&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/default_derby.properties (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/default_derby.properties Fri Oct 28 04:51:50 2005
@@ -1,14 +1,14 @@
-# no statement cacheing is the default.
-derby.language.defaultIsolationLevel=serializable
-derby.infolog.append=true
-derby.connection.requireAuthentication=true
-derby.user.HU=HUPWD
-derby.user.FLATER=FLATERPWD
-derby.user.SUN=SUNPWD
-derby.user.CTS1=CTS1PWD
-derby.user.SULLIVAN1=SULLIVAN1PWD
-derby.user.SCHANZLE=SCHANZLEPWD
-derby.database.users.wombat=HU,FLATER,SUN,CTS1,SULLIVAN1,SCHANZLE
-derby.locks.deadlockTimeout=2
-derby.locks.waitTimeout=4
-
+# no statement cacheing is the default.
+derby.language.defaultIsolationLevel=serializable
+derby.infolog.append=true
+derby.connection.requireAuthentication=true
+derby.user.HU=HUPWD
+derby.user.FLATER=FLATERPWD
+derby.user.SUN=SUNPWD
+derby.user.CTS1=CTS1PWD
+derby.user.SULLIVAN1=SULLIVAN1PWD
+derby.user.SCHANZLE=SCHANZLEPWD
+derby.database.users.wombat=HU,FLATER,SUN,CTS1,SULLIVAN1,SCHANZLE
+derby.locks.deadlockTimeout=2
+derby.locks.waitTimeout=4
+

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/default_derby.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BaseTest.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BaseTest.java?rev=329187&r1=329186&r2=329187&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BaseTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BaseTest.java Fri Oct 28 04:51:50 2005
@@ -1,316 +1,316 @@
-/*
-
-   Derby - Class org.apache.derbyTesting.functionTests.harness.procedure
-
-   Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-*/
-
-package org.apache.derbyTesting.functionTests.tests.store;
-
-import org.apache.derby.iapi.services.sanity.SanityManager;
-
-import org.apache.derby.tools.ij;
-
-import java.sql.Connection;
-import java.sql.Statement;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-
-
-/**
-Common utility functions that can be shared across store .java tests.
-<p>
-If more than one store tests wants a function, put it here rather than copy
-it.  Hopefully going forward, with enough utility functions adding new store
-tests will be easier.  New store tests should extend this test to pick
-up access to utility routines - see OnlineCompressTest.java as an example.
-
-**/
-public abstract class BaseTest
-{
-    private static boolean debug_system_procedures_created = false;
-
-    abstract void testList(Connection conn) throws SQLException;
-
-    void runTests(String[] argv)
-        throws Throwable
-    {
-   		ij.getPropertyArg(argv); 
-        Connection conn = ij.startJBMS();
-        System.out.println("conn from ij.startJBMS() = " + conn);
-        conn.setAutoCommit(false);
-
-        try
-        {
-            testList(conn);
-        }
-        catch (SQLException sqle)
-        {
-			org.apache.derby.tools.JDBCDisplayUtil.ShowSQLException(
-                System.out, sqle);
-			sqle.printStackTrace(System.out);
-		}
-    }
-
-    public BaseTest()
-    {
-    }
-
-    protected void beginTest(
-    Connection  conn,
-    String      str)
-        throws SQLException
-    {
-        log("Beginning test: " + str);
-        conn.commit();
-    }
-
-    protected void testProgress(
-    String      str)
-        throws SQLException
-    {
-        log("Executing test: " + str);
-    }
-
-    protected void endTest(
-    Connection  conn,
-    String      str)
-        throws SQLException
-    {
-        conn.commit();
-        log("Ending test: " + str);
-    }
-
-    protected void log(String   str)
-    {
-        System.out.println(str);
-    }
-
-    protected void logError(String   str)
-    {
-        System.out.println("ERROR: " + str);
-    }
-
-    /**
-     * Simple wrapper to execute a sql string.
-     **/
-    public void executeQuery(
-    Connection  conn,
-    String      stmt_str,
-    boolean     commit_query)
-        throws SQLException
-    {
-        Statement stmt = conn.createStatement();
-        stmt.executeUpdate(stmt_str);
-        stmt.close();
-        if (commit_query)
-            conn.commit();
-    }
-
-    /**
-     * Call consistency checker on the table.
-     * <p>
-     **/
-    protected boolean checkConsistency(
-    Connection  conn,
-    String      schemaName,
-    String      tableName)
-		throws SQLException
-    {
-        Statement s = conn.createStatement();
-
-        ResultSet rs = 
-            s.executeQuery(
-                "values SYSCS_UTIL.SYSCS_CHECK_TABLE('" + 
-                schemaName + "', '" + 
-                tableName  + "')");
-
-        if (!rs.next())
-        {
-            if (SanityManager.DEBUG)
-            {
-                SanityManager.THROWASSERT("no value from values clause.");
-            }
-        }
-
-        boolean consistent = rs.getBoolean(1);
-
-        rs.close();
-
-        conn.commit();
-
-        return(consistent);
-    }
-
-    /**
-     * Create a system procedures to access SANE debug table routines.
-     * <p>
-     **/
-    protected void createDebugSystemProcedures(
-    Connection  conn)
-		throws SQLException
-    {
-        Statement s = conn.createStatement();
-        s.executeUpdate(
-            "CREATE FUNCTION D_CONGLOMID_PRINT(DBNAME VARCHAR(128), CONGLOMID INT) RETURNS VARCHAR(32000) RETURNS NULL ON NULL INPUT EXTERNAL NAME 'org.apache.derby.impl.store.raw.data.D_DiagnosticUtil.diag_conglomid' LANGUAGE JAVA PARAMETER STYLE JAVA");
-        s.executeUpdate(
-            "CREATE FUNCTION DIAG_CONGLOMID(DBNAME VARCHAR(128), CONGLOMID INT) RETURNS VARCHAR(32000) RETURNS NULL ON NULL INPUT EXTERNAL NAME 'org.apache.derby.impl.store.raw.data.D_DiagnosticUtil.diag_conglomid' LANGUAGE JAVA PARAMETER STYLE JAVA");
-        s.close();
-        conn.commit();
-
-        debug_system_procedures_created = true;
-    }
-
-    /**
-     * Return string with table information.
-     * <p>
-     * Dumps summary store information about the table, also dumps extra
-     * information about individual pages into the error log file.
-     **/
-    String dump_table(
-    Connection  conn,
-    String      schemaName,
-    String      tableName,
-    boolean     commit_transaction)
-		throws SQLException
-    {
-        if (!debug_system_procedures_created)
-            createDebugSystemProcedures(conn);
-
-        // run the following query:
-        //
-        // select
-        //     sys.systables.tablename,
-        //     sys.sysconglomerates.conglomeratenumber,
-        //     DIAG_CONGLOMID('wombat', conglomeratenumber)
-        // from sys.systables, sys.sysconglomerates
-        // where
-        //     sys.systables.tableid = sys.sysconglomerates.tableid and
-        //     sys.systables.schemaid = sys.sysconglomerates.schemaid and
-        //     sys.systables.tablename = tableName;
-        //
-        // TODO - really should join with schemaName too.
-
-        PreparedStatement ps = 
-            conn.prepareStatement(
-                "select sys.systables.tablename, sys.sysconglomerates.conglomeratenumber, DIAG_CONGLOMID('wombat', conglomeratenumber) from sys.systables, sys.sysconglomerates where sys.systables.tableid = sys.sysconglomerates.tableid and sys.systables.schemaid = sys.sysconglomerates.schemaid and sys.systables.tablename = ?");
-        ps.setString(1, tableName);
-        ResultSet rs = ps.executeQuery();
-
-        if (!rs.next())
-        {
-            if (SanityManager.DEBUG)
-            {
-                SanityManager.THROWASSERT("no value from values clause.");
-            }
-        }
-
-        String dump_table_info = rs.getString(3);
-
-        rs.close();
-
-        if (commit_transaction)
-            conn.commit();
-
-        return(dump_table_info);
-
-    }
-
-    /**
-     * Get lock table.
-     * <p>
-     * Returns a single string with a dump of the entire lock table.
-     * <p>
-     *
-	 * @return The lock table.
-     *
-     * @param conn                  The connection to use.
-     * @param include_system_locks  If true include non-user locks like those
-     *                              requested by background internal threads.
-     *
-     **/
-    protected String get_lock_info(
-    Connection  conn,
-    boolean     include_system_locks)
-		throws SQLException
-    {
-        // Run the following query to get the current locks in the system,
-        // toggling the "t.type='UserTransaction'" based on 
-        // include_system_locks input:
-        //
-        // select
-        //     cast(l.xid as char(8)) as xid,
-        //     cast(username as char(8)) as username,
-        //     cast(t.type as char(8)) as trantype,
-        //     cast(l.type as char(8)) as type,
-        //     cast(lockcount as char(3)) as cnt,
-        //     cast(mode as char(4)) as mode,
-        //     cast(tablename as char(12)) as tabname,
-        //     cast(lockname as char(10)) as lockname,
-        //     state,
-        //     status
-        // from
-        //     new org.apache.derby.diag.LockTable() l  
-        // right outer join new org.apache.derby.diag.TransactionTable() t
-        //     on l.xid = t.xid where l.tableType <> 'S' and 
-        //        t.type='UserTransaction'
-        // order by
-        //     tabname, type desc, mode, cnt, lockname;
-        String lock_query = 
-            "select cast(l.xid as char(8)) as xid, cast(username as char(8)) as username, cast(t.type as char(8)) as trantype, cast(l.type as char(8)) as type, cast(lockcount as char(3)) as cnt, cast(mode as char(4)) as mode, cast(tablename as char(12)) as tabname, cast(lockname as char(10)) as lockname, state, status from new org.apache.derby.diag.LockTable() l right outer join new org.apache.derby.diag.TransactionTable() t on l.xid = t.xid where l.tableType <> 'S' ";
-        if (!include_system_locks)
-            lock_query += "and t.type='UserTransaction' ";
-        
-        lock_query += "order by tabname, type desc, mode, cnt, lockname";
-
-        PreparedStatement ps = conn.prepareStatement(lock_query);
-
-        ResultSet rs = ps.executeQuery();
-
-        String lock_output = 
-        "xid     |username|trantype|type    |cnt|mode|tabname     |lockname  |state|status\n" +
-        "---------------------------------------------------------------------------------\n";
-        while (rs.next())
-        {
-            String username     = rs.getString(1);
-            String trantype     = rs.getString(2);
-            String type         = rs.getString(3);
-            String lockcount    = rs.getString(4);
-            String mode         = rs.getString(5);
-            String tabname      = rs.getString(6);
-            String lockname     = rs.getString(7);
-            String state        = rs.getString(8);
-            String status       = rs.getString(9);
-
-            lock_output +=
-                username + "|" +
-                trantype + "|" +
-                type     + "|" +
-                lockcount+ "|" +
-                mode     + "|" +
-                tabname  + "|" +
-                lockname + "|" +
-                state    + "|" +
-                status   + "\n";
-        }
-
-        rs.close();
-
-        return(lock_output);
-    }
-}
+/*
+
+   Derby - Class org.apache.derbyTesting.functionTests.harness.procedure
+
+   Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+package org.apache.derbyTesting.functionTests.tests.store;
+
+import org.apache.derby.iapi.services.sanity.SanityManager;
+
+import org.apache.derby.tools.ij;
+
+import java.sql.Connection;
+import java.sql.Statement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+
+
+/**
+Common utility functions that can be shared across store .java tests.
+<p>
+If more than one store tests wants a function, put it here rather than copy
+it.  Hopefully going forward, with enough utility functions adding new store
+tests will be easier.  New store tests should extend this test to pick
+up access to utility routines - see OnlineCompressTest.java as an example.
+
+**/
+public abstract class BaseTest
+{
+    private static boolean debug_system_procedures_created = false;
+
+    abstract void testList(Connection conn) throws SQLException;
+
+    void runTests(String[] argv)
+        throws Throwable
+    {
+   		ij.getPropertyArg(argv); 
+        Connection conn = ij.startJBMS();
+        System.out.println("conn from ij.startJBMS() = " + conn);
+        conn.setAutoCommit(false);
+
+        try
+        {
+            testList(conn);
+        }
+        catch (SQLException sqle)
+        {
+			org.apache.derby.tools.JDBCDisplayUtil.ShowSQLException(
+                System.out, sqle);
+			sqle.printStackTrace(System.out);
+		}
+    }
+
+    public BaseTest()
+    {
+    }
+
+    protected void beginTest(
+    Connection  conn,
+    String      str)
+        throws SQLException
+    {
+        log("Beginning test: " + str);
+        conn.commit();
+    }
+
+    protected void testProgress(
+    String      str)
+        throws SQLException
+    {
+        log("Executing test: " + str);
+    }
+
+    protected void endTest(
+    Connection  conn,
+    String      str)
+        throws SQLException
+    {
+        conn.commit();
+        log("Ending test: " + str);
+    }
+
+    protected void log(String   str)
+    {
+        System.out.println(str);
+    }
+
+    protected void logError(String   str)
+    {
+        System.out.println("ERROR: " + str);
+    }
+
+    /**
+     * Simple wrapper to execute a sql string.
+     **/
+    public void executeQuery(
+    Connection  conn,
+    String      stmt_str,
+    boolean     commit_query)
+        throws SQLException
+    {
+        Statement stmt = conn.createStatement();
+        stmt.executeUpdate(stmt_str);
+        stmt.close();
+        if (commit_query)
+            conn.commit();
+    }
+
+    /**
+     * Call consistency checker on the table.
+     * <p>
+     **/
+    protected boolean checkConsistency(
+    Connection  conn,
+    String      schemaName,
+    String      tableName)
+		throws SQLException
+    {
+        Statement s = conn.createStatement();
+
+        ResultSet rs = 
+            s.executeQuery(
+                "values SYSCS_UTIL.SYSCS_CHECK_TABLE('" + 
+                schemaName + "', '" + 
+                tableName  + "')");
+
+        if (!rs.next())
+        {
+            if (SanityManager.DEBUG)
+            {
+                SanityManager.THROWASSERT("no value from values clause.");
+            }
+        }
+
+        boolean consistent = rs.getBoolean(1);
+
+        rs.close();
+
+        conn.commit();
+
+        return(consistent);
+    }
+
+    /**
+     * Create a system procedures to access SANE debug table routines.
+     * <p>
+     **/
+    protected void createDebugSystemProcedures(
+    Connection  conn)
+		throws SQLException
+    {
+        Statement s = conn.createStatement();
+        s.executeUpdate(
+            "CREATE FUNCTION D_CONGLOMID_PRINT(DBNAME VARCHAR(128), CONGLOMID INT) RETURNS VARCHAR(32000) RETURNS NULL ON NULL INPUT EXTERNAL NAME 'org.apache.derby.impl.store.raw.data.D_DiagnosticUtil.diag_conglomid' LANGUAGE JAVA PARAMETER STYLE JAVA");
+        s.executeUpdate(
+            "CREATE FUNCTION DIAG_CONGLOMID(DBNAME VARCHAR(128), CONGLOMID INT) RETURNS VARCHAR(32000) RETURNS NULL ON NULL INPUT EXTERNAL NAME 'org.apache.derby.impl.store.raw.data.D_DiagnosticUtil.diag_conglomid' LANGUAGE JAVA PARAMETER STYLE JAVA");
+        s.close();
+        conn.commit();
+
+        debug_system_procedures_created = true;
+    }
+
+    /**
+     * Return string with table information.
+     * <p>
+     * Dumps summary store information about the table, also dumps extra
+     * information about individual pages into the error log file.
+     **/
+    String dump_table(
+    Connection  conn,
+    String      schemaName,
+    String      tableName,
+    boolean     commit_transaction)
+		throws SQLException
+    {
+        if (!debug_system_procedures_created)
+            createDebugSystemProcedures(conn);
+
+        // run the following query:
+        //
+        // select
+        //     sys.systables.tablename,
+        //     sys.sysconglomerates.conglomeratenumber,
+        //     DIAG_CONGLOMID('wombat', conglomeratenumber)
+        // from sys.systables, sys.sysconglomerates
+        // where
+        //     sys.systables.tableid = sys.sysconglomerates.tableid and
+        //     sys.systables.schemaid = sys.sysconglomerates.schemaid and
+        //     sys.systables.tablename = tableName;
+        //
+        // TODO - really should join with schemaName too.
+
+        PreparedStatement ps = 
+            conn.prepareStatement(
+                "select sys.systables.tablename, sys.sysconglomerates.conglomeratenumber, DIAG_CONGLOMID('wombat', conglomeratenumber) from sys.systables, sys.sysconglomerates where sys.systables.tableid = sys.sysconglomerates.tableid and sys.systables.schemaid = sys.sysconglomerates.schemaid and sys.systables.tablename = ?");
+        ps.setString(1, tableName);
+        ResultSet rs = ps.executeQuery();
+
+        if (!rs.next())
+        {
+            if (SanityManager.DEBUG)
+            {
+                SanityManager.THROWASSERT("no value from values clause.");
+            }
+        }
+
+        String dump_table_info = rs.getString(3);
+
+        rs.close();
+
+        if (commit_transaction)
+            conn.commit();
+
+        return(dump_table_info);
+
+    }
+
+    /**
+     * Get lock table.
+     * <p>
+     * Returns a single string with a dump of the entire lock table.
+     * <p>
+     *
+	 * @return The lock table.
+     *
+     * @param conn                  The connection to use.
+     * @param include_system_locks  If true include non-user locks like those
+     *                              requested by background internal threads.
+     *
+     **/
+    protected String get_lock_info(
+    Connection  conn,
+    boolean     include_system_locks)
+		throws SQLException
+    {
+        // Run the following query to get the current locks in the system,
+        // toggling the "t.type='UserTransaction'" based on 
+        // include_system_locks input:
+        //
+        // select
+        //     cast(l.xid as char(8)) as xid,
+        //     cast(username as char(8)) as username,
+        //     cast(t.type as char(8)) as trantype,
+        //     cast(l.type as char(8)) as type,
+        //     cast(lockcount as char(3)) as cnt,
+        //     cast(mode as char(4)) as mode,
+        //     cast(tablename as char(12)) as tabname,
+        //     cast(lockname as char(10)) as lockname,
+        //     state,
+        //     status
+        // from
+        //     new org.apache.derby.diag.LockTable() l  
+        // right outer join new org.apache.derby.diag.TransactionTable() t
+        //     on l.xid = t.xid where l.tableType <> 'S' and 
+        //        t.type='UserTransaction'
+        // order by
+        //     tabname, type desc, mode, cnt, lockname;
+        String lock_query = 
+            "select cast(l.xid as char(8)) as xid, cast(username as char(8)) as username, cast(t.type as char(8)) as trantype, cast(l.type as char(8)) as type, cast(lockcount as char(3)) as cnt, cast(mode as char(4)) as mode, cast(tablename as char(12)) as tabname, cast(lockname as char(10)) as lockname, state, status from new org.apache.derby.diag.LockTable() l right outer join new org.apache.derby.diag.TransactionTable() t on l.xid = t.xid where l.tableType <> 'S' ";
+        if (!include_system_locks)
+            lock_query += "and t.type='UserTransaction' ";
+        
+        lock_query += "order by tabname, type desc, mode, cnt, lockname";
+
+        PreparedStatement ps = conn.prepareStatement(lock_query);
+
+        ResultSet rs = ps.executeQuery();
+
+        String lock_output = 
+        "xid     |username|trantype|type    |cnt|mode|tabname     |lockname  |state|status\n" +
+        "---------------------------------------------------------------------------------\n";
+        while (rs.next())
+        {
+            String username     = rs.getString(1);
+            String trantype     = rs.getString(2);
+            String type         = rs.getString(3);
+            String lockcount    = rs.getString(4);
+            String mode         = rs.getString(5);
+            String tabname      = rs.getString(6);
+            String lockname     = rs.getString(7);
+            String state        = rs.getString(8);
+            String status       = rs.getString(9);
+
+            lock_output +=
+                username + "|" +
+                trantype + "|" +
+                type     + "|" +
+                lockcount+ "|" +
+                mode     + "|" +
+                tabname  + "|" +
+                lockname + "|" +
+                state    + "|" +
+                status   + "\n";
+        }
+
+        rs.close();
+
+        return(lock_output);
+    }
+}

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BaseTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/EncryptionTest.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/EncryptionTest.java?rev=329187&r1=329186&r2=329187&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/EncryptionTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/EncryptionTest.java Fri Oct 28 04:51:50 2005
@@ -1,74 +1,74 @@
-/*
- 
- Derby - Class org.apache.derbyTesting.functionTests.tests.store.EncryptionTest
- 
- Copyright 2002, 2005 The Apache Software Foundation or its licensors, as applicable.
- 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- 
- */
-
-package org.apache.derbyTesting.functionTests.tests.store;
-
-import java.sql.Connection;
-import java.sql.Statement;
-import java.sql.PreparedStatement;
-import java.sql.DriverManager;
-import java.util.Properties;
-import java.io.*;
-
-/**
- * check if bootpassword is not written out in plain text into service.properties
- * for an encrypted database run within the test harness.
- * In future encryption related testcases can be added to this test
- */
-public class EncryptionTest {
-    public static void main(String[] args) {
-        Connection conn = null;
-        try {
-            // use the ij utility to read the property file and
-            // make the initial connection.
-            org.apache.derby.tools.ij.getPropertyArg(args);
-            conn = org.apache.derby.tools.ij.startJBMS();
-
-            // Test 1
-            // Derby 236 - boot password should not be written out
-            // into service.properties
-            String derbyHome = System.getProperty("derby.system.home");
-
-            // read in the properties in the service.properties file of the db
-            Properties serviceProperties = new Properties();
-            File f = new File(derbyHome + "/wombat/service.properties");
-            serviceProperties.load(new FileInputStream(f.getAbsolutePath()));
-            if (serviceProperties.getProperty("bootPassword") == null)
-                report("TEST PASSED");
-            else
-                report("FAIL -- bootPassword should not be written out into service.properties");
-            
-            conn.close();
-        } catch (Throwable e) {
-            report("FAIL -- unexpected exception: " + e);
-            e.printStackTrace();
-        }
-
-    }
-
-    /**
-     * print message
-     * @param msg to print out 
-     */
-    public static void report(String msg) {
-        System.out.println(msg);
-    }
-
-}
+/*
+ 
+ Derby - Class org.apache.derbyTesting.functionTests.tests.store.EncryptionTest
+ 
+ Copyright 2002, 2005 The Apache Software Foundation or its licensors, as applicable.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ 
+ */
+
+package org.apache.derbyTesting.functionTests.tests.store;
+
+import java.sql.Connection;
+import java.sql.Statement;
+import java.sql.PreparedStatement;
+import java.sql.DriverManager;
+import java.util.Properties;
+import java.io.*;
+
+/**
+ * check if bootpassword is not written out in plain text into service.properties
+ * for an encrypted database run within the test harness.
+ * In future encryption related testcases can be added to this test
+ */
+public class EncryptionTest {
+    public static void main(String[] args) {
+        Connection conn = null;
+        try {
+            // use the ij utility to read the property file and
+            // make the initial connection.
+            org.apache.derby.tools.ij.getPropertyArg(args);
+            conn = org.apache.derby.tools.ij.startJBMS();
+
+            // Test 1
+            // Derby 236 - boot password should not be written out
+            // into service.properties
+            String derbyHome = System.getProperty("derby.system.home");
+
+            // read in the properties in the service.properties file of the db
+            Properties serviceProperties = new Properties();
+            File f = new File(derbyHome + "/wombat/service.properties");
+            serviceProperties.load(new FileInputStream(f.getAbsolutePath()));
+            if (serviceProperties.getProperty("bootPassword") == null)
+                report("TEST PASSED");
+            else
+                report("FAIL -- bootPassword should not be written out into service.properties");
+            
+            conn.close();
+        } catch (Throwable e) {
+            report("FAIL -- unexpected exception: " + e);
+            e.printStackTrace();
+        }
+
+    }
+
+    /**
+     * print message
+     * @param msg to print out 
+     */
+    public static void report(String msg) {
+        System.out.println(msg);
+    }
+
+}

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/EncryptionTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LockTableQuery.subsql
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LockTableQuery.subsql?rev=329187&r1=329186&r2=329187&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LockTableQuery.subsql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LockTableQuery.subsql Fri Oct 28 04:51:50 2005
@@ -1,54 +1,54 @@
-create view lock_table as
-select 
-    cast(username as char(8)) as username,
-    cast(t.type as char(8)) as trantype,
-    cast(l.type as char(8)) as type,
-    cast(lockcount as char(3)) as cnt,
-    mode,
-    cast(tablename as char(12)) as tabname,
-    cast(lockname as char(10)) as lockname,
-    state,
-    status
-from 
-    syscs_diag.lock_table l  right outer join syscs_diag.transaction_table t
-on l.xid = t.xid where l.tableType <> 'S' and t.type='UserTransaction';
---on l.xid = t.xid where l.tableType <> 'S' or l.tableType is null
--- order by
---     tabname, type desc, mode, cnt, lockname
-
--- lock table with system catalog locks included.
-create view full_lock_table as
-select 
-    cast(username as char(8)) as username,
-    cast(t.type as char(8)) as trantype,
-    cast(l.type as char(8)) as type,
-    cast(lockcount as char(3)) as cnt,
-    mode,
-    cast(tablename as char(12)) as tabname,
-    cast(lockname as char(10)) as lockname,
-    state,
-    status
-from 
-    syscs_diag.lock_table l right outer join syscs_diag.transaction_table t
-on l.xid = t.xid where l.tableType <> 'S' ;
-
--- lock table with no join.
-create view lock_table2 as
-select 
-    cast(l.xid as char(8)) as xid,
-    cast(l.type as char(8)) as type,
-    cast(lockcount as char(3)) as cnt,
-    mode,
-    cast(tablename as char(12)) as tabname,
-    cast(lockname as char(10)) as lockname,
-    state
-from 
-    syscs_diag.lock_table l  
-where l.tableType <> 'S' ;
-
--- transaction table with no join.
-create view tran_table as
-select 
-    *
-from 
-    syscs_diag.transaction_table;
+create view lock_table as
+select 
+    cast(username as char(8)) as username,
+    cast(t.type as char(8)) as trantype,
+    cast(l.type as char(8)) as type,
+    cast(lockcount as char(3)) as cnt,
+    mode,
+    cast(tablename as char(12)) as tabname,
+    cast(lockname as char(10)) as lockname,
+    state,
+    status
+from 
+    syscs_diag.lock_table l  right outer join syscs_diag.transaction_table t
+on l.xid = t.xid where l.tableType <> 'S' and t.type='UserTransaction';
+--on l.xid = t.xid where l.tableType <> 'S' or l.tableType is null
+-- order by
+--     tabname, type desc, mode, cnt, lockname
+
+-- lock table with system catalog locks included.
+create view full_lock_table as
+select 
+    cast(username as char(8)) as username,
+    cast(t.type as char(8)) as trantype,
+    cast(l.type as char(8)) as type,
+    cast(lockcount as char(3)) as cnt,
+    mode,
+    cast(tablename as char(12)) as tabname,
+    cast(lockname as char(10)) as lockname,
+    state,
+    status
+from 
+    syscs_diag.lock_table l right outer join syscs_diag.transaction_table t
+on l.xid = t.xid where l.tableType <> 'S' ;
+
+-- lock table with no join.
+create view lock_table2 as
+select 
+    cast(l.xid as char(8)) as xid,
+    cast(l.type as char(8)) as type,
+    cast(lockcount as char(3)) as cnt,
+    mode,
+    cast(tablename as char(12)) as tabname,
+    cast(lockname as char(10)) as lockname,
+    state
+from 
+    syscs_diag.lock_table l  
+where l.tableType <> 'S' ;
+
+-- transaction table with no join.
+create view tran_table as
+select 
+    *
+from 
+    syscs_diag.transaction_table;

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LockTableQuery.subsql
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LogChecksumRecovery.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LogChecksumRecovery.java?rev=329187&r1=329186&r2=329187&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LogChecksumRecovery.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LogChecksumRecovery.java Fri Oct 28 04:51:50 2005
@@ -1,80 +1,80 @@
-/*
-
-   Derby - Class org.apache.derbyTesting.functionTests.store.LogChecksumRecovery
-
-   Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
- */
-
-package org.apache.derbyTesting.functionTests.tests.store;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.zip.CRC32;
-import org.apache.derby.tools.ij;
-
-/*
- * Purpose of this class is to test the database recovery of 
- * the inserts executed with simulated log corruption in LogChecksumSetup.java
- * and perform some updates after a successfully boot. 
- * This test should be run after the store/LogChecksumSetup.java.
- *
- * @author <a href="mailto:suresh.thalamati@gmail.com">Suresh Thalamati</a>
- * @version 1.0
- * @see LogChecksumSetup
- */
-
-public class LogChecksumRecovery extends LogChecksumSetup {
-
-	LogChecksumRecovery()
-	{
-		super();
-	}
-	
-	private void runTest(Connection conn) throws SQLException
-	{
-		logMessage("Begin LogCheckumRecovery Test");
-		verifyData(conn, 10);
-		updateAndCorrupt(conn, 10);
-		logMessage("End LogCheckumRecovery Test");
-	}
-	
-	public static void main(String[] argv) 
-        throws Throwable
-    {
-		
-        LogChecksumRecovery lctest = new LogChecksumRecovery();
-   		ij.getPropertyArg(argv); 
-        Connection conn = ij.startJBMS();
-        conn.setAutoCommit(false);
-
-        try {
-            lctest.runTest(conn);
-        }
-        catch (SQLException sqle) {
-			org.apache.derby.tools.JDBCDisplayUtil.ShowSQLException(
-                System.out, sqle);
-			sqle.printStackTrace(System.out);
-		}
-    }
-}
-
-
-
-
-
-
-
-
-
+/*
+
+   Derby - Class org.apache.derbyTesting.functionTests.store.LogChecksumRecovery
+
+   Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+ */
+
+package org.apache.derbyTesting.functionTests.tests.store;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.zip.CRC32;
+import org.apache.derby.tools.ij;
+
+/*
+ * Purpose of this class is to test the database recovery of 
+ * the inserts executed with simulated log corruption in LogChecksumSetup.java
+ * and perform some updates after a successfully boot. 
+ * This test should be run after the store/LogChecksumSetup.java.
+ *
+ * @author <a href="mailto:suresh.thalamati@gmail.com">Suresh Thalamati</a>
+ * @version 1.0
+ * @see LogChecksumSetup
+ */
+
+public class LogChecksumRecovery extends LogChecksumSetup {
+
+	LogChecksumRecovery()
+	{
+		super();
+	}
+	
+	private void runTest(Connection conn) throws SQLException
+	{
+		logMessage("Begin LogCheckumRecovery Test");
+		verifyData(conn, 10);
+		updateAndCorrupt(conn, 10);
+		logMessage("End LogCheckumRecovery Test");
+	}
+	
+	public static void main(String[] argv) 
+        throws Throwable
+    {
+		
+        LogChecksumRecovery lctest = new LogChecksumRecovery();
+   		ij.getPropertyArg(argv); 
+        Connection conn = ij.startJBMS();
+        conn.setAutoCommit(false);
+
+        try {
+            lctest.runTest(conn);
+        }
+        catch (SQLException sqle) {
+			org.apache.derby.tools.JDBCDisplayUtil.ShowSQLException(
+                System.out, sqle);
+			sqle.printStackTrace(System.out);
+		}
+    }
+}
+
+
+
+
+
+
+
+
+

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LogChecksumRecovery.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LogChecksumRecovery1.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LogChecksumRecovery1.java?rev=329187&r1=329186&r2=329187&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LogChecksumRecovery1.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LogChecksumRecovery1.java Fri Oct 28 04:51:50 2005
@@ -1,78 +1,78 @@
-/*
-
-   Derby - Class org.apache.derbyTesting.functionTests.store.LogChecksumRecovery1
-
-   Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
- */
-
-package org.apache.derbyTesting.functionTests.tests.store;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.zip.CRC32;
-import org.apache.derby.tools.ij;
-
-/*
- * Purpose of this class is to test the database recovery of the  
- * updates statements executed in LogChecksumRecovery.java.
- * This test should be run after the store/LogChecksumRecovery.java.
- *
- * @author <a href="mailto:suresh.thalamati@gmail.com">Suresh Thalamati</a>
- * @version 1.0
- * @see LogChecksumSetup
- * @see LogChecksumRecovery
- */
-
-public class LogChecksumRecovery1 extends LogChecksumSetup {
-
-	LogChecksumRecovery1() {
-		super();
-	}
-	
-	private void runTest(Connection conn) throws SQLException
-	{
-		logMessage("Begin LogCheckumRecovery1 Test");
-		verifyData(conn, 10);
-		logMessage("End LogCheckumRecovery1 Test");
-	}
-	
-	public static void main(String[] argv) 
-        throws Throwable
-    {
-		
-        LogChecksumRecovery1 lctest = new LogChecksumRecovery1();
-   		ij.getPropertyArg(argv); 
-        Connection conn = ij.startJBMS();
-        conn.setAutoCommit(false);
-
-        try {
-            lctest.runTest(conn);
-        }
-        catch (SQLException sqle) {
-			org.apache.derby.tools.JDBCDisplayUtil.ShowSQLException(
-                System.out, sqle);
-			sqle.printStackTrace(System.out);
-		}
-    }
-}
-
-
-
-
-
-
-
-
-
+/*
+
+   Derby - Class org.apache.derbyTesting.functionTests.store.LogChecksumRecovery1
+
+   Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+ */
+
+package org.apache.derbyTesting.functionTests.tests.store;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.zip.CRC32;
+import org.apache.derby.tools.ij;
+
+/*
+ * Purpose of this class is to test the database recovery of the  
+ * updates statements executed in LogChecksumRecovery.java.
+ * This test should be run after the store/LogChecksumRecovery.java.
+ *
+ * @author <a href="mailto:suresh.thalamati@gmail.com">Suresh Thalamati</a>
+ * @version 1.0
+ * @see LogChecksumSetup
+ * @see LogChecksumRecovery
+ */
+
+public class LogChecksumRecovery1 extends LogChecksumSetup {
+
+	LogChecksumRecovery1() {
+		super();
+	}
+	
+	private void runTest(Connection conn) throws SQLException
+	{
+		logMessage("Begin LogCheckumRecovery1 Test");
+		verifyData(conn, 10);
+		logMessage("End LogCheckumRecovery1 Test");
+	}
+	
+	public static void main(String[] argv) 
+        throws Throwable
+    {
+		
+        LogChecksumRecovery1 lctest = new LogChecksumRecovery1();
+   		ij.getPropertyArg(argv); 
+        Connection conn = ij.startJBMS();
+        conn.setAutoCommit(false);
+
+        try {
+            lctest.runTest(conn);
+        }
+        catch (SQLException sqle) {
+			org.apache.derby.tools.JDBCDisplayUtil.ShowSQLException(
+                System.out, sqle);
+			sqle.printStackTrace(System.out);
+		}
+    }
+}
+
+
+
+
+
+
+
+
+

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LogChecksumRecovery1.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LogChecksumRecovery1_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LogChecksumRecovery1_app.properties?rev=329187&r1=329186&r2=329187&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LogChecksumRecovery1_app.properties (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LogChecksumRecovery1_app.properties Fri Oct 28 04:51:50 2005
@@ -1,6 +1,6 @@
-ij.protocol=jdbc:derby:csf
-derby.subSubProtocol.csf=org.apache.derbyTesting.functionTests.util.corruptio.CorruptDiskStorageFactory
-database=jdbc:derby:csf:wombat
-
-#Exclude for J2ME/Foundation - test requires java.sql.Driver
+ij.protocol=jdbc:derby:csf
+derby.subSubProtocol.csf=org.apache.derbyTesting.functionTests.util.corruptio.CorruptDiskStorageFactory
+database=jdbc:derby:csf:wombat
+
+#Exclude for J2ME/Foundation - test requires java.sql.Driver
 runwithfoundation=false

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LogChecksumRecovery1_app.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LogChecksumRecovery1_derby.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LogChecksumRecovery1_derby.properties?rev=329187&r1=329186&r2=329187&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LogChecksumRecovery1_derby.properties (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LogChecksumRecovery1_derby.properties Fri Oct 28 04:51:50 2005
@@ -1,2 +1,2 @@
-#set checkpoint interval to max to test recovery with full replay of log
-derby.storage.checkpointInterval=134217727
+#set checkpoint interval to max to test recovery with full replay of log
+derby.storage.checkpointInterval=134217727

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LogChecksumRecovery1_derby.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LogChecksumRecovery_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LogChecksumRecovery_app.properties?rev=329187&r1=329186&r2=329187&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LogChecksumRecovery_app.properties (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LogChecksumRecovery_app.properties Fri Oct 28 04:51:50 2005
@@ -1,6 +1,6 @@
-ij.protocol=jdbc:derby:csf
-derby.subSubProtocol.csf=org.apache.derbyTesting.functionTests.util.corruptio.CorruptDiskStorageFactory
-database=jdbc:derby:csf:wombat
-
-#Exclude for J2ME/Foundation - test requires java.sql.Driver
+ij.protocol=jdbc:derby:csf
+derby.subSubProtocol.csf=org.apache.derbyTesting.functionTests.util.corruptio.CorruptDiskStorageFactory
+database=jdbc:derby:csf:wombat
+
+#Exclude for J2ME/Foundation - test requires java.sql.Driver
 runwithfoundation=false

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LogChecksumRecovery_app.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LogChecksumRecovery_derby.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LogChecksumRecovery_derby.properties?rev=329187&r1=329186&r2=329187&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LogChecksumRecovery_derby.properties (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LogChecksumRecovery_derby.properties Fri Oct 28 04:51:50 2005
@@ -1,2 +1,2 @@
-#set checkpoint interval to max to test recovery with full replay of log
-derby.storage.checkpointInterval=134217727
+#set checkpoint interval to max to test recovery with full replay of log
+derby.storage.checkpointInterval=134217727

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LogChecksumRecovery_derby.properties
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message