[derby] 50/53: Merge tag 'upstream/10.13.1.1'

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Nov 24 13:58:06 UTC 2016


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository derby.

commit cd02b883a35e6b8e9489332db46573a83840c6f4
Merge: d2074f7 62f1a9c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Nov 18 16:21:11 2016 +0100

    Merge tag 'upstream/10.13.1.1'
    
    Upstream version 10.13.1.1

 BUILDING.html                                      |  100 +-
 KEYS                                               |  121 ++
 NOTICE                                             |   16 +-
 RELEASE-NOTES.html                                 |  351 ++--
 STATUS                                             |    6 +-
 build.xml                                          |  162 +-
 .../org/apache/derbyBuild/ClassSizeCrawler.java    |    4 +-
 .../build/org/apache/derbyBuild/MessageVetter.java |    1 +
 .../apache/derbyBuild/ODBCMetadataGenerator.java   |   35 +-
 .../apache/derbyBuild/ReleaseNotesGenerator.java   |    5 -
 .../apache/derbyBuild/ReleaseNotesTransformer.java |   12 +-
 java/build/org/apache/derbyBuild/build.xml         |    8 +-
 java/build/org/apache/derbyBuild/classlister.java  |   20 +-
 .../insane.derby.jar.lastcontents                  |    7 +-
 .../insane.derbyTesting.jar.lastcontents           |    4 +
 .../insane.derbyclient.jar.lastcontents            |    5 +-
 .../insane.derbynet.jar.lastcontents               |    2 +-
 .../insane.derbyoptionaltools.jar.lastcontents     |    2 +
 .../sane.derby.jar.lastcontents                    |    7 +-
 .../sane.derbyTesting.jar.lastcontents             |    4 +
 .../sane.derbyclient.jar.lastcontents              |    5 +-
 .../sane.derbyoptionaltools.jar.lastcontents       |    2 +
 .../org/apache/derbyPreBuild/PropertySetter.java   |  771 ---------
 java/client/build.xml                              |   18 +-
 .../derby/client/ClientDataSourceFactory.java      |    3 +-
 .../derby/client/am/CallableLocatorProcedures.java |    8 +-
 .../derby/client/am/ClientCallableStatement42.java |    2 +-
 .../derby/client/am/ClientDatabaseMetaData.java    |    4 +-
 .../derby/client/am/ClientPreparedStatement.java   |    8 +-
 .../derby/client/am/ClientPreparedStatement42.java |    2 +-
 .../apache/derby/client/am/FailedProperties40.java |    4 +-
 .../org/apache/derby/client/am/FloatingPoint.java  |   10 +-
 java/client/org/apache/derby/client/am/Lob.java    |    8 +-
 .../derby/client/net/NetConnectionRequest.java     |    4 +-
 .../client/org/apache/derby/jdbc/ClientDriver.java |   16 +-
 java/demo/build.xml                                |   41 +-
 java/demo/nserverdemo/NsSampleClientThread.java    |    2 +-
 .../nserverdemo/SimpleNetworkClientSample.java     |    4 +-
 .../nserverdemo/SimpleNetworkServerSample.java     |    3 +-
 java/demo/toursdb/build.xml                        |   11 +-
 java/demo/toursdb/insertMaps.java                  |    3 +-
 java/drda/org/apache/derby/drda/NetServlet.java    |   12 +-
 .../apache/derby/drda/NetworkServerControl.java    |   69 +-
 java/drda/org/apache/derby/drda/build.xml          |   16 +-
 .../org/apache/derby/impl/drda/AppRequester.java   |    2 +-
 .../drda/org/apache/derby/impl/drda/DDMReader.java |    8 +-
 .../drda/org/apache/derby/impl/drda/DDMWriter.java |    2 +-
 .../org/apache/derby/impl/drda/DRDAConnThread.java |   22 +-
 .../org/apache/derby/impl/drda/DRDAXAProtocol.java |   22 +-
 java/drda/org/apache/derby/impl/drda/Database.java |    2 +-
 .../apache/derby/impl/drda/DecryptionManager.java  |   21 +-
 .../derby/impl/drda/NetworkServerControlImpl.java  |    7 +-
 .../org/apache/derby/impl/drda/XADatabase.java     |   13 +-
 java/drda/org/apache/derby/impl/drda/build.xml     |    9 +-
 ...{messages_en.properties => messages.properties} |    0
 .../derby/mbeans/drda/NetworkServerMBean.java      |    4 +-
 java/engine/org/apache/derby/agg/build.xml         |    8 +-
 .../org/apache/derby/authentication/build.xml      |    8 +-
 .../apache/derby/catalog/GetProcedureColumns.java  |   30 +-
 .../derby/catalog/Java5SystemProcedures.java       |    5 +-
 .../org/apache/derby/catalog/SystemProcedures.java |  117 +-
 java/engine/org/apache/derby/catalog/build.xml     |    8 +-
 java/engine/org/apache/derby/database/build.xml    |    8 +-
 .../org/apache/derby/diag/ErrorLogReader.java      |    6 +-
 java/engine/org/apache/derby/diag/LockTable.java   |    4 +-
 java/engine/org/apache/derby/diag/build.xml        |    9 +-
 java/engine/org/apache/derby/iapi/build.xml        |    8 +-
 java/engine/org/apache/derby/iapi/db/build.xml     |    8 +-
 .../org/apache/derby/iapi/error/ExceptionUtil.java |    2 +-
 .../apache/derby/iapi/jdbc/BrokeredStatement.java  |    4 +-
 .../apache/derby/iapi/jdbc/DRDAServerStarter.java  |    2 +-
 .../apache/derby/iapi/jdbc/ExceptionFactory.java   |    3 +-
 .../apache/derby/iapi/jdbc/FailedProperties40.java |    4 +-
 .../apache/derby/iapi/jdbc/ResourceAdapter.java    |   16 +-
 java/engine/org/apache/derby/iapi/jdbc/build.xml   |   20 +-
 .../org/apache/derby/iapi/reference/Attribute.java |    2 +-
 .../org/apache/derby/iapi/reference/Property.java  |   12 +-
 .../org/apache/derby/iapi/reference/build.xml      |    8 +-
 .../org/apache/derby/iapi/services/build.xml       |    9 +-
 .../derby/iapi/services/cache/ClassSize.java       |    2 +-
 .../iapi/services/cache/ClassSizeCatalog.java      |    8 +-
 .../derby/iapi/services/classfile/ClassInput.java  |    4 +
 .../iapi/services/classfile/ClassInvestigator.java |   12 +-
 .../iapi/services/classfile/VMDescriptor.java      |    3 +
 .../iapi/services/compiler/MethodBuilder.java      |   80 +-
 .../iapi/services/context/ContextService.java      |    2 +-
 .../apache/derby/iapi/services/crypto/build.xml    |    8 +-
 .../derby/iapi/services/diag/DiagnosticUtil.java   |    7 +-
 .../apache/derby/iapi/services/info/JVMInfo.java   |   33 +-
 .../iapi/services/info/ProductVersionHolder.java   |   14 +-
 .../derby/iapi/services/io/ArrayInputStream.java   |   18 +-
 .../apache/derby/iapi/services/io/ArrayUtil.java   |    8 +
 .../derby/iapi/services/io/CompressedNumber.java   |   12 +-
 .../derby/iapi/services/io/DataInputUtil.java      |    2 +-
 .../services/io/DynamicByteArrayOutputStream.java  |    4 +-
 .../iapi/services/io/FilePermissionService.java    |   47 -
 .../services/io/FilePermissionServiceImpl.java     |  100 --
 .../apache/derby/iapi/services/io/FileUtil.java    |  102 +-
 .../derby/iapi/services/io/FormatableBitSet.java   |   14 +-
 .../derby/iapi/services/io/InputStreamUtil.java    |    2 +-
 .../org/apache/derby/iapi/services/io/build.xml    |   38 +-
 .../derby/iapi/services/loader/ClassInfo.java      |    8 +-
 .../derby/iapi/services/loader/InstanceGetter.java |    5 +-
 .../apache/derby/iapi/services/locks/Lockable.java |    2 +-
 .../derby/iapi/services/locks/ShExLockable.java    |    2 +-
 .../iapi/services/monitor/DerbyObservable.java     |  134 ++
 .../ClassInput.java => monitor/DerbyObserver.java} |   45 +-
 .../org/apache/derby/iapi/sql/ResultSet.java       |   10 +-
 java/engine/org/apache/derby/iapi/sql/build.xml    |    8 +-
 .../apache/derby/iapi/sql/compile/C_NodeTypes.java |    2 +-
 .../derby/iapi/sql/compile/CompilerContext.java    |    2 +-
 .../derby/iapi/sql/compile/CostEstimate.java       |    2 +-
 .../apache/derby/iapi/sql/compile/Optimizable.java |    4 +-
 .../apache/derby/iapi/sql/compile/Optimizer.java   |    4 +-
 .../iapi/sql/conn/LanguageConnectionContext.java   |    4 +-
 .../derby/iapi/sql/depend/DependencyManager.java   |    2 +-
 .../derby/iapi/sql/dictionary/DataDictionary.java  |    3 +
 .../iapi/sql/dictionary/RoleClosureIterator.java   |    2 +-
 .../iapi/sql/dictionary/TriggerDescriptor.java     |    4 +-
 .../iapi/sql/execute/ExecPreparedStatement.java    |    2 +-
 .../derby/iapi/sql/execute/ExecutionFactory.java   |    4 +-
 .../derby/iapi/sql/execute/ResultSetFactory.java   |    2 +-
 .../apache/derby/iapi/sql/execute/RowChanger.java  |    2 +-
 .../iapi/store/access/BackingStoreHashtable.java   |    6 +-
 .../derby/iapi/store/access/BinaryOrderable.java   |   10 +-
 .../iapi/store/access/ConglomerateController.java  |    2 +-
 .../derby/iapi/store/access/DatabaseInstant.java   |    4 +-
 .../derby/iapi/store/access/FileResource.java      |    2 +-
 .../store/access/GroupFetchScanController.java     |    6 +-
 .../apache/derby/iapi/store/access/Qualifier.java  |    4 +-
 .../apache/derby/iapi/store/access/RowSource.java  |    2 +-
 .../apache/derby/iapi/store/access/RowUtil.java    |    4 +-
 .../iapi/store/access/SortCostController.java      |    4 +-
 .../iapi/store/access/TransactionController.java   |   24 +-
 java/engine/org/apache/derby/iapi/store/build.xml  |    8 +-
 .../apache/derby/iapi/store/raw/ContainerKey.java  |    3 +-
 .../apache/derby/iapi/store/raw/ContainerLock.java |    2 +-
 .../org/apache/derby/iapi/store/raw/Page.java      |   12 +-
 .../derby/iapi/store/raw/RawStoreFactory.java      |    4 +-
 .../org/apache/derby/iapi/store/raw/RowLock.java   |    2 +-
 .../derby/iapi/store/raw/xact/RawTransaction.java  |   14 +-
 .../iapi/types/CharStreamHeaderGenerator.java      |    4 +-
 .../org/apache/derby/iapi/types/DataType.java      |   40 +-
 .../derby/iapi/types/DataTypeDescriptor.java       |    2 +-
 .../derby/iapi/types/DataValueDescriptor.java      |   26 +-
 .../apache/derby/iapi/types/HarmonySerialBlob.java |   16 +-
 .../apache/derby/iapi/types/HarmonySerialClob.java |   10 +-
 java/engine/org/apache/derby/iapi/types/Like.java  |    8 +-
 .../apache/derby/iapi/types/NumberDataType.java    |    2 +-
 .../apache/derby/iapi/types/NumberDataValue.java   |    2 +-
 .../org/apache/derby/iapi/types/Orderable.java     |   12 +-
 .../org/apache/derby/iapi/types/SQLBinary.java     |   40 +-
 .../org/apache/derby/iapi/types/SQLBoolean.java    |   32 +-
 .../org/apache/derby/iapi/types/SQLChar.java       |   44 +-
 .../org/apache/derby/iapi/types/SQLDate.java       |    4 +-
 .../org/apache/derby/iapi/types/SQLDecimal.java    |   30 +-
 .../org/apache/derby/iapi/types/SQLDouble.java     |   32 +-
 .../org/apache/derby/iapi/types/SQLInteger.java    |   32 +-
 .../org/apache/derby/iapi/types/SQLLongint.java    |   32 +-
 .../org/apache/derby/iapi/types/SQLReal.java       |   32 +-
 .../org/apache/derby/iapi/types/SQLSmallint.java   |   32 +-
 .../org/apache/derby/iapi/types/SQLTime.java       |    8 +-
 .../org/apache/derby/iapi/types/SQLTimestamp.java  |   12 +-
 .../org/apache/derby/iapi/types/SQLTinyint.java    |   32 +-
 .../org/apache/derby/iapi/types/UserType.java      |    6 +-
 java/engine/org/apache/derby/iapi/types/build.xml  |    9 +-
 java/engine/org/apache/derby/iapi/util/IdUtil.java |   10 +-
 .../org/apache/derby/iapi/util/ReuseFactory.java   |   66 -
 .../org/apache/derby/iapi/util/StringUtil.java     |    8 +-
 java/engine/org/apache/derby/iapi/util/build.xml   |    8 +-
 java/engine/org/apache/derby/impl/db/build.xml     |    9 +-
 java/engine/org/apache/derby/impl/io/build.xml     |    8 +-
 .../org/apache/derby/impl/jdbc/EmbedBlob.java      |   38 +-
 .../derby/impl/jdbc/EmbedCallableStatement.java    |    4 +-
 .../org/apache/derby/impl/jdbc/EmbedClob.java      |   22 +-
 .../apache/derby/impl/jdbc/EmbedConnection.java    |    8 +-
 .../derby/impl/jdbc/EmbedDatabaseMetaData.java     |  356 ++--
 .../derby/impl/jdbc/EmbedParameterSetMetaData.java |    2 +-
 .../derby/impl/jdbc/EmbedPreparedStatement.java    |    2 +-
 .../org/apache/derby/impl/jdbc/EmbedResultSet.java |   15 +-
 .../derby/impl/jdbc/EmbedResultSetMetaData.java    |    2 +-
 .../org/apache/derby/impl/jdbc/EmbedStatement.java |   35 +-
 .../apache/derby/impl/jdbc/EncryptedLOBFile.java   |    2 +-
 .../apache/derby/impl/jdbc/LOBStoredProcedure.java |    6 +-
 .../apache/derby/impl/jdbc/LOBStreamControl.java   |   20 +-
 .../derby/impl/jdbc/TransactionResourceImpl.java   |    2 +-
 java/engine/org/apache/derby/impl/jdbc/Util.java   |   36 -
 .../authentication/AuthenticationServiceBase.java  |    4 +-
 .../BasicAuthenticationServiceImpl.java            |    2 +-
 .../SpecificAuthenticationServiceImpl.java         |    8 +-
 java/engine/org/apache/derby/impl/jdbc/build.xml   |   18 +-
 .../org/apache/derby/impl/jdbc/metadata.properties |   23 -
 .../org/apache/derby/impl/load/ColumnInfo.java     |   52 +-
 java/engine/org/apache/derby/impl/load/Export.java |    2 +-
 java/engine/org/apache/derby/impl/load/Import.java |   84 +-
 .../org/apache/derby/impl/load/ImportLobFile.java  |    4 +-
 .../org/apache/derby/impl/load/ImportReadData.java |   27 +-
 .../org/apache/derby/impl/load/LoadError.java      |   12 +-
 java/engine/org/apache/derby/impl/load/build.xml   |    9 +-
 .../org/apache/derby/impl/services/build.xml       |    9 +-
 .../derby/impl/services/bytecode/BCJava.java       |    8 +-
 .../derby/impl/services/bytecode/BCMethod.java     |    4 +-
 .../derby/impl/services/bytecode/CodeChunk.java    |    6 +-
 .../derby/impl/services/bytecode/Conditional.java  |   12 +-
 .../derby/impl/services/bytecode/d_BCValidate.java |   29 +-
 .../services/daemon/IndexStatisticsDaemonImpl.java |    2 +-
 .../derby/impl/services/jce/JCECipherFactory.java  |   18 +-
 .../derby/impl/services/locks/ActiveLock.java      |    2 +-
 .../apache/derby/impl/services/locks/Deadlock.java |    2 +-
 .../apache/derby/impl/services/locks/Timeout.java  |    4 +-
 .../derby/impl/services/monitor/BaseMonitor.java   |   26 +-
 .../services/monitor/StorageFactoryService.java    |   40 +-
 .../services/reflect/LoadedGeneratedClass.java     |    2 +
 .../impl/services/stream/RollingFileStream.java    |    8 +-
 .../derby/impl/sql/GenericPreparedStatement.java   |    7 +-
 .../derby/impl/sql/GenericResultDescription.java   |    5 +-
 java/engine/org/apache/derby/impl/sql/build.xml    |    9 +-
 .../apache/derby/impl/sql/catalog/DD_Version.java  |   17 +-
 .../derby/impl/sql/catalog/DataDictionaryImpl.java |  118 +-
 .../impl/sql/catalog/SYSCOLUMNSRowFactory.java     |   17 +-
 .../sql/catalog/SYSCONGLOMERATESRowFactory.java    |    6 +-
 .../impl/sql/catalog/SYSSEQUENCESRowFactory.java   |    2 +-
 .../derby/impl/sql/catalog/SequenceGenerator.java  |   12 +-
 .../derby/impl/sql/catalog/SequenceUpdater.java    |    8 +-
 .../apache/derby/impl/sql/catalog/TabInfoImpl.java |    8 +-
 .../derby/impl/sql/compile/AggregateNode.java      |    2 +-
 .../sql/compile/BinaryComparisonOperatorNode.java  |    2 +-
 .../derby/impl/sql/compile/BinaryOperatorNode.java |    4 +-
 .../derby/impl/sql/compile/BitTypeCompiler.java    |    2 +-
 .../impl/sql/compile/BooleanTypeCompiler.java      |    2 +-
 .../derby/impl/sql/compile/CLOBTypeCompiler.java   |    2 +-
 .../apache/derby/impl/sql/compile/CastNode.java    |   19 +-
 .../impl/sql/compile/ColumnDefinitionNode.java     |   21 +-
 .../derby/impl/sql/compile/ColumnOrdering.java     |    7 +-
 .../impl/sql/compile/CompilerContextImpl.java      |    7 +-
 .../impl/sql/compile/CountAggregateDefinition.java |    2 +-
 .../derby/impl/sql/compile/CreateViewNode.java     |    2 +-
 .../apache/derby/impl/sql/compile/CursorNode.java  |    2 +-
 .../impl/sql/compile/DMLModStatementNode.java      |    2 +-
 .../derby/impl/sql/compile/DateTypeCompiler.java   |    2 +-
 .../apache/derby/impl/sql/compile/DeleteNode.java  |    4 +-
 .../derby/impl/sql/compile/FromBaseTable.java      |    2 +-
 .../apache/derby/impl/sql/compile/FromList.java    |    6 +-
 .../apache/derby/impl/sql/compile/FromTable.java   |   15 +-
 .../org/apache/derby/impl/sql/compile/FromVTI.java |    4 +-
 .../apache/derby/impl/sql/compile/GroupByNode.java |    8 +-
 .../derby/impl/sql/compile/HashJoinStrategy.java   |    3 +-
 .../impl/sql/compile/IntersectOrExceptNode.java    |    4 +-
 .../derby/impl/sql/compile/LOBTypeCompiler.java    |    2 +-
 .../impl/sql/compile/LikeEscapeOperatorNode.java   |   28 +-
 .../sql/compile/MaxMinAggregateDefinition.java     |    2 +-
 .../derby/impl/sql/compile/ModifyColumnNode.java   |   38 +-
 .../impl/sql/compile/NumericTypeCompiler.java      |    7 +-
 .../derby/impl/sql/compile/OptimizerImpl.java      |    2 +-
 .../derby/impl/sql/compile/OptimizerTracer.java    |    5 +-
 .../derby/impl/sql/compile/OrderByColumn.java      |    2 +-
 .../derby/impl/sql/compile/OrderedColumnList.java  |    3 +-
 .../apache/derby/impl/sql/compile/Predicate.java   |   11 +-
 .../derby/impl/sql/compile/PredicateList.java      |    2 +-
 .../derby/impl/sql/compile/QueryTreeNode.java      |    1 +
 .../derby/impl/sql/compile/RefTypeCompiler.java    |    2 +-
 .../derby/impl/sql/compile/RelationalOperator.java |    6 +-
 .../derby/impl/sql/compile/ResultColumn.java       |   19 +
 .../derby/impl/sql/compile/ResultColumnList.java   |   31 +-
 .../derby/impl/sql/compile/ResultSetNode.java      |    6 +-
 .../apache/derby/impl/sql/compile/SelectNode.java  |    7 +
 .../impl/sql/compile/StaticMethodCallNode.java     |    1 +
 .../derby/impl/sql/compile/SubqueryNode.java       |    2 +-
 .../sql/compile/SumAvgAggregateDefinition.java     |    2 +-
 .../derby/impl/sql/compile/TableElementList.java   |    4 +-
 .../impl/sql/compile/TernaryOperatorNode.java      |    7 +-
 .../derby/impl/sql/compile/TimeTypeCompiler.java   |    2 +-
 .../impl/sql/compile/TimestampTypeCompiler.java    |    2 +-
 .../impl/sql/compile/TypeCompilerFactoryImpl.java  |   11 +-
 .../apache/derby/impl/sql/compile/UpdateNode.java  |    4 +-
 .../impl/sql/compile/UserAggregateDefinition.java  |    2 +-
 .../impl/sql/compile/UserDefinedTypeCompiler.java  |    2 +-
 .../apache/derby/impl/sql/compile/ValueNode.java   |    4 +-
 .../derby/impl/sql/compile/ValueNodeList.java      |    2 +-
 .../derby/impl/sql/compile/XMLTypeCompiler.java    |    2 +-
 .../apache/derby/impl/sql/compile/sqlgrammar.jj    |  199 ++-
 .../sql/conn/GenericLanguageConnectionContext.java |    2 +-
 .../impl/sql/conn/GenericStatementContext.java     |    2 +-
 .../apache/derby/impl/sql/conn/TempTableInfo.java  |    2 +-
 .../impl/sql/execute/AlterTableConstantAction.java |   78 +-
 .../impl/sql/execute/AutoincrementCounter.java     |    2 +-
 .../derby/impl/sql/execute/BaseActivation.java     |    4 +-
 .../apache/derby/impl/sql/execute/ColumnInfo.java  |    7 +
 .../sql/execute/CreateSequenceConstantAction.java  |    2 +-
 .../sql/execute/CreateTableConstantAction.java     |    7 +-
 .../derby/impl/sql/execute/DMLVTIResultSet.java    |    2 +-
 .../execute/DMLWriteGeneratedColumnsResultSet.java |    4 +-
 .../derby/impl/sql/execute/GenericAggregator.java  |    7 +-
 .../sql/execute/GenericConstantActionFactory.java  |    2 +-
 .../derby/impl/sql/execute/IndexChanger.java       |    2 +-
 .../derby/impl/sql/execute/InsertResultSet.java    |    6 +-
 .../execute/InternalTriggerExecutionContext.java   |    2 +-
 .../org/apache/derby/impl/sql/execute/JarUtil.java |    4 +-
 .../derby/impl/sql/execute/RowChangerImpl.java     |    4 +-
 .../org/apache/derby/impl/sql/execute/RowUtil.java |    4 +-
 .../derby/impl/sql/execute/TableScanResultSet.java |    2 +-
 .../sql/execute/TemporaryRowHolderResultSet.java   |    2 +-
 .../impl/sql/execute/UpdateConstantAction.java     |    2 +-
 .../derby/impl/sql/execute/UpdateResultSet.java    |   38 -
 .../impl/sql/execute/UserDefinedAggregator.java    |    6 +-
 .../sql/execute/WriteCursorConstantAction.java     |    2 +-
 .../rts/RealBasicNoPutResultSetStatistics.java     |   26 +-
 .../execute/rts/RealDeleteResultSetStatistics.java |    4 +-
 .../rts/RealDeleteVTIResultSetStatistics.java      |    2 +-
 .../rts/RealGroupedAggregateStatistics.java        |   12 +-
 .../rts/RealHashLeftOuterJoinStatistics.java       |   16 +-
 .../sql/execute/rts/RealHashScanStatistics.java    |   14 +-
 .../sql/execute/rts/RealHashTableStatistics.java   |    2 +-
 .../execute/rts/RealInsertResultSetStatistics.java |    4 +-
 .../rts/RealInsertVTIResultSetStatistics.java      |    2 +-
 .../execute/rts/RealJoinResultSetStatistics.java   |   24 +-
 .../rts/RealLastIndexKeyScanStatistics.java        |   12 +-
 .../rts/RealMaterializedResultSetStatistics.java   |   14 +-
 .../rts/RealNestedLoopLeftOuterJoinStatistics.java |   16 +-
 .../execute/rts/RealNoRowsResultSetStatistics.java |    2 +-
 .../execute/rts/RealProjectRestrictStatistics.java |   14 +-
 .../execute/rts/RealRowResultSetStatistics.java    |   12 +-
 .../execute/rts/RealScalarAggregateStatistics.java |   14 +-
 .../execute/rts/RealSetOpResultSetStatistics.java  |   14 +-
 .../impl/sql/execute/rts/RealSortStatistics.java   |   14 +-
 .../sql/execute/rts/RealTableScanStatistics.java   |   14 +-
 .../execute/rts/RealUnionResultSetStatistics.java  |   14 +-
 .../execute/rts/RealUpdateResultSetStatistics.java |    4 +-
 .../execute/xplain/XPLAINSystemTableVisitor.java   |   12 +-
 .../derby/impl/sql/execute/xplain/XPLAINUtil.java  |   22 +-
 .../derby/impl/store/access/RAMAccessManager.java  |    8 +-
 .../derby/impl/store/access/RAMTransaction.java    |   23 +-
 .../derby/impl/store/access/StorableFormatId.java  |    4 +-
 .../derby/impl/store/access/btree/BTree.java       |    2 +-
 .../impl/store/access/btree/BTreeController.java   |    6 +-
 .../store/access/btree/BTreeLockingPolicy.java     |    6 +-
 .../derby/impl/store/access/btree/BTreeScan.java   |   30 +-
 .../impl/store/access/btree/BranchControlRow.java  |    2 +-
 .../derby/impl/store/access/btree/ControlRow.java  |    8 +-
 .../derby/impl/store/access/btree/OpenBTree.java   |    4 +-
 .../impl/store/access/btree/index/B2IFactory.java  |    2 +-
 .../access/conglomerate/GenericConglomerate.java   |    4 +-
 .../GenericConglomerateController.java             |   14 +-
 .../access/conglomerate/GenericScanController.java |   12 +-
 .../apache/derby/impl/store/access/heap/Heap.java  |   20 +-
 .../store/access/heap/HeapConglomerateFactory.java |    2 +-
 .../impl/store/access/heap/HeapController.java     |   10 +-
 .../impl/store/access/sort/MergeInserter.java      |    6 +-
 .../derby/impl/store/access/sort/MergeSort.java    |    6 +-
 java/engine/org/apache/derby/impl/store/build.xml  |    9 +-
 .../org/apache/derby/impl/store/raw/RawStore.java  |   54 +-
 .../derby/impl/store/raw/data/AllocPage.java       |   10 +-
 .../derby/impl/store/raw/data/BaseContainer.java   |    8 +-
 .../impl/store/raw/data/BaseContainerHandle.java   |   18 +-
 .../impl/store/raw/data/BaseDataFileFactory.java   |    3 +-
 .../apache/derby/impl/store/raw/data/BasePage.java |   20 +-
 .../derby/impl/store/raw/data/CachedPage.java      |    2 +-
 .../store/raw/data/ContainerActionOnCommit.java    |    5 +-
 .../derby/impl/store/raw/data/DropOnCommit.java    |    5 +-
 .../impl/store/raw/data/EncryptOrDecryptData.java  |   10 +-
 .../derby/impl/store/raw/data/FileContainer.java   |   12 +-
 .../impl/store/raw/data/OverflowInputStream.java   |    2 +-
 .../impl/store/raw/data/PageBasicOperation.java    |    4 +-
 .../derby/impl/store/raw/data/RAFContainer.java    |   26 +-
 .../derby/impl/store/raw/data/RAFContainer4.java   |   19 +-
 .../apache/derby/impl/store/raw/data/RecordId.java |    2 +-
 .../derby/impl/store/raw/data/StoredPage.java      |   10 +-
 .../impl/store/raw/data/StoredRecordHeader.java    |    2 +-
 .../impl/store/raw/data/StreamFileContainer.java   |   16 +-
 .../store/raw/data/StreamFileContainerHandle.java  |   10 +-
 .../derby/impl/store/raw/data/SyncOnCommit.java    |    6 +-
 .../impl/store/raw/data/TruncateOnCommit.java      |    6 +-
 .../derby/impl/store/raw/log/LogAccessFile.java    |    2 +-
 .../derby/impl/store/raw/log/LogCounter.java       |    2 +-
 .../apache/derby/impl/store/raw/log/LogToFile.java |   33 +-
 .../org/apache/derby/impl/store/raw/log/Scan.java  |   16 +-
 .../impl/store/raw/xact/TransactionTable.java      |    2 +-
 .../apache/derby/impl/store/raw/xact/XactId.java   |    4 +-
 .../replication/buffer/ReplicationLogBuffer.java   |    2 +-
 .../replication/master/AsynchronousLogShipper.java |   10 +-
 .../net/ReplicationMessageTransmit.java            |    6 +-
 .../store/replication/slave/SlaveController.java   |   15 +-
 java/engine/org/apache/derby/io/build.xml          |    8 +-
 .../org/apache/derby/jdbc/AutoloadedDriver.java    |   11 -
 .../apache/derby/jdbc/ReferenceableDataSource.java |    2 +-
 .../org/apache/derby/jdbc/XATransactionState.java  |  417 +++--
 java/engine/org/apache/derby/jdbc/build.xml        |   16 +-
 java/engine/org/apache/derby/jdbc/package.html     |   18 +-
 java/engine/org/apache/derby/loc/messages.xml      |   27 +-
 java/engine/org/apache/derby/mbeans/build.xml      |    8 +-
 java/engine/org/apache/derby/modules.properties    |    7 -
 java/engine/org/apache/derby/osgi/build.xml        |    8 +-
 java/engine/org/apache/derby/security/build.xml    |    8 +-
 .../org/apache/derby/vti/DeferModification.java    |    2 +-
 .../engine/org/apache/derby/vti/RestrictedVTI.java |    2 +-
 java/engine/org/apache/derby/vti/Restriction.java  |   10 +-
 java/engine/org/apache/derby/vti/build.xml         |    8 +-
 java/optional/build.xml                            |    7 +-
 .../apache/derby/optional/dump/DataFileVTI.java    | 1710 ++++++++++++++++++++
 .../apache/derby/optional/dump/RawDBReader.java    |  760 +++++++++
 .../optional/lucene/LuceneListIndexesVTI.java      |    8 +-
 .../derby/optional/lucene/LuceneQueryVTI.java      |    4 +-
 java/shared/build.xml                              |   24 +-
 .../derby/shared/common/reference/SQLState.java    |    4 +
 .../derby/shared/common/sanity/AssertFailure.java  |    4 +-
 java/storeless/build.xml                           |    6 +-
 java/stubs/jdbc4/java/sql/Array.java               |   36 -
 .../stubs/jdbc4/java/sql/BatchUpdateException.java |   34 -
 java/stubs/jdbc4/java/sql/Blob.java                |   34 -
 java/stubs/jdbc4/java/sql/CallableStatement.java   |  140 --
 java/stubs/jdbc4/java/sql/ClientInfoStatus.java    |   28 -
 java/stubs/jdbc4/java/sql/Clob.java                |   35 -
 java/stubs/jdbc4/java/sql/Connection.java          |   82 -
 java/stubs/jdbc4/java/sql/DataTruncation.java      |   31 -
 java/stubs/jdbc4/java/sql/DatabaseMetaData.java    |  264 ---
 java/stubs/jdbc4/java/sql/Date.java                |   41 -
 java/stubs/jdbc4/java/sql/Driver.java              |   31 -
 java/stubs/jdbc4/java/sql/DriverManager.java       |   37 -
 java/stubs/jdbc4/java/sql/DriverPropertyInfo.java  |   31 -
 java/stubs/jdbc4/java/sql/NClob.java               |   24 -
 java/stubs/jdbc4/java/sql/ParameterMetaData.java   |   40 -
 java/stubs/jdbc4/java/sql/PreparedStatement.java   |   84 -
 java/stubs/jdbc4/java/sql/Ref.java                 |   26 -
 java/stubs/jdbc4/java/sql/ResultSet.java           |  227 ---
 java/stubs/jdbc4/java/sql/ResultSetMetaData.java   |   48 -
 java/stubs/jdbc4/java/sql/RowId.java               |   26 -
 java/stubs/jdbc4/java/sql/RowIdLifetime.java       |   28 -
 .../jdbc4/java/sql/SQLClientInfoException.java     |   35 -
 java/stubs/jdbc4/java/sql/SQLData.java             |   25 -
 java/stubs/jdbc4/java/sql/SQLDataException.java    |   32 -
 java/stubs/jdbc4/java/sql/SQLException.java        |   40 -
 .../java/sql/SQLFeatureNotSupportedException.java  |   32 -
 java/stubs/jdbc4/java/sql/SQLInput.java            |   49 -
 .../SQLIntegrityConstraintViolationException.java  |   31 -
 .../sql/SQLInvalidAuthorizationSpecException.java  |   32 -
 .../sql/SQLNonTransientConnectionException.java    |   30 -
 .../jdbc4/java/sql/SQLNonTransientException.java   |   31 -
 java/stubs/jdbc4/java/sql/SQLOutput.java           |   49 -
 java/stubs/jdbc4/java/sql/SQLPermission.java       |   24 -
 .../jdbc4/java/sql/SQLRecoverableException.java    |   31 -
 .../jdbc4/java/sql/SQLSyntaxErrorException.java    |   31 -
 java/stubs/jdbc4/java/sql/SQLTimeoutException.java |   31 -
 .../java/sql/SQLTransactionRollbackException.java  |   31 -
 .../java/sql/SQLTransientConnectionException.java  |   31 -
 .../jdbc4/java/sql/SQLTransientException.java      |   30 -
 java/stubs/jdbc4/java/sql/SQLWarning.java          |   36 -
 java/stubs/jdbc4/java/sql/SQLXML.java              |   38 -
 java/stubs/jdbc4/java/sql/Savepoint.java           |   24 -
 java/stubs/jdbc4/java/sql/Statement.java           |   70 -
 java/stubs/jdbc4/java/sql/Struct.java              |   25 -
 java/stubs/jdbc4/java/sql/Time.java                |   43 -
 java/stubs/jdbc4/java/sql/Timestamp.java           |   38 -
 java/stubs/jdbc4/java/sql/Types.java               |   58 -
 java/stubs/jdbc4/java/sql/Wrapper.java             |   24 -
 java/stubs/jdbc4/javax/sql/CommonDataSource.java   |   29 -
 java/stubs/jdbc4/javax/sql/ConnectionEvent.java    |   28 -
 .../jdbc4/javax/sql/ConnectionEventListener.java   |   24 -
 .../jdbc4/javax/sql/ConnectionPoolDataSource.java  |   27 -
 java/stubs/jdbc4/javax/sql/DataSource.java         |   29 -
 java/stubs/jdbc4/javax/sql/PooledConnection.java   |   31 -
 java/stubs/jdbc4/javax/sql/RowSet.java             |  155 --
 java/stubs/jdbc4/javax/sql/RowSetEvent.java        |   23 -
 java/stubs/jdbc4/javax/sql/RowSetInternal.java     |   32 -
 java/stubs/jdbc4/javax/sql/RowSetListener.java     |   25 -
 java/stubs/jdbc4/javax/sql/RowSetMetaData.java     |   44 -
 java/stubs/jdbc4/javax/sql/RowSetReader.java       |   26 -
 java/stubs/jdbc4/javax/sql/RowSetWriter.java       |   26 -
 java/stubs/jdbc4/javax/sql/StatementEvent.java     |   30 -
 .../jdbc4/javax/sql/StatementEventListener.java    |   24 -
 java/stubs/jdbc4/javax/sql/XAConnection.java       |   26 -
 java/stubs/jdbc4/javax/sql/XADataSource.java       |   27 -
 java/stubs/jdbc4/javax/sql/rowset/BaseRowSet.java  |  181 ---
 .../stubs/jdbc4/javax/sql/rowset/CachedRowSet.java |   80 -
 .../jdbc4/javax/sql/rowset/FilteredRowSet.java     |   27 -
 java/stubs/jdbc4/javax/sql/rowset/JdbcRowSet.java  |   35 -
 java/stubs/jdbc4/javax/sql/rowset/JoinRowSet.java  |   49 -
 java/stubs/jdbc4/javax/sql/rowset/Joinable.java    |   35 -
 java/stubs/jdbc4/javax/sql/rowset/Predicate.java   |   29 -
 .../jdbc4/javax/sql/rowset/RowSetMetaDataImpl.java |   69 -
 .../jdbc4/javax/sql/rowset/RowSetWarning.java      |   29 -
 java/stubs/jdbc4/javax/sql/rowset/WebRowSet.java   |   40 -
 .../javax/sql/rowset/serial/SQLInputImpl.java      |   73 -
 .../javax/sql/rowset/serial/SQLOutputImpl.java     |   74 -
 .../jdbc4/javax/sql/rowset/serial/SerialArray.java |   42 -
 .../jdbc4/javax/sql/rowset/serial/SerialBlob.java  |   44 -
 .../jdbc4/javax/sql/rowset/serial/SerialClob.java  |   48 -
 .../javax/sql/rowset/serial/SerialDatalink.java    |   29 -
 .../javax/sql/rowset/serial/SerialException.java   |   28 -
 .../javax/sql/rowset/serial/SerialJavaObject.java  |   29 -
 .../jdbc4/javax/sql/rowset/serial/SerialRef.java   |   34 -
 .../javax/sql/rowset/serial/SerialStruct.java      |   35 -
 .../jdbc4/javax/sql/rowset/spi/SyncFactory.java    |   41 -
 .../javax/sql/rowset/spi/SyncFactoryException.java |   27 -
 .../jdbc4/javax/sql/rowset/spi/SyncProvider.java   |   51 -
 .../sql/rowset/spi/SyncProviderException.java      |   31 -
 .../jdbc4/javax/sql/rowset/spi/SyncResolver.java   |   38 -
 .../javax/sql/rowset/spi/TransactionalWriter.java  |   30 -
 .../jdbc4/javax/sql/rowset/spi/XmlReader.java      |   27 -
 .../jdbc4/javax/sql/rowset/spi/XmlWriter.java      |   27 -
 java/testing/README.htm                            |   13 +-
 java/testing/org/apache/derby/build.xml            |    6 +-
 .../harness/BackgroundStreamDrainer.java           |    2 +-
 .../functionTests/harness/FileCompare.java         |    2 +-
 .../functionTests/harness/HandleResult.java        |    2 +-
 .../functionTests/harness/JavaVersionHolder.java   |   26 +-
 .../functionTests/harness/MultiTest.java           |    2 +-
 .../functionTests/harness/ProcessStreamResult.java |    6 +-
 .../functionTests/harness/RunList.java             |    4 +-
 .../functionTests/harness/RunTest.java             |    8 +-
 .../derbyTesting/functionTests/harness/Sed.java    |  131 +-
 .../derbyTesting/functionTests/harness/build.xml   |    7 +-
 .../functionTests/harness/dbcleanup.java           |    3 +-
 .../derbyTesting/functionTests/harness/jvm.java    |   20 +-
 .../functionTests/harness/shutdown.java            |    3 +-
 .../functionTests/master/functions.out             |    2 +-
 .../derbyTesting/functionTests/master/schemas.out  |    4 +-
 .../functionTests/master/valuesclause.out          |    4 +-
 .../derbyTesting/functionTests/suites/build.xml    |    6 +-
 .../derbyTesting/functionTests/testData/build.xml  |    8 +-
 .../SerializeDataSources.java                      |    4 +-
 .../compatibility/AbstractCompatibilityTest.java   |   10 +-
 .../tests/compatibility/JDBCDriverTest.java        |   22 +-
 .../functionTests/tests/compatibility/build.xml    |    6 +-
 .../functionTests/tests/demo/build.xml             |    6 +-
 .../tests/derbynet/NSSecurityMechanismTest.java    |   33 +-
 .../tests/derbynet/PrepareStatementTest.java       |   23 +-
 .../functionTests/tests/derbynet/ProtocolTest.java |    2 +-
 .../tests/derbynet/ServerPropertiesTest.java       |    4 +-
 .../derbynet/ShutDownDBWhenNSShutsDownTest.java    |    8 +-
 .../functionTests/tests/derbynet/build.xml         |    8 +-
 .../engine/RestrictiveFilePermissionsTest.java     |  365 +----
 .../functionTests/tests/engine/build.xml           |    6 +-
 .../functionTests/tests/i18n/UrlLocaleTest.java    |    3 +-
 .../functionTests/tests/i18n/build.xml             |    6 +-
 .../functionTests/tests/jdbc4/BlobTest.java        |   40 +-
 .../tests/jdbc4/CallableStatementTest.java         |   12 +-
 .../functionTests/tests/jdbc4/ClobTest.java        |   40 +-
 .../functionTests/tests/jdbc4/DataSourceTest.java  |    6 +-
 .../tests/jdbc4/PreparedStatementTest42.java       |   12 +-
 .../functionTests/tests/jdbc4/StatementTest.java   |    4 +-
 .../functionTests/tests/jdbc4/TestDbMetaData.java  |  146 +-
 .../tests/jdbc4/TestJDBC40Exception.java           |    2 +-
 .../tests/jdbc4/UnsupportedVetter.java             |   27 +-
 .../functionTests/tests/jdbc4/build.xml            |   16 +-
 .../functionTests/tests/jdbcapi/AutoloadTest.java  |    6 +-
 .../tests/jdbcapi/BatchUpdateTest.java             |    2 +-
 .../tests/jdbcapi/CacheSessionDataTest.java        |    6 +-
 .../tests/jdbcapi/CharacterStreamsTest.java        |    4 +-
 .../ClientConnectionPoolDataSourceTest.java        |   11 +-
 .../tests/jdbcapi/ClosedObjectTest.java            |   14 +-
 .../tests/jdbcapi/DataSourceReferenceTest.java     |   15 +-
 .../tests/jdbcapi/DataSourceSerializationTest.java |    4 +-
 .../tests/jdbcapi/DataSourceTest.java              |   28 +-
 .../tests/jdbcapi/DatabaseMetaDataTest.java        |   26 +-
 .../functionTests/tests/jdbcapi/DriverTest.java    |    3 +-
 .../tests/jdbcapi/InternationalConnectTest.java    |   11 +-
 .../tests/jdbcapi/J2EEDataSourceTest.java          |   88 +-
 .../tests/jdbcapi/ParameterMappingTest.java        |   19 +-
 .../tests/jdbcapi/ParameterMetaDataJdbc30Test.java |    4 +-
 .../functionTests/tests/jdbcapi/ProcedureTest.java |   22 +-
 .../tests/jdbcapi/ResultSetMiscTest.java           |   27 +-
 .../tests/jdbcapi/SURQueryMixTest.java             |   16 +-
 .../functionTests/tests/jdbcapi/SURTest.java       |    2 +-
 .../tests/jdbcapi/StatementPoolingTest.java        |    2 +-
 .../functionTests/tests/jdbcapi/XATest.java        |   91 +-
 .../functionTests/tests/jdbcapi/XATest.policy      |  289 ++++
 .../functionTests/tests/jdbcapi/build.xml          |    6 +-
 .../functionTests/tests/lang/AlterTableTest.java   |  269 +++
 .../functionTests/tests/lang/AnsiSignatures.java   |  650 ++++----
 .../functionTests/tests/lang/AnsiTrimTest.java     |    2 +-
 .../tests/lang/AutoIncrementTest.java              |    4 +-
 .../functionTests/tests/lang/BigDataTest.java      |    4 +-
 .../tests/lang/BooleanValuesTest.java              |    8 +-
 .../functionTests/tests/lang/CollationTest.java    |   43 +-
 .../functionTests/tests/lang/CollationTest2.java   |   62 +-
 .../tests/lang/ConcurrentImplicitCreateSchema.java |    3 +-
 .../tests/lang/Derby6725GetDatabaseName.java       |    8 +-
 .../tests/lang/DynamicLikeOptimizationTest.java    |   20 +-
 .../functionTests/tests/lang/ForBitDataTest.java   |    2 +-
 .../tests/lang/GeneratedColumnsTest.java           |  128 +-
 .../tests/lang/GetPropertyInfoTest.java            |    3 +-
 .../tests/lang/GrantRevokeDDLTest.java             |    6 +-
 .../tests/lang/GroupByExpressionTest.java          |   30 +-
 .../functionTests/tests/lang/GroupByTest.java      |   14 +-
 .../tests/lang/IdentitySequenceTest.java           |  431 +++++
 .../tests/lang/InListMultiProbeTest.java           |    4 +-
 .../functionTests/tests/lang/InPredicateTest.java  |    6 +-
 .../tests/lang/LangProcedureTest.java              |   10 +-
 .../functionTests/tests/lang/LobMode.java          |    4 +-
 .../tests/lang/MergeStatementTest.java             |   28 +
 .../lang/OrderByAndOffsetFetchInSubqueries.java    |    2 +-
 .../functionTests/tests/lang/OuterJoinTest.java    |    2 +-
 .../tests/lang/PredicatePushdownTest.java          |    2 +-
 .../functionTests/tests/lang/RSMDWrapper.java      |    2 +-
 .../functionTests/tests/lang/RawDBReaderTest.java  |  374 +++++
 .../tests/lang/RestrictedVTITest.java              |    2 +-
 .../lang/ResultSetsFromPreparedStatementTest.java  |   48 +-
 .../functionTests/tests/lang/RolesTest.java        |    2 +-
 .../functionTests/tests/lang/RoutineTest.java      |   12 +-
 .../functionTests/tests/lang/SGVetter.java         |    4 +-
 .../tests/lang/SequenceGeneratorTest.java          |   14 +-
 .../tests/lang/StatementPlanCacheTest.java         |    2 +-
 .../tests/lang/TableFunctionTest.java              |  362 +++--
 .../tests/lang/TimestampArithTest.java             |    6 +-
 .../tests/lang/TriggerGeneralTest.java             |    2 +-
 .../functionTests/tests/lang/TriggerTest.java      |  145 +-
 .../functionTests/tests/lang/UDTTest.java          |    2 +-
 .../tests/lang/UnaryArithmeticParameterTest.java   |   34 +-
 .../tests/lang/UpdatableResultSetTest.java         |  137 +-
 .../functionTests/tests/lang/UpdateCursorTest.java |    4 +-
 .../tests/lang/XMLOptimizerTraceTest.java          |    6 +-
 .../functionTests/tests/lang/XMLXXETest.java       |   20 +-
 .../functionTests/tests/lang/_Suite.java           |    1 +
 .../functionTests/tests/lang/build.xml             |    7 +-
 .../functionTests/tests/lang/outparams.java        |   42 +-
 .../functionTests/tests/lang/outparams30.java      |    3 +-
 .../functionTests/tests/lang/userDefMethods.java   |    2 +-
 .../tests/largedata/Derby6317Test.java             |   12 +-
 .../tests/largedata/Derby6884Test.java             |  156 ++
 .../functionTests/tests/largedata/_Suite.java      |    1 +
 .../functionTests/tests/largedata/build.xml        |    6 +-
 .../functionTests/tests/management/MBeanTest.java  |    2 +-
 .../functionTests/tests/management/build.xml       |    6 +-
 .../functionTests/tests/memory/BlobMemTest.java    |    2 +-
 .../functionTests/tests/memory/ClobMemTest.java    |    2 +-
 .../tests/memory/ConnectionHandlingJunit.java      |   11 +-
 .../functionTests/tests/memory/build.xml           |    6 +-
 .../tests/memorydb/DropWhileConnectingTest.java    |    4 +-
 .../functionTests/tests/memorydb/build.xml         |    7 +-
 .../functionTests/tests/multi/build.xml            |    6 +-
 .../functionTests/tests/nist/build.xml             |    6 +-
 .../functionTests/tests/perf/build.xml             |    6 +-
 .../tests/replicationTests/ReplicationRun.java     |   18 +-
 .../ReplicationRun_Local_1Indexing.java            |    9 +-
 .../replicationTests/ReplicationRun_Local_3.java   |   27 +-
 .../ReplicationRun_Local_3_p3.java                 |   10 +-
 .../ReplicationRun_Local_3_p4.java                 |   18 +-
 .../ReplicationRun_Local_3_p6.java                 |    9 +-
 .../ReplicationRun_Local_Encrypted_1.java          |    9 +-
 .../tests/replicationTests/SimplePerfTest.java     |   13 +-
 .../replicationTests/SimplePerfTest_Verify.java    |   14 +-
 .../functionTests/tests/replicationTests/build.xml |    8 +-
 .../functionTests/tests/store/Beetle6038.java      |    3 +-
 .../functionTests/tests/store/BootAllTest.java     |    5 +-
 .../tests/store/ClobReclamationTest.java           |    2 +-
 .../functionTests/tests/store/Derby4577Test.java   |    2 +-
 .../tests/store/EncryptionAESTest.java             |    7 +-
 .../tests/store/InterruptResilienceTest.java       |    3 +-
 .../tests/store/StreamingColumnTest.java           |    2 +-
 .../functionTests/tests/store/build.xml            |    6 +-
 .../functionTests/tests/storetests/build.xml       |    6 +-
 .../tests/storetests/st_reclaim_longcol.java       |    2 +-
 .../tests/tools/ImportExportProcedureTest.java     |  583 ++++++-
 .../tests/tools/SysinfoCPCheckTest.java            |   37 +-
 .../tests/tools/SysinfoLocaleTest.java             |    8 +-
 .../functionTests/tests/tools/build.xml            |    7 +-
 .../functionTests/tests/tools/dblook_test.java     |    3 +-
 .../tests/upgradeTests/Changes10_13.java           |  383 +++++
 .../tests/upgradeTests/Changes10_9.java            |    4 +-
 .../tests/upgradeTests/OldVersions.java            |    1 +
 .../tests/upgradeTests/UpgradeClassLoader.java     |   10 +-
 .../tests/upgradeTests/UpgradeRun.java             |    2 +
 .../tests/upgradeTests/UpgradeTrajectoryTest.java  |    2 +-
 .../functionTests/tests/upgradeTests/build.xml     |    9 +-
 .../functionTests/util/DeadlockWatchdog.java       |   95 ++
 .../functionTests/util/DerbyJUnitTest.java         |   38 +-
 .../functionTests/util/ManyMethods.java            |   40 +-
 .../util/PrivilegedFileOpsForTests.java            |   10 +
 .../functionTests/util/ProcedureTest.java          |    6 +-
 .../functionTests/util/T_Authorize.java            |    2 +-
 .../derbyTesting/functionTests/util/TestUtil.java  |   21 +-
 .../derbyTesting/functionTests/util/build.xml      |    7 +-
 .../util/corruptio/CorruptDiskStorageFactory.java  |    4 +-
 .../derbyTesting/junit/BaseJDBCTestCase.java       |    2 +-
 .../derbyTesting/junit/BaseJDBCTestSetup.java      |    2 +-
 .../apache/derbyTesting/junit/BaseTestCase.java    |    2 +-
 .../derbyTesting/junit/ClassLoaderTestSetup.java   |   15 +-
 .../junit/ConnectionPoolDataSourceConnector.java   |    2 +-
 .../apache/derbyTesting/junit/ConnectorSetup.java  |    4 +-
 .../derbyTesting/junit/DriverManagerConnector.java |    9 +-
 .../org/apache/derbyTesting/junit/JDBC.java        |    6 +-
 .../apache/derbyTesting/junit/JDBCDataSource.java  |    8 +-
 .../derbyTesting/junit/JDBCPerfTestCase.java       |    2 +-
 .../apache/derbyTesting/junit/SpawnedProcess.java  |    2 +-
 .../derbyTesting/junit/TestConfiguration.java      |   14 +-
 .../org/apache/derbyTesting/junit/build.xml        |    6 +-
 .../testing/org/apache/derbyTesting/perf/build.xml |    6 +-
 .../apache/derbyTesting/perf/clients/Runner.java   |    3 +-
 .../apache/derbyTesting/system/mailjdbc/build.xml  |    6 +-
 .../derbyTesting/system/mailjdbc/schema/schema.sql |    1 -
 .../system/mailjdbc/utils/DbTasks.java             |    8 +-
 .../system/mailjdbc/utils/Statements.java          |    2 +-
 .../apache/derbyTesting/system/nstest/NsTest.java  |    7 +-
 .../apache/derbyTesting/system/nstest/build.xml    |    6 +-
 .../org/apache/derbyTesting/system/oe/build.xml    |    6 +-
 .../derbyTesting/system/oe/client/Submitter.java   |    3 +-
 .../derbyTesting/system/oe/model/Customer.java     |    4 +-
 .../derbyTesting/system/oe/model/District.java     |    2 +-
 .../apache/derbyTesting/system/oe/model/Order.java |    6 +-
 .../system/oe/test/OperationsTester.java           |   10 +-
 .../apache/derbyTesting/system/optimizer/build.xml |    6 +-
 .../apache/derbyTesting/system/sttest/Sttest.java  |    3 +-
 .../apache/derbyTesting/system/sttest/build.xml    |    6 +-
 .../system/sttest/utils/CompressTable.java         |    5 +-
 .../org/apache/derbyTesting/unitTests/build.xml    |    6 +-
 .../unitTests/harness/BasicUnitTestManager.java    |    2 +-
 .../unitTests/junit/FormatableBitSetTest.java      |    2 +-
 .../unitTests/junit/MissingPermissionsTest.java    |    2 +-
 .../unitTests/services/T_Diagnosticable.java       |    2 +-
 .../derbyTesting/unitTests/services/T_Key.java     |   10 +-
 .../unitTests/services/T_LockFactory.java          |    2 +-
 .../derbyTesting/unitTests/services/T_User.java    |    8 +-
 .../unitTests/store/T_QualifierTest.java           |   14 +-
 .../unitTests/store/T_RawStoreFactory.java         |   14 +-
 .../derbyTesting/unitTests/store/T_Recovery.java   |    6 +-
 java/tools/org/apache/derby/iapi/tools/build.xml   |   16 +-
 .../derby/iapi/tools/i18n/LocalizedResource.java   |    2 +-
 java/tools/org/apache/derby/iapi/tools/run.java    |    8 +-
 java/tools/org/apache/derby/impl/tools/build.xml   |    9 +-
 .../derby/impl/tools/dblook/DB_GrantRevoke.java    |    2 +-
 .../apache/derby/impl/tools/ij/ConnectionEnv.java  |    3 +-
 .../derby/impl/tools/ij/StatementFinder.java       |    2 +-
 java/tools/org/apache/derby/impl/tools/ij/ij.jj    |   11 +-
 .../apache/derby/impl/tools/ij/ijVectorResult.java |    7 -
 .../org/apache/derby/impl/tools/ij/mtGrammar.jj    |    2 +-
 .../tools/org/apache/derby/impl/tools/ij/util.java |   18 +-
 .../org/apache/derby/impl/tools/ij/utilMain.java   |    4 +
 .../org/apache/derby/impl/tools/ij/xaHelper.java   |   58 +-
 .../derby/impl/tools/optional/DBMDWrapper.java     |    7 +-
 .../impl/tools/planexporter/AccessDatabase.java    |   16 +-
 .../org/apache/derby/loc/toolsmessages.properties  |   45 +-
 .../derby/loc/toolsmessages_zh_CN.properties       |   43 +-
 .../tools/org/apache/derby/tools/PlanExporter.java |   45 +-
 java/tools/org/apache/derby/tools/build.xml        |    8 +-
 java/tools/org/apache/derby/tools/dblook.java      |    2 +-
 java/tools/org/apache/derby/tools/ij.java          |    3 +-
 maven2/client/pom.xml                              |    1 +
 maven2/derbyLocale_cs/pom.xml                      |    1 +
 maven2/derbyLocale_de_DE/pom.xml                   |    2 +-
 maven2/derbyLocale_es/pom.xml                      |    1 +
 maven2/derbyLocale_fr/pom.xml                      |    1 +
 maven2/derbyLocale_hu/pom.xml                      |    1 +
 maven2/derbyLocale_it/pom.xml                      |    1 +
 maven2/derbyLocale_ja_JP/pom.xml                   |    1 +
 maven2/derbyLocale_ko_KR/pom.xml                   |    1 +
 maven2/derbyLocale_pl/pom.xml                      |    1 +
 maven2/derbyLocale_pt_BR/pom.xml                   |    1 +
 maven2/derbyLocale_ru/pom.xml                      |    1 +
 maven2/derbyLocale_zh_CN/pom.xml                   |    1 +
 maven2/derbyLocale_zh_TW/pom.xml                   |    1 +
 maven2/engine/pom.xml                              |    1 +
 maven2/net/pom.xml                                 |    1 +
 maven2/optionaltools/pom.xml                       |    1 +
 maven2/tools/pom.xml                               |    1 +
 maven2/war/pom.xml                                 |    1 +
 releaseSummary.xml                                 |   35 +-
 tools/ant/properties/compilepath.properties        |   31 -
 tools/ant/properties/defaultcompiler.properties    |    3 +
 tools/ant/properties/dirs.properties               |    6 -
 tools/ant/properties/extrapath.properties          |    3 +-
 tools/ant/properties/release.properties            |   10 +-
 tools/ide/netbeans/nbproject/project.xml           |    4 +-
 tools/jar/extraDBMSclasses.properties              |    4 -
 tools/l10n/build.xml                               |    8 +-
 tools/release/build.xml                            |   12 -
 tools/release/notices/jdbcstubs.txt                |    6 +-
 tools/release/templates/releaseSummaryTemplate.xml |    7 -
 tools/testing/reporting/TEMPLATES/testenv.sh       |    3 +-
 768 files changed, 10786 insertions(+), 10100 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/derby.git



More information about the pkg-java-commits mailing list