db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r432679 [1/3] - in /db/derby/code/branches/10.2: ./ java/client/org/apache/derby/client/am/ java/drda/org/apache/derby/impl/drda/ java/engine/org/apache/derby/impl/sql/compile/ java/testing/ java/testing/org/apache/derbyTesting/functionTest...
Date Fri, 18 Aug 2006 18:54:32 GMT
Author: rhillegas
Date: Fri Aug 18 11:54:23 2006
New Revision: 432679

URL: http://svn.apache.org/viewvc?rev=432679&view=rev
Log:
DERBY-1725: Merge trunk into 10.2 branch from 431745 through 432645. Merges in changes applied to the following JIRAs: DERBY-244 DERBY-1710 DERBY-1712 DERBY-1555 DERBY-1701 DERBY-1691 DERBY-1681 DERBY-1032 DERBY-1692.

Added:
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/_Suite.java
      - copied unchanged from r432660, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/_Suite.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/blobclob4BLOB_sed.properties
      - copied unchanged from r432660, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/blobclob4BLOB_sed.properties
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
      - copied unchanged from r432660, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/junit/
      - copied from r432660, db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/junit/BaseJDBCTestCase.java
      - copied unchanged from r432660, db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseJDBCTestCase.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/junit/BaseJDBCTestSetup.java
      - copied unchanged from r432660, db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseJDBCTestSetup.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java
      - copied unchanged from r432660, db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/junit/CleanDatabaseTestSetup.java
      - copied unchanged from r432660, db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/CleanDatabaseTestSetup.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/junit/JDBC.java
      - copied unchanged from r432660, db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBC.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/junit/JDBCClient.java
      - copied unchanged from r432660, db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCClient.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/junit/NetworkServerTestSetup.java
      - copied unchanged from r432660, db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/NetworkServerTestSetup.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java
      - copied unchanged from r432660, db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/junit/SystemPropertyTestSetup.java
      - copied unchanged from r432660, db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SystemPropertyTestSetup.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java
      - copied unchanged from r432660, db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/junit/build.xml
      - copied unchanged from r432660, db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/build.xml
Removed:
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourcePropertiesTest_app.properties
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/util/BaseJDBCTestCase.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/util/BaseJDBCTestSetup.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/util/BaseTestCase.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/util/CleanDatabaseTestSetup.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/util/JDBC.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/util/JDBCClient.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/util/SecurityManagerSetup.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/util/SystemPropertyTestSetup.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/util/TestConfiguration.java
Modified:
    db/derby/code/branches/10.2/KEYS
    db/derby/code/branches/10.2/build.xml
    db/derby/code/branches/10.2/java/client/org/apache/derby/client/am/Statement.java
    db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
    db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/sql/compile/SetOperatorNode.java
    db/derby/code/branches/10.2/java/testing/build.xml
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/harness/ProcessStreamResult.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/blobclob4BLOB.out
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/SetQueryTimeoutTest.out
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ByteArrayCombinerStreamTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ShutDownDBWhenNSShutsDownTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SqlExceptionTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SuicideOfStreaming.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/MessageBundleTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/AutoloadBooting.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/AutoloadTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobClobTestSetup.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/CallableStatementTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/CallableStatementTestSetup.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ClobTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ClosedObjectTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/DataSourceTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/JDBC40TranslationTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ParameterMetaDataWrapperTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/PreparedStatementTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetMetaDataTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/RowIdNotImplementedTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/SetObjectUnsupportedTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementEventsTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementTestSetup.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/UnsupportedVetter.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/VerifySignatures.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/XA40Test.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BLOBDataModelSetup.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BLOBTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ConcurrencyTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourcePropertiesTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/HoldabilityTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ProcedureTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetCloseTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURBaseTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURDataModelSetup.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURQueryMixTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ScrollResultSetTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SetQueryTimeoutTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/URCoveringIndexTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/UpdateXXXTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/derbyNet/OwnServerTests.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangScripts.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/PrepareExecuteDDL.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/build.xml
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/perf/StartupExistingDBTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/perf/StartupNewDBTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootAllTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/tools/sysinfo_api.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/util/ScriptTestCase.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/util/TestDataSourceFactory.java
    db/derby/code/branches/10.2/tools/ant/properties/dirs.properties
    db/derby/code/branches/10.2/tools/release/build.xml

Modified: db/derby/code/branches/10.2/KEYS
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/KEYS?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/KEYS (original)
+++ db/derby/code/branches/10.2/KEYS Fri Aug 18 11:54:23 2006
@@ -350,3 +350,80 @@
 tDrSVQ==
 =Rbhm
 -----END PGP PUBLIC KEY BLOCK-----
+pub   1024D/990ED4AA 2006-08-16
+uid                  Knut Anders Hatlen <kahatlen@apache.org>
+sig 3        990ED4AA 2006-08-16  Knut Anders Hatlen <kahatlen@apache.org>
+sub   2048g/165BD1F7 2006-08-16
+sig          990ED4AA 2006-08-16  Knut Anders Hatlen <kahatlen@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.5 (FreeBSD)
+
+mQGiBETiuQURBADTblCPi5gXDXhT88Yp2YPAmeb5FMFyV1oPZfwsq/1cj8+BfqpY
+ZaqUcqw0l0aCHiCFOagqlvLoy9A4NAeRBgcx3Q1sfWEqSbvqy3jYS9zUpS2Fx9fb
+X6zrtLMNswK9pzkUgtdxBvBKMcjbSMMLfScAuHTnTFP/mXZapXGW1IPJqwCgmXBg
+eFsYAjeAWxIUHyv7hYeZ7wMEAMX714eZUVR+jyjcw6iDMJbhFaIVm5WVT/+Jf5Eh
+mf4IAYRkSCANX8s4jZfukUs6kptGRllwqstF7maFDRqdOGkN0unhUgvv0pTEOtXn
+0FtV2wR2dP0N0yxhOYuedishTi9OOo8llDWRUaaazKwjYIXQJIep5ViN86rvrbCE
+Y9TQA/wJKF5qoos/FPSECly18wzuCcgnTWHw3bYjQbUlOJ8HeqYS5vQI5hUHuUXA
+4hjVSMoTDbfVVhDRDML3ACd+qgIsNKVRi0mWRFAz4ZBTmrJiWqdVX36xAjeedXkD
+1vk/VMWVjpJms3EDDFo+hOWm24diefWtnDCvf0WY9s4N96ZZrLQoS251dCBBbmRl
+cnMgSGF0bGVuIDxrYWhhdGxlbkBhcGFjaGUub3JnPohgBBMRAgAgBQJE4rkFAhsD
+BgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQ4eHysJkO1KqNCgCfehVc27Q+dhwb
+IrtoTTvJDrKdD1oAnReLlobKcAIH6ToqWhc1KPyQrxfSuQINBETiuQkQCACP/g0D
+cjg+SPXowQqRKcIla0MUINusXCHxKcNRqRpcCEiSPNcBko1PpGjiVcIfP1urAkVV
+c8/Vey4l3LI00kapGOsXK//v/BJksnzWNNY5Q3lVEVwI57hVhMPMihn+4aE93mh2
+p/k2f2DldDPOEBEanrJiCmGtTWo7cX4sTPYwJwNwbUuApp+uI0QDs6dZSElA3pdj
+u+6JwZYDiBnrwv2YWBXgIeSQ3PhKjKS1MoybYj47b+jp9dBL1tvf0hBts2CaVBy3
+V/M98L32pm/OZrv+nm9BPg7utT+wsX+9XT5l6F7jjteYU4G8GXgFFyKldE+ZLAro
+BRAgVtPJ7FXmwJ/DAAMFB/48r4qpbDp4aaBVyOgSDuX5nDGIF+oXNqP76F0Wz5+1
+D8hiE7fweRLD9vr3o7u278GUI/IFQAZLulcw5khboScNv9eoli0jMnZPQxDgM4BD
+kmZVa+JNHUaALf41N5cGB6yJ+1G3KSY24VKd8aqBoiedLCsDibe/unq2CWjr4xZW
+A73nWzZ7RsrX07xH7hfUulRk2p5heJwgcyyfsazm38ugqP1jL+XW/6jm6He5MMt6
+wc2MWUkoFCL+pMh7RK6KTT1YBsrX6e/MDJznXaEyIj3+2pTsyzqlFxPG9loDsSVd
+/dig5bU9lRajodg+yupgpm9yNEStTody40UOxw96ZPXwiEkEGBECAAkFAkTiuQkC
+GwwACgkQ4eHysJkO1KqpMwCcCZj3gJnnOOEJwHPP9E8dPUndDfUAnil3o1vuzEA/
+VxFd+IhqD85ykUrt
+=Nxxr
+-----END PGP PUBLIC KEY BLOCK-----
+pub   1024D/88D83722 2006-08-16
+uid                  Andreas Korneliussen <andreas.korneliussen@broadpark.no>
+sig 3        88D83722 2006-08-16  Andreas Korneliussen <andreas.korneliussen@broadpark.no>
+uid                  Andreas Korneliussen <andreask@apache.org>
+sig 3        88D83722 2006-08-16  Andreas Korneliussen <andreas.korneliussen@broadpark.no>
+sub   2048g/F920EBC6 2006-08-16
+sig          88D83722 2006-08-16  Andreas Korneliussen <andreas.korneliussen@broadpark.no>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.4 (SunOS)
+
+mQGiBETi5coRBACF0SAt1faQn4+TPcQMwXtyl61X5vgKOxLDZjQ85ZVL/AWyaj54
+UnoV+5e8MqIlsp+829z5iMT2kPGdcWQWM+Ormj5tniFFg0GNw7LL9+R4mnfzFsBQ
+/ourirBUuy+r+5apRO0trs2naSBjLgGBtSxLy5U3rGzuZYh7NVSUqoZI0wCg534n
+DkZoiN7r44Cv+aGsdpODAQ8D/ijqaIXO7nn5jGl4bWGP8c7bOjOsEl+ahQkP/tgt
+YkPjz1BxAbswir2j6jIyfRDr3NtWyfuF50MwFwJkRSWh9iriZLbbH2QzG6y2bhdE
+ATVSoqK4EpeaU0K9ycEUIKo0+UpeM+97oVaFRzcGp4D2bJVJfhD7XhPwGZ1ZBC30
+FAy9A/9Mu/tNqO7lJSCc5Vb/xm75yja+DC61njaJTMRvwaU0wJQzi3FVHl1JhRYy
+CI2cXb8gtQXqwYOAInVCv+HFP29Vif6EoDQ8p8kV4uZeThtPAHaAONbgAhw8U5vF
+rm8NwkrJm9I85q35Oy2kbuPPMfn3WseWgRwYiZ2RMDZRUQmKsrQqQW5kcmVhcyBL
+b3JuZWxpdXNzZW4gPGFuZHJlYXNrQGFwYWNoZS5vcmc+iGAEExECACAFAkTi5coC
+GwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRDfoOnJiNg3IhE0AJ9KEg+lKnq9
+tOs0YLQjRkyOK+h4oQCgyDR2ZjZdT6zUnI5Bo0w+bzw1BDq0OEFuZHJlYXMgS29y
+bmVsaXVzc2VuIDxhbmRyZWFzLmtvcm5lbGl1c3NlbkBicm9hZHBhcmsubm8+iGAE
+ExECACAFAkTi5jkCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRDfoOnJiNg3
+ItmnAKCCw2HTX/VUGsc5tcmuewOR1LVhcACgjQKjdZ56vfu5hTG62MJB2PWVPD65
+Ag0EROLl4xAIAIFHg90B+QrOH4rCFul12kyI/CPOFdcIzTtW4fQOuUlHave/b3ez
+7sGbobjj3nexyvGIG9K4rKiXbticfkU6FfmWGFWV+6AbRM8i+qYdSnAck9qBO8+4
+TRf/qwhEh3i3YLcgrMdyRS9ifWDHSImqfllawP4dBdyhLu2g7Pz7Xs1+uaRjzi7+
+2wJ6nS7BCYY+fmt5OM44So0R/tO2r793LULw3TgxkbO9AkOoIdOg71tuCT3VFyLq
+jGxfrnZgfRNcnPLnUyRNAw2VoWVe1IGGlNG5el1w83tr4ugAKsFV+cHqW4bWdHGE
+b1dWVUv033evlrfaau+TEu/cp2LHVE1zULcAAwUH/07+M4cOCnT6l3xNuS93/mSx
+areXSwZ33t/LahT6J9fAwhtac6MDTkeTaDxcDuSTKkCdNlyPetR8jFmfZTu7oj+k
+PwqlSfQUHi1WHmk3Fs/9HuF+71P1C4K2789MSLnFsu94KQ3hTqbJRZbayDwoU4wZ
+HSQfMlnh22INf47iD3enORbLf2Lg3PWHVc3Xs/ag4hPQwDahKEvX7TZsHbt3LNud
+hMcdcTVEAX1kP5PL/zCxb3/YMM3l5m0zG35d+bW89P4D+3SWt4Oc09vLaGmMc9Zx
+hnBxiZzNcaNaoLPKN9wWu1q/y2J44zZDIv9gfW2vyJA2rinPRncN/9flHYXzo4iI
+SQQYEQIACQUCROLl4wIbDAAKCRDfoOnJiNg3In9mAJwOJiJ+8s4BSFd+u9JzW2wg
+1D3dCgCgyDPdCE3+3sl/C/VvoZ0PdhnuYAE=
+=+RoX
+-----END PGP PUBLIC KEY BLOCK-----

Modified: db/derby/code/branches/10.2/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/build.xml?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/build.xml (original)
+++ db/derby/code/branches/10.2/build.xml Fri Aug 18 11:54:23 2006
@@ -894,7 +894,6 @@
   <target name="initjars" depends="setsanityname,getsvnversion">
     <property name="derby.jar.dir" value="${basedir}/jars/${sanity.name}"/>
     <property name="derby.jar.topdir" value="${basedir}/jars"/>
-    <property name="manifest.file" value="${derby.jar.dir}/lists/smf.mf"/>
     <mkdir dir="${derby.jar.dir}"/>
     <mkdir dir="${derby.jar.dir}/lists"/>
     <loadfile srcFile="${basedir}/changenumber.properties"
@@ -1021,20 +1020,24 @@
 
   <target name="derbyjarwithoutosgi" depends="checkosgijar" if="osgijar.unavailable">
 
-    <antcall target="make-core-derbyjar-manifest"/>
+    <antcall target="make-core-derbyjar-manifest">
+      <param name="manifest.file" value="${derby.jar.dir}/lists/smf.mf"/>
+    </antcall>
 
     <jar destfile="${derby.jar.dir}/derby.jar"
          basedir="${out.dir}"
 	 includesfile="${derby.jar.dir}/lists/derby.list"
          compress="true"
          filesonly="true"
-         manifest="${manifest.file}"/>
+         manifest="${derby.jar.dir}/lists/smf.mf"/>
 
   </target>
 
   <target name="derbyjarwithosgi" depends="checkosgijar" if="osgijar.available">
 
-    <antcall target="make-core-derbyjar-manifest"/>
+    <antcall target="make-core-derbyjar-manifest">
+      <param name="manifest.file" value="${derby.jar.dir}/lists/smf.mf"/>
+    </antcall>
 
     <!-- add extra osgi bits to manifest -->
 
@@ -1049,7 +1052,7 @@
 	 includesfile="${derby.jar.dir}/lists/derby.list"
          compress="true"
          filesonly="true"
-         manifest="${manifest.file}"/>
+         manifest="${derby.jar.dir}/lists/smf.mf"/>
 
   </target>
 
@@ -1083,10 +1086,10 @@
     	<section name="org/apache/derby/iapi/services/i18n/">
     	  <attribute name="Sealed" value="false"/>
     	</section>
-    		<section name="org/apache/derby/impl/jdbc/">
+        <section name="org/apache/derby/iapi/tools/i18n/">
     	  <attribute name="Sealed" value="false"/>
     	</section>
-    		<section name="org/apache/derby/iapi/tools/i18n/">
+    	<section name="org/apache/derby/impl/jdbc/">
     	  <attribute name="Sealed" value="false"/>
     	</section>
     	<section name="org/apache/derby/loc/">
@@ -1097,13 +1100,6 @@
     	</section>
     </manifest> 
 
-    <jar destfile="${derby.jar.dir}/derby.jar"
-         basedir="${out.dir}"
-	 includesfile="${derby.jar.dir}/lists/derby.list"
-         compress="true"
-         filesonly="true"
-         manifest="${manifest.file}"/>
-
   </target>
 
 <!-- - - - - - - - - - - - -  derbytools.jar target - - - - - - - - - - -->
@@ -1256,28 +1252,15 @@
 
     <!-- copy boilerplate common to derby jar files -->
     <antcall target="meta-inf-common"/>
+    <antcall target="make-core-derbyjar-manifest">
+      <param name="manifest.file" value="${derby.jar.dir}/lists/smfclient.mf"/>
+    </antcall>
 
     <!-- declare the client driver for autoloading by the JDBC 4 DriverManager -->
     <antcall target="declare-autoloadable-driver">
       <param name="driver.name" value="org.apache.derby.jdbc.ClientDriver"/>
     </antcall>
 
-    <manifest file="${derby.jar.dir}/lists/smfclient.mf">
-      	<attribute name="Sealed" value="true"/>
-    	<section name="org/apache/derby/jdbc/">
-    	  <attribute name="Sealed" value="false"/>
-    	</section>
-      	<section name="org/apache/derby/tools">
-    	  <attribute name="Sealed" value="false"/>
-    	</section>
-    	<section name="org/apache/derby/impl/tools/sysinfo/">
-    	  <attribute name="Sealed" value="false"/>
-    	</section>
-    	<section name="org/apache/derby/loc/">
-    	  <attribute name="Sealed" value="false"/>
-    	</section>
-    </manifest> 
- 	
     <delete file="${derby.jar.dir}/derbyclient.jar"/>
 
     <jar destfile="${derby.jar.dir}/derbyclient.jar"
@@ -1566,23 +1549,23 @@
     <property file="${basedir}/snapshot/maintversion.properties"/>
     <zip destfile="${basedir}/snapshot/db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}.zip">
       <zipfileset prefix="db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}/lib" dir="${basedir}/jars/insane" includes="*.jar,*.war"/>
-      <zipfileset prefix="db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}" includes="COPYRIGHT,LICENSE,NOTICE,README,frameworks/**,javadoc/publishedapi/**"/>
+      <zipfileset prefix="db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}" includes="bin/**,COPYRIGHT,LICENSE,NOTICE,README,javadoc/publishedapi/**"/>
     </zip>
     <tar destfile="${basedir}/snapshot/db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}.tar.gz"
          compression="gzip">
       <tarfileset prefix="db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}/lib" dir="${basedir}/jars/insane" includes="*.jar,*.war"/>
-      <tarfileset prefix="db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}" includes="COPYRIGHT,LICENSE,NOTICE,README,frameworks/**,javadoc/publishedapi/**"/>
+      <tarfileset prefix="db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}" includes="bin,COPYRIGHT,LICENSE,NOTICE,README,javadoc/publishedapi/**"/>
     </tar>
 
     <!-- debug archives - DERBY-178 --> 
     <zip destfile="${basedir}/snapshot/db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}.zip">
       <zipfileset prefix="db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}/lib" dir="${basedir}/jars/sane" includes="*.jar,*.war"/>
-      <zipfileset prefix="db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}" includes="COPYRIGHT,LICENSE,NOTICE,CHANGES,README,frameworks/**,javadoc/publishedapi/**"/>
+      <zipfileset prefix="db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}" includes="bin/**,COPYRIGHT,LICENSE,NOTICE,CHANGES,README,javadoc/publishedapi/**"/>
     </zip>
     <tar destfile="${basedir}/snapshot/db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}.tar.gz"
          compression="gzip">
       <tarfileset prefix="db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}/lib" dir="${basedir}/jars/sane" includes="*.jar,*.war"/>
-      <tarfileset prefix="db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}" includes="COPYRIGHT,LICENSE,NOTICE,README,frameworks/**,javadoc/publishedapi/**"/>
+      <tarfileset prefix="db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}" includes="bin/**,COPYRIGHT,LICENSE,NOTICE,README,javadoc/publishedapi/**"/>
     </tar>
 
     <copy file="${basedir}/jars/insane/derby_core_plugin_${major}.${minor}.${interim}.zip"

Modified: db/derby/code/branches/10.2/java/client/org/apache/derby/client/am/Statement.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/client/org/apache/derby/client/am/Statement.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/client/org/apache/derby/client/am/Statement.java (original)
+++ db/derby/code/branches/10.2/java/client/org/apache/derby/client/am/Statement.java Fri Aug 18 11:54:23 2006
@@ -1866,10 +1866,14 @@
             Section newSection = null;
             boolean repositionedCursor = false;
 
-            if (doWriteTimeout) {
+            // DERBY-1692: Statement objects need to send the timeout value for
+            // each execution since the server will create a new statement
+            // object each time. Since the server forgets the timeout value,
+            // doWriteTimeout should not be reset, and it is OK not to send the
+            // timeout value when it is zero.
+            if (doWriteTimeout && (timeout_ > 0)) {
                 timeoutArrayList.set(0, TIMEOUT_STATEMENT + timeout_);
                 writeSetSpecialRegister(timeoutArrayList);
-                doWriteTimeout = false;
                 timeoutSent = true;
             }
             switch (sqlMode_) {

Modified: db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java (original)
+++ db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java Fri Aug 18 11:54:23 2006
@@ -50,6 +50,7 @@
 import java.util.Vector;
 
 import org.apache.derby.drda.NetworkServerControl;
+import org.apache.derby.iapi.error.StandardException;
 import org.apache.derby.iapi.jdbc.DRDAServerStarter;
 import org.apache.derby.iapi.reference.Attribute;
 import org.apache.derby.iapi.reference.DRDAConstants;
@@ -662,10 +663,13 @@
 				// If we can't shutdown cloudscape. Perhaps authentication is
 				// set to true or some other reason. We will just print a
 				// message to the console and proceed.
-				if (((EmbedSQLException)sqle).getMessageId() !=
-				  SQLState.CLOUDSCAPE_SYSTEM_SHUTDOWN)
+				String expectedState =
+					StandardException.getSQLStateFromIdentifier(
+							SQLState.CLOUDSCAPE_SYSTEM_SHUTDOWN);
+				if (!expectedState.equals(sqle.getSQLState())) {
 					consolePropertyMessage("DRDA_ShutdownWarning.I",
 										   sqle.getMessage());
+				}
 			}
 		}
 
@@ -1555,7 +1559,8 @@
 		//localize message if necessary
 		while (se != null)
 		{
-			if (currentSession != null && currentSession.langUtil != null)
+			if (currentSession != null && currentSession.langUtil != null &&
+				se instanceof EmbedSQLException)
 			{
 				locMsg.append(se.getSQLState()+":"+ 
 					MessageService.getLocalizedMessage(
@@ -3235,7 +3240,10 @@
 			conn.close();
 	  	} catch (SQLException se) {
 			//ignore shutdown error
-			if (!(((EmbedSQLException)se).getMessageId() == SQLState.SHUTDOWN_DATABASE))
+			String expectedState =
+				StandardException.
+					getSQLStateFromIdentifier(SQLState.SHUTDOWN_DATABASE);
+			if (!expectedState.equals(se.getSQLState()))
 			{
 				sendSQLMessage(writer, se, SQLERROR);
 				return;

Modified: db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/sql/compile/SetOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/sql/compile/SetOperatorNode.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/sql/compile/SetOperatorNode.java (original)
+++ db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/sql/compile/SetOperatorNode.java Fri Aug 18 11:54:23 2006
@@ -171,10 +171,14 @@
 		// Modify this node's access paths.
 		ResultSetNode topNode = (ResultSetNode)modifyAccessPath(outerTables);
 
-		// Now see if there are any left over predicates; if so, then we
-		// have to generate a ProjectRestrictNode.
-		if (((leftOptPredicates != null) && (leftOptPredicates.size() > 0)) ||
-			((rightOptPredicates != null) && (rightOptPredicates.size() > 0)))
+		/* Now see if there are any left over predicates; if so, then we
+		 * have to generate a ProjectRestrictNode.  Note: we walk the
+		 * entire chain of UnionNodes (if there is a chain) and see if
+		 * any UnionNode at any level has un-pushed predicates; if so, then
+		 * we use a PRN to enforce the predicate at this, the top-most
+		 * UnionNode.
+		 */
+		if (hasUnPushedPredicates())
 		{
 			// When we generate the project restrict node, we pass in the
 			// "pushedPredicates" list because that has the predicates in
@@ -460,6 +464,42 @@
 		// We're done with the pushedPredicates list, so clear it out
 		// in preparation for another phase of optimization.
 		pushedPredicates.removeAllElements();
+	}
+
+	/**
+	 * It's possible that we tried to push predicates to this node's
+	 * children but failed to do so. This can happen if this node's
+	 * children both satisfy the criteria for pushing a predicate
+	 * (namely, they reference base tables) but the children's
+	 * children do not (see modifyAccessPaths() above for an example
+	 * of how that can happen).  So this method will walk the chain
+	 * of nodes beneath this one and determine if any SetOperatorNode
+	 * at any level has predicates that were not successfully pushed
+	 * to both of its children (note: this currently only applies
+	 * to UnionNodes).
+	 *
+	 * @return True if any UnionNode (or actually, any SetOperatorNode)
+	 *  in the chain of SetOperatorNodes (starting with this one) has
+	 *  unpushed predicates; false otherwise.
+	 */
+	protected boolean hasUnPushedPredicates()
+	{
+		// Check this node.
+		if (((leftOptPredicates != null) && (leftOptPredicates.size() > 0)) ||
+			((rightOptPredicates != null) && (rightOptPredicates.size() > 0)))
+		{
+			return true;
+		}
+
+		// Now check the children.
+		if ((leftResultSet instanceof SetOperatorNode) &&
+			((SetOperatorNode)leftResultSet).hasUnPushedPredicates())
+		{
+			return true;
+		}
+
+		return ((rightResultSet instanceof SetOperatorNode) &&
+			((SetOperatorNode)rightResultSet).hasUnPushedPredicates());
 	}
 
 	/**

Modified: db/derby/code/branches/10.2/java/testing/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/build.xml?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/build.xml (original)
+++ db/derby/code/branches/10.2/java/testing/build.xml Fri Aug 18 11:54:23 2006
@@ -60,6 +60,7 @@
     <ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/testData"/> 
     <ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/util"/> 
     <ant dir="${derby.testing.src.dir}/${derby.testing.unittest.dir}"/> 
+    <ant dir="${derby.testing.src.dir}/${derby.testing.junit.dir}"/> 
     <ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/junitTests/compatibility"/> 
     <ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/junitTests/derbyNet"/>
     <ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/jdbcapi"/> 

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/harness/ProcessStreamResult.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/harness/ProcessStreamResult.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/harness/ProcessStreamResult.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/harness/ProcessStreamResult.java Fri Aug 18 11:54:23 2006
@@ -42,15 +42,20 @@
 	public ProcessStreamResult(InputStream in, BufferedOutputStream bos,
 		    String timemin) throws IOException, InterruptedException
 	{
-		this(in, bos, timemin, null);
+		this(in, bos, timemin, null, null);
 	}
-	
+
 	public ProcessStreamResult(InputStream in, BufferedOutputStream bos,
-	  String timemin, String encoding) throws IOException, InterruptedException
+	  String timemin, String inEncoding, String outEncoding)
+		throws IOException, InterruptedException
 	{
 		this.in = in;
-		this.outStream = new OutputStreamWriter(bos);
-		this.encoding = encoding;
+        if (outEncoding == null) {
+            this.outStream = new OutputStreamWriter(bos);
+        } else {
+            this.outStream = new OutputStreamWriter(bos, outEncoding);
+        }
+        this.encoding = inEncoding;
         this.startTime = System.currentTimeMillis();
         if (timemin != null)
         {

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java Fri Aug 18 11:54:23 2006
@@ -183,6 +183,9 @@
     static boolean lastTestFailed = false;
 
     static boolean isI18N = false;
+    /** The value of derby.ui.codeset if it has been specified in the
+     * properties file. */
+    static String codeset = null;
     static boolean junitXASingle = false;
     
     /**
@@ -262,6 +265,10 @@
         // Setup the directories for the test and test output
         setDirectories(scriptName,sp);
 
+        if (testDirName.startsWith("i18n")) {
+            isI18N=true;
+        }
+
         // Check for properties files, including derby.properties
         // and if needed, build the -p string to pass to the test
         String propString = createPropString();
@@ -381,11 +388,6 @@
 		
 		String outName = finalOutFile.getPath();
 
-        if (testDirName.startsWith("i18n"))
-        {
-            isI18N=true;
-        }
-        
         if (skipsed)
         {
             tmpOutFile.renameTo(finalOutFile);
@@ -1541,11 +1543,17 @@
 			// For IBM14 the console encoding is different from the platform
 			// encoding on windows.  We want it to be the same for our
 			// test output like the other JDK's.
+			//
+			// For i18n test, we want UTF-8 encoding (DERBY-244).
 			String conEnc = System.getProperty("console.encoding");
 			String fileEnc = System.getProperty("file.encoding");
 		
-			if ((conEnc != null) &&  (fileEnc != null )  &&
-				(ap.getProperty("derby.ui.codeset") == null) &&
+			if (ap.getProperty("derby.ui.codeset") != null) {
+				// derby.ui.codeset is specified explicitly, don't override
+				codeset = ap.getProperty("derby.ui.codeset");
+			} else if (isI18N) {
+				ap.put("derby.ui.codeset", "UTF-8");
+			} else if ((conEnc != null) &&  (fileEnc != null )  &&
 				conEnc.startsWith("Cp850"))
 			{
 				ap.put("derby.ui.codeset",fileEnc);
@@ -2290,6 +2298,13 @@
             jvmProps.addElement("file.encoding=" + testEncoding);
             jvmflags = (jvmflags==null?"":jvmflags+" ") 
                          + "-Dfile.encoding=" + testEncoding; 
+        } else if (isI18N) {
+            // The I18N tests should be run with UTF-8 encoding to avoid
+            // problems with characters that cannot be represented in the
+            // default encoding (DERBY-244).
+            jvmProps.addElement("file.encoding=UTF-8");
+            jvmflags = (jvmflags==null ? "" : jvmflags + " ") +
+                        "-Dfile.encoding=UTF-8";
         }
         
         if (upgradejarpath != null)
@@ -2340,8 +2355,13 @@
             // force the console encoding to Cp1252 for ij tests - unless 
             // we're on non-ascii systems.
             String isNotAscii = System.getProperty("platform.notASCII");
-            if ( (isNotAscii == null) || (isNotAscii.equals("false"))) 
+            if (isI18N) {
+                // DERBY-244: Use UTF-8 console encoding for the i18n tests to
+                // avoid MalformedInputException with the IBM jvm.
+                v.addElement("-Dconsole.encoding=UTF-8");
+            } else if ((isNotAscii == null) || (isNotAscii.equals("false"))) {
                 v.addElement("-Dconsole.encoding=Cp1252" );
+            }
             v.addElement("org.apache.derby.tools." + ij);
             if (ij.equals("ij"))
             {
@@ -2505,25 +2525,42 @@
             if (verbose) System.out.println(sb.toString());
             pr = Runtime.getRuntime().exec(testCmd);
 
+            String inEncoding = null;
+            String outEncoding = null;
+            if (isI18N) {
+                // DERBY-244: I18N tests are run with -Dfile.encoding=UTF-8, so
+                // we need to specify encoding to the streams as well.
+                inEncoding = "UTF-8";
+                outEncoding = inEncoding;
+            }
+
+            if (codeset != null) {
+                // The test explicitly specified a codeset, use that codeset
+                // when reading the test output.
+                inEncoding = codeset;
+            }
+
+            if (testEncoding != null) {
+                inEncoding = testEncoding;
+            }
+
             if (useOutput)
             {
                 fos = new FileOutputStream(tmpOutFile);
-                bos = new BufferedOutputStream(fos, 1024);
-                prout = 
-                    new ProcessStreamResult(pr.getInputStream(), bos, 
-                    					timeoutStr, testEncoding);
             }
             else
             {
                 fos = new FileOutputStream(stdOutFile);
-                bos = new BufferedOutputStream(fos, 1024);
-                prout = 
-                    new ProcessStreamResult(pr.getInputStream(), bos, 
-                    					timeoutStr, testEncoding);
             }
+            bos = new BufferedOutputStream(fos, 1024);
+            prout = 
+                new ProcessStreamResult(pr.getInputStream(), bos, 
+                                        timeoutStr,
+                                        inEncoding, outEncoding);
             prerr =
                 new ProcessStreamResult(pr.getErrorStream(), bos, 
-                						timeoutStr, testEncoding);
+                                        timeoutStr,
+                                        inEncoding, outEncoding);
     
             if (framework != null && ! framework.equals(""))
                 if (verbose) System.out.println("The test should be running...");

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java Fri Aug 18 11:54:23 2006
@@ -372,10 +372,16 @@
         matcher = new Perl5Matcher();
 
         // Define the input and output files based on args
-        if (is == null)
+        if (is == null && isI18N) {
+            // read UTF-8 encoded file
+            InputStream fs = new FileInputStream(srcFile);
+            inFile = new BufferedReader(new InputStreamReader(fs, "UTF-8"));
+        } else if (is == null) {
+            // read the file using the default encoding
             inFile = new BufferedReader(new FileReader(srcFile));
-        else
+        } else {
             inFile = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+        }
         outFile = new PrintWriter
         ( new BufferedWriter(new FileWriter(dstFile), 10000), true );
 

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/blobclob4BLOB.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/blobclob4BLOB.out?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/blobclob4BLOB.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/blobclob4BLOB.out Fri Aug 18 11:54:23 2006
@@ -464,6 +464,7 @@
 START: clobTest53
 clobTest53 finished
 START: clobTest54
+java.lang.StringIndexOutOfBoundsException: String index out of range: -1
 EXPECTED SQLSTATE(22018): Invalid character string format for type INTEGER.
 end clobTest54
 START: clobTest6
@@ -473,7 +474,6 @@
 EXPECTED SQLSTATE(null): Invalid position 0 or length 0
 FAIL -- unexpected exception:java.lang.StringIndexOutOfBoundsException: String index out of range: -1
 START: clobTest7
-java.lang.StringIndexOutOfBoundsException: String index out of range: -1
 clobTest7 finished
 START: clobTest8
 small string pattern
@@ -773,6 +773,7 @@
 blobTest53 finished
 START: blobTest54
 EXPECTED SQLSTATE(XCL12): An attempt was made to put a data value of type 'byte[]' into a data value of type 'INTEGER'.
+java.lang.NegativeArraySizeException
 blobTest54 finished
 START: blobTest6
 EXPECTED SQLSTATE(null): Invalid position 0 or length 5
@@ -781,12 +782,11 @@
 EXPECTED SQLSTATE(null): Invalid position 0 or length 0
 FAIL -- unexpected exception:java.lang.NegativeArraySizeException
 START: blobTest7
-java.lang.NegativeArraySizeException
 blobTest7 finished
 START: blobTest8Trigger
 FAIL -- unexpected exception ****************
 SQLSTATE(X0X95): Operation 'CREATE TRIGGER' cannot be performed on object 'TESTBLOB' because there is an open ResultSet dependent on that object.
-com.ibm.db2.jcc.c.SqlException: Operation 'CREATE TRIGGER' cannot be performed on object 'TESTBLOB' because there is an open ResultSet dependent on that object.
+<FILTERED>.SqlException: Operation 'CREATE TRIGGER' cannot be performed on object 'TESTBLOB' because there is an open ResultSet dependent on that object.
 START: blobTest91
 done row 0, length was 0
 done row 1, length was 65

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/SetQueryTimeoutTest.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/SetQueryTimeoutTest.out?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/SetQueryTimeoutTest.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/SetQueryTimeoutTest.out Fri Aug 18 11:54:23 2006
@@ -12,5 +12,8 @@
 Testing setting a negative timeout value
 Negative timeout value caused exception, as expected
 Execute returned a ResultSet
+Testing that Statement remembers timeout.
+Testing that PreparedStatement remembers timeout.
+Testing that CallableStatement remembers timeout.
 Test SetQueryTimeoutTest PASSED
 Closed connections

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall Fri Aug 18 11:54:23 2006
@@ -1,7 +1,6 @@
 jdbcapi/bestrowidentifier.sql
 jdbcapi/characterStreams.java
 jdbcapi/checkDriver.java
-jdbcapi/DataSourcePropertiesTest.junit
 jdbcapi/derbyStress.java
 jdbcapi/nullSQLText.java
 jdbcapi/prepStmtMetaData.java
@@ -22,5 +21,4 @@
 jdbcapi/rsgetXXXcolumnNames.java
 jdbcapi/Stream.java
 jdbcapi/SURTest_ij.sql
-jdbcapi/ResultSetCloseTest.junit
 jdbcapi/_Suite.junit

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ByteArrayCombinerStreamTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ByteArrayCombinerStreamTest.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ByteArrayCombinerStreamTest.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ByteArrayCombinerStreamTest.java Fri Aug 18 11:54:23 2006
@@ -20,7 +20,7 @@
 */
 package org.apache.derbyTesting.functionTests.tests.derbynet;
 
-import org.apache.derbyTesting.functionTests.util.BaseTestCase;
+import org.apache.derbyTesting.junit.BaseTestCase;
 
 import org.apache.derby.client.am.ByteArrayCombinerStream;
 

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ShutDownDBWhenNSShutsDownTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ShutDownDBWhenNSShutsDownTest.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ShutDownDBWhenNSShutsDownTest.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ShutDownDBWhenNSShutsDownTest.java Fri Aug 18 11:54:23 2006
@@ -21,9 +21,9 @@
 package org.apache.derbyTesting.functionTests.tests.derbynet;
 
 import java.util.Properties;
-import org.apache.derbyTesting.functionTests.util.BaseTestCase;
 import org.apache.derbyTesting.functionTests.util.TestUtil;
-import org.apache.derbyTesting.functionTests.util.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestCase;
 import org.apache.derby.drda.NetworkServerControl;
 
 import junit.framework.*;
@@ -40,7 +40,7 @@
  * started from the command line and that it will not shut down the databases
  * when started from the API.
  */
-public class ShutDownDBWhenNSShutsDownTest extends BaseTestCase {
+public class ShutDownDBWhenNSShutsDownTest extends BaseJDBCTestCase {
 
 
     NetworkServerControl server = null;
@@ -144,13 +144,14 @@
     }
 
     private void createDatabase() throws SQLException {
-        Connection conn = BaseJDBCTestCase.getConnection();
+        Connection conn = getXConnection();
         conn.setAutoCommit(false);
         Statement st = conn.createStatement();
         st.execute("CREATE TABLE T1 (a int)");
         st.execute("INSERT INTO T1 VALUES (1), (2), (3), (4), (5)");
         st.execute("DROP TABLE T1");
         conn.commit();
+        conn.close();
     }
 
     private void shutdownServer() throws Exception {

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SqlExceptionTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SqlExceptionTest.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SqlExceptionTest.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SqlExceptionTest.java Fri Aug 18 11:54:23 2006
@@ -19,7 +19,7 @@
  */
 package org.apache.derbyTesting.functionTests.tests.derbynet;
 
-import org.apache.derbyTesting.functionTests.util.BaseTestCase;
+import org.apache.derbyTesting.junit.BaseTestCase;
 import org.apache.derby.client.am.SqlException;
 import org.apache.derby.client.am.ClientMessageId;
 import org.apache.derby.shared.common.reference.SQLState;

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SuicideOfStreaming.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SuicideOfStreaming.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SuicideOfStreaming.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SuicideOfStreaming.java Fri Aug 18 11:54:23 2006
@@ -39,7 +39,7 @@
 import org.apache.derby.tools.ij;
 import org.apache.derby.client.am.SqlCode;
 import org.apache.derbyTesting.functionTests.util.TestUtil;
-import org.apache.derbyTesting.functionTests.util.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 
 /**
  *

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/MessageBundleTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/MessageBundleTest.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/MessageBundleTest.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/MessageBundleTest.java Fri Aug 18 11:54:23 2006
@@ -21,7 +21,7 @@
 
 package org.apache.derbyTesting.functionTests.tests.i18n;
 
-import org.apache.derbyTesting.functionTests.util.BaseTestCase;
+import org.apache.derbyTesting.junit.BaseTestCase;
 import org.apache.derby.shared.common.reference.SQLState;
 import org.apache.derby.shared.common.reference.MessageId;
 

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/AutoloadBooting.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/AutoloadBooting.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/AutoloadBooting.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/AutoloadBooting.java Fri Aug 18 11:54:23 2006
@@ -35,7 +35,7 @@
 
 import org.apache.derby.iapi.services.monitor.Monitor;
 import org.apache.derby.drda.NetworkServerControl;
-import org.apache.derbyTesting.functionTests.util.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 
 public	class	AutoloadBooting	extends	BaseJDBCTestCase
 {

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/AutoloadTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/AutoloadTest.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/AutoloadTest.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/AutoloadTest.java Fri Aug 18 11:54:23 2006
@@ -34,8 +34,8 @@
 import java.util.*;
 import junit.framework.*;
 
-import org.apache.derbyTesting.functionTests.util.BaseJDBCTestCase;
 import org.apache.derbyTesting.functionTests.util.SQLStateConstants;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 
 public	class	AutoloadTest	extends	BaseJDBCTestCase
 {

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobClobTestSetup.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobClobTestSetup.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobClobTestSetup.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobClobTestSetup.java Fri Aug 18 11:54:23 2006
@@ -24,7 +24,7 @@
 import junit.extensions.TestSetup;
 import junit.framework.Test;
 
-import org.apache.derbyTesting.functionTests.util.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobTest.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobTest.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobTest.java Fri Aug 18 11:54:23 2006
@@ -23,7 +23,7 @@
 
 import junit.framework.*;
 
-import org.apache.derbyTesting.functionTests.util.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 
 import java.sql.*;
 import java.io.*;

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/CallableStatementTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/CallableStatementTest.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/CallableStatementTest.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/CallableStatementTest.java Fri Aug 18 11:54:23 2006
@@ -23,7 +23,7 @@
 
 import junit.framework.*;
 
-import org.apache.derbyTesting.functionTests.util.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 
 import java.io.IOException;
 import java.io.Reader;

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/CallableStatementTestSetup.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/CallableStatementTestSetup.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/CallableStatementTestSetup.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/CallableStatementTestSetup.java Fri Aug 18 11:54:23 2006
@@ -25,7 +25,7 @@
 import junit.framework.Test;
 import junit.extensions.TestSetup;
 
-import org.apache.derbyTesting.functionTests.util.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 
 import java.io.UnsupportedEncodingException;
 import java.sql.*;

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ClobTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ClobTest.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ClobTest.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ClobTest.java Fri Aug 18 11:54:23 2006
@@ -24,7 +24,7 @@
 
 import junit.framework.*;
 
-import org.apache.derbyTesting.functionTests.util.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 
 import java.sql.*;
 import java.io.*;

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ClosedObjectTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ClosedObjectTest.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ClosedObjectTest.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ClosedObjectTest.java Fri Aug 18 11:54:23 2006
@@ -40,8 +40,8 @@
 import junit.extensions.TestSetup;
 import junit.framework.Test;
 import junit.framework.TestSuite;
-import org.apache.derbyTesting.functionTests.util.BaseJDBCTestCase;
 import org.apache.derbyTesting.functionTests.util.TestDataSourceFactory;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 
 /**
  * Test that all methods on <code>ResultSet</code>,
@@ -118,7 +118,7 @@
      * @return a <code>Test</code> value
      * @exception Exception if an error occurs while building the test suite
      */
-    public static Test suite() throws Exception {
+    public static Test suite()  {
         TestSuite topSuite = new TestSuite();
 
         TestSuite dsSuite = new TestSuite();
@@ -149,11 +149,9 @@
      *
      * @param suite the test suite to fill
      * @param dsDecorator the decorator for the test suite
-     * @exception Exception if an error occurs while filling the suite
      */
     private static void fillDataSourceSuite(TestSuite suite,
                                             DataSourceDecorator dsDecorator)
-        throws Exception
     {
         TestSuite rsSuite = new TestSuite();
         ResultSetObjectDecorator rsDecorator =
@@ -193,12 +191,10 @@
      * @param decorator a decorator for the test (used for obtaining a
      * closed object to test the method on)
      * @param iface the interface which contains the methods to test
-     * @exception Exception if an error occurs while filling the suite
      */
     private static void fillObjectSuite(TestSuite suite,
                                         ObjectDecorator decorator,
                                         Class iface)
-        throws Exception
     {
         for (Method m : iface.getMethods()) {
             ClosedObjectTest cot = new ClosedObjectTest(m, decorator);

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java Fri Aug 18 11:54:23 2006
@@ -22,9 +22,9 @@
 
 import junit.framework.*;
 
-import org.apache.derbyTesting.functionTests.util.BaseJDBCTestCase;
 import org.apache.derbyTesting.functionTests.util.TestDataSourceFactory;
 import org.apache.derbyTesting.functionTests.util.SQLStateConstants;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/DataSourceTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/DataSourceTest.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/DataSourceTest.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/DataSourceTest.java Fri Aug 18 11:54:23 2006
@@ -23,8 +23,8 @@
 
 import junit.framework.*;
 
-import org.apache.derbyTesting.functionTests.util.BaseJDBCTestCase;
 import org.apache.derbyTesting.functionTests.util.TestDataSourceFactory;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 
 import java.sql.*;
 import javax.sql.*;

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/JDBC40TranslationTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/JDBC40TranslationTest.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/JDBC40TranslationTest.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/JDBC40TranslationTest.java Fri Aug 18 11:54:23 2006
@@ -22,7 +22,7 @@
 import java.sql.DatabaseMetaData;
 import java.sql.Types;
 import org.apache.derby.shared.common.reference.JDBC40Translation;
-import org.apache.derbyTesting.functionTests.util.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 
 /**
  * JUnit test which checks that the constants in JDBC40Translation are

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ParameterMetaDataWrapperTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ParameterMetaDataWrapperTest.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ParameterMetaDataWrapperTest.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ParameterMetaDataWrapperTest.java Fri Aug 18 11:54:23 2006
@@ -23,7 +23,8 @@
 import java.sql.*;
 import javax.sql.*;
 import junit.framework.*;
-import org.apache.derbyTesting.functionTests.util.BaseJDBCTestCase;
+
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 
 /**
  * Tests of the <code>java.sql.ParameterMetaData</code> JDBC40 API

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/PreparedStatementTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/PreparedStatementTest.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/PreparedStatementTest.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/PreparedStatementTest.java Fri Aug 18 11:54:23 2006
@@ -23,7 +23,7 @@
 
 import junit.framework.*;
 
-import org.apache.derbyTesting.functionTests.util.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 
 import java.io.*;
 import java.sql.*;

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetMetaDataTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetMetaDataTest.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetMetaDataTest.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetMetaDataTest.java Fri Aug 18 11:54:23 2006
@@ -22,8 +22,8 @@
 
 import junit.framework.*;
 
-import org.apache.derbyTesting.functionTests.util.BaseJDBCTestCase;
 import org.apache.derbyTesting.functionTests.util.SQLStateConstants;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 
 import java.sql.*;
 import javax.sql.*;

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetTest.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetTest.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetTest.java Fri Aug 18 11:54:23 2006
@@ -25,7 +25,7 @@
 import junit.extensions.TestSetup;
 import junit.framework.*;
 
-import org.apache.derbyTesting.functionTests.util.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 
 import java.io.*;
 import java.sql.*;

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/RowIdNotImplementedTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/RowIdNotImplementedTest.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/RowIdNotImplementedTest.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/RowIdNotImplementedTest.java Fri Aug 18 11:54:23 2006
@@ -20,7 +20,7 @@
 
 package org.apache.derbyTesting.functionTests.tests.jdbc4;
 
-import org.apache.derbyTesting.functionTests.util.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 import org.apache.derby.impl.jdbc.EmbedRowId;
 
 import junit.framework.*;

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/SetObjectUnsupportedTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/SetObjectUnsupportedTest.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/SetObjectUnsupportedTest.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/SetObjectUnsupportedTest.java Fri Aug 18 11:54:23 2006
@@ -26,7 +26,8 @@
 import java.sql.Types;
 import junit.framework.Test;
 import junit.framework.TestSuite;
-import org.apache.derbyTesting.functionTests.util.BaseJDBCTestCase;
+
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 
 /**
  * Tests that calling <code>setObject()</code> and <code>setNull()</code> with

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementEventsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementEventsTest.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementEventsTest.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementEventsTest.java Fri Aug 18 11:54:23 2006
@@ -25,8 +25,9 @@
 import javax.sql.*;
 import junit.framework.*;
 
-import org.apache.derbyTesting.functionTests.util.BaseJDBCTestCase;
 import org.apache.derbyTesting.functionTests.util.TestDataSourceFactory;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+
 import java.util.Enumeration;
 
 /*

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementTest.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementTest.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementTest.java Fri Aug 18 11:54:23 2006
@@ -20,8 +20,8 @@
 
 package org.apache.derbyTesting.functionTests.tests.jdbc4;
 
-import org.apache.derbyTesting.functionTests.util.BaseJDBCTestCase;
 import org.apache.derbyTesting.functionTests.util.SQLStateConstants;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 
 import junit.framework.*;
 

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementTestSetup.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementTestSetup.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementTestSetup.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementTestSetup.java Fri Aug 18 11:54:23 2006
@@ -20,7 +20,7 @@
 
 package org.apache.derbyTesting.functionTests.tests.jdbc4;
 
-import org.apache.derbyTesting.functionTests.util.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 
 import junit.framework.Test;
 import junit.extensions.TestSetup;

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/UnsupportedVetter.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/UnsupportedVetter.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/UnsupportedVetter.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/UnsupportedVetter.java Fri Aug 18 11:54:23 2006
@@ -30,9 +30,9 @@
 
 import java.net.URL;
 
-import org.apache.derbyTesting.functionTests.util.BaseJDBCTestCase;
 import org.apache.derbyTesting.functionTests.util.TestUtil;
 import org.apache.derbyTesting.functionTests.util.TestDataSourceFactory;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 
 /**
  * JUnit test which checks that only expected methods throw

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/VerifySignatures.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/VerifySignatures.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/VerifySignatures.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/VerifySignatures.java Fri Aug 18 11:54:23 2006
@@ -31,9 +31,9 @@
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
-import org.apache.derbyTesting.functionTests.util.BaseJDBCTestCase;
 import org.apache.derbyTesting.functionTests.util.TestUtil;
 import org.apache.derbyTesting.functionTests.util.TestDataSourceFactory;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 
 /**
  * JUnit test which checks that all methods specified by the

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/XA40Test.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/XA40Test.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/XA40Test.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/XA40Test.java Fri Aug 18 11:54:23 2006
@@ -20,8 +20,8 @@
 
 package org.apache.derbyTesting.functionTests.tests.jdbc4;
 
-import org.apache.derbyTesting.functionTests.util.BaseJDBCTestCase;
 import org.apache.derbyTesting.functionTests.util.TestDataSourceFactory;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 
 import junit.framework.*;
 

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BLOBDataModelSetup.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BLOBDataModelSetup.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BLOBDataModelSetup.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BLOBDataModelSetup.java Fri Aug 18 11:54:23 2006
@@ -18,8 +18,10 @@
  * language governing permissions and limitations under the License.
  */
 package org.apache.derbyTesting.functionTests.tests.jdbcapi;
-import org.apache.derbyTesting.functionTests.util.BaseJDBCTestCase;
 import org.apache.derbyTesting.functionTests.util.TestInputStream;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseJDBCTestSetup;
+
 import junit.extensions.TestSetup;
 import junit.framework.Test;
 import java.sql.Connection;
@@ -37,7 +39,7 @@
  *
  * @author Andreas Korneliussen
  */
-final public class BLOBDataModelSetup extends TestSetup
+final public class BLOBDataModelSetup extends BaseJDBCTestSetup
 {
     
     /** 
@@ -57,7 +59,7 @@
     protected final void setUp() 
         throws Exception
     {
-        con = BaseJDBCTestCase.getConnection();
+        Connection con = getConnection();
         con.setAutoCommit(false);
         
         // Create table:
@@ -106,14 +108,16 @@
         throws Exception
     {
         try { 
+            Connection con = getConnection();
             Statement statement = con.createStatement();
             statement.execute("DROP TABLE " + tableName);
             statement.close();
             con.commit();
-            con.close();
         } catch (SQLException e) {
             BaseJDBCTestCase.printStackTrace(e);
-        }      
+        }  
+        
+        super.tearDown();
     }
 
     /**
@@ -136,9 +140,6 @@
     
     /** Val for big  record */
     final static int bigVal = regularBlobs + 1;
-    
-    /** JDBC Connection */        
-    private Connection con;
     
     /** Name of table */
     private static final String tableName = "TESTBLOBTABLE";

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BLOBTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BLOBTest.java?rev=432679&r1=432678&r2=432679&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BLOBTest.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BLOBTest.java Fri Aug 18 11:54:23 2006
@@ -18,8 +18,9 @@
  * language governing permissions and limitations under the License.
  */
 package org.apache.derbyTesting.functionTests.tests.jdbcapi;
-import org.apache.derbyTesting.functionTests.util.BaseJDBCTestCase;
 import org.apache.derbyTesting.functionTests.util.TestInputStream;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import java.sql.PreparedStatement;
@@ -44,7 +45,6 @@
     public BLOBTest(String name) 
     {
         super(name);
-        con = null;
     }
 
     
@@ -58,7 +58,7 @@
         throws SQLException, IOException
     {
         final Statement stmt = 
-            con.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
+            createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
                                 ResultSet.CONCUR_UPDATABLE);
         final ResultSet rs = 
             stmt.executeQuery("SELECT * from " + 
@@ -74,6 +74,7 @@
         verifyBlob(newVal, newSize, rs.getBlob(3));
         
         rs.close();
+        stmt.close();
     }
 
     /**
@@ -86,7 +87,7 @@
         throws SQLException, IOException
     {
         final Statement stmt = 
-            con.createStatement(ResultSet.TYPE_FORWARD_ONLY,
+            createStatement(ResultSet.TYPE_FORWARD_ONLY,
                                 ResultSet.CONCUR_UPDATABLE);
         final ResultSet rs = 
             stmt.executeQuery("SELECT * from " + 
@@ -103,6 +104,7 @@
         testUpdateBlobWithResultSetMethods(rs, newVal, newSize);
         
         rs.close();
+        stmt.close();
     }
 
     /**
@@ -115,7 +117,7 @@
         throws SQLException, IOException
     {
         final Statement stmt = 
-            con.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
+            createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
                                 ResultSet.CONCUR_UPDATABLE);
         final ResultSet rs = 
             stmt.executeQuery("SELECT * from " + 
@@ -133,6 +135,7 @@
         verifyBlob(newVal, newSize, rs.getBlob(3));
         
         rs.close();
+        stmt.close();
     }
 
     /**
@@ -145,7 +148,7 @@
         throws SQLException, IOException
     {
         final Statement stmt = 
-            con.createStatement(ResultSet.TYPE_FORWARD_ONLY,
+            createStatement(ResultSet.TYPE_FORWARD_ONLY,
                                 ResultSet.CONCUR_UPDATABLE);
         final ResultSet rs = 
             stmt.executeQuery("SELECT * from " + 
@@ -161,6 +164,7 @@
         testUpdateBlobWithPositionedUpdate(rs, newVal, newSize);
         
         rs.close();
+        stmt.close();
     }
 
     /**
@@ -174,7 +178,7 @@
         throws SQLException, IOException
     {
         final Statement stmt = 
-            con.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
+            createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
                                 ResultSet.CONCUR_UPDATABLE);
         final ResultSet rs = 
             stmt.executeQuery("SELECT data,val,length from " + 
@@ -190,6 +194,7 @@
         verifyBlob(newVal, newSize, rs.getBlob(1));
         
         rs.close();
+        stmt.close();
     }
 
     /**
@@ -203,7 +208,7 @@
         throws SQLException, IOException
     {
         final Statement stmt = 
-            con.createStatement(ResultSet.TYPE_FORWARD_ONLY,
+            createStatement(ResultSet.TYPE_FORWARD_ONLY,
                                 ResultSet.CONCUR_UPDATABLE);
         final ResultSet rs = 
             stmt.executeQuery("SELECT data,val,length from " + 
@@ -220,6 +225,7 @@
         testUpdateBlobWithResultSetMethods(rs, newVal, newSize);
         
         rs.close();
+        stmt.close();
     }
 
     /**
@@ -233,7 +239,7 @@
         throws SQLException, IOException
     {
         final Statement stmt = 
-            con.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
+            createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
                                 ResultSet.CONCUR_UPDATABLE);
         final ResultSet rs = 
             stmt.executeQuery("SELECT data from " + 
@@ -252,6 +258,7 @@
         verifyBlob(newVal, newSize, rs.getBlob("DATA"));
         
         rs.close();
+        stmt.close();
     }
 
     /**
@@ -265,7 +272,7 @@
         throws SQLException, IOException
     {
         final Statement stmt = 
-            con.createStatement(ResultSet.TYPE_FORWARD_ONLY,
+            createStatement(ResultSet.TYPE_FORWARD_ONLY,
                                 ResultSet.CONCUR_UPDATABLE);
         final ResultSet rs = 
             stmt.executeQuery("SELECT data from " + 
@@ -278,6 +285,7 @@
         testUpdateBlobWithPositionedUpdate(rs, newVal, newSize);
         
         rs.close();
+        stmt.close();
     }
     
     
@@ -324,7 +332,7 @@
                                                     final int newSize) 
         throws SQLException, IOException
     {
-        final PreparedStatement preparedStatement = con.prepareStatement
+        final PreparedStatement preparedStatement = getXConnection().prepareStatement
             ("UPDATE " + BLOBDataModelSetup.getBlobTableName() +
              " SET val=?, length = ?, data = ? WHERE CURRENT OF " +
              rs.getCursorName());
@@ -357,7 +365,7 @@
     {
         println("Verify new value in table: " + newVal);
         
-        final Statement stmt = con.createStatement(ResultSet.TYPE_FORWARD_ONLY, 
+        final Statement stmt = createStatement(ResultSet.TYPE_FORWARD_ONLY, 
                                                    ResultSet.CONCUR_READ_ONLY);
         
         final ResultSet rs = 
@@ -379,6 +387,9 @@
             foundVal = true;
         }
         assertTrue("No column with value= " + newVal + " found ", foundVal);
+        
+        rs.close();
+        stmt.close();
     }
                           
     /**
@@ -428,27 +439,6 @@
         throws Exception
     {
         println("Setup of: " + getName());
-        con = getConnection();
-        con.setAutoCommit(false);
-    }
-    
-    /**
-     * Teardown test.
-     * Rollback connection and close it.
-     * @exception Exceptions causes the test to fail with error
-     */
-    public final void tearDown() 
-        throws Exception
-    {
-        println("Teardown of: " + getName());
-        try { 
-            con.rollback();
-            con.close();
-        } catch (SQLException e) {
-            printStackTrace(e);
-        }      
+        getXConnection().setAutoCommit(false);
     }
-    
-    /** JDBC Connection */        
-    private Connection con;
 }



Mime
View raw message