db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: rev 57465 - in incubator/derby/code/trunk/java/engine/org/apache/derby/impl: load sql sql/catalog sql/execute sql/execute/rts
Date Thu, 11 Nov 2004 20:01:52 GMT
Author: djd
Date: Thu Nov 11 12:01:50 2004
New Revision: 57465

Modified:
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ColumnInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/Export.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ExportAbstract.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ExportResultSetForObject.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ExportWriteData.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ExportWriteDataAbstract.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportReadData.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportResultSetMetaData.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/LoadError.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/CursorInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericActivationHolder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericColumnDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericPreparedStatement.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/LanguageDbPropertySetter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/CoreDDFinderClassInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDColumnDependableFinder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDdependableFinder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryContextImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DropDependencyFilter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/IndexInfoImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/IndexScan.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/NameTDCacheable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/OIDTDCacheable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SPSNameCacheable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDUMMY1RowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SystemColumnImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TDCacheable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TabInfoImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TableKey.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AddJarConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AggregateSortObserver.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AggregatorInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AggregatorInfoList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AlterSPSConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AnyResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AutoincrementCounter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AvgAggregator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BaseActivation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BaseExpressionActivation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BasicNoPutResultSetImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BasicSortObserver.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BulkTableScanResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CallStatementResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CardinalityCounter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ColumnInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ConstantActionActivation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ConstraintConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ConstraintInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CountAggregator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateAliasConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateConstraintConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateIndexConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateSPSConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateSchemaConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateTableConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateViewConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CurrentDatetime.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CursorActivation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DDLConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DDLSingleTableConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DMLWriteResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteVTIResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DependentResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctGroupedAggregateResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScalarAggregateResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScanResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropAliasConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropConstraintConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropIndexConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropJarConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropSPSConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropSchemaConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropStatisticsConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropTableConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropTriggerConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropViewConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/FKInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ForeignKeyRIChecker.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericAggregateResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericConstantActionFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericExecutionContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericExecutionFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericRIChecker.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericSPSConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericScanQualifier.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericTriggerExecutor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GroupedAggregateResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashScanResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashTableResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexColumnOrder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexRow.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexRowToBaseRowResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexSetChanger.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexValueRow.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertVTIResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InternalTriggerExecutionContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JarDDL.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JarUtil.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JoinResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/KeyToBaseRowConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/LockTableConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MaterializedResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MaxMinAggregator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MergeJoinResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MiscResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NestedLoopJoinResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NestedLoopLeftOuterJoinResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoPutResultSetImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NormalizeResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/OnceResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/OrderableAggregator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RIBulkChecker.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RISetChecker.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RealResultSetStatisticsFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ReferencedKeyRIChecker.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RenameConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ReplaceJarConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowChangerImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowTriggerExecutor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowUtil.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SavepointConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScalarAggregateResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScrollInsensitiveResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetConstraintsConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetSchemaConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetTransactionIsolationConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetTransactionResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SortResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/StatementTriggerExecutor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SystemAggregator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TableScanResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TriggerEvent.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TriggerEventActivator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TriggerEvents.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TriggerInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UnionResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UniqueIndexSortObserver.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdatableVTIConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateStatisticsConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/VTIResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ValueRow.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealAnyResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealBasicNoPutResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealCurrentOfStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteCascadeResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteVTIResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScalarAggregateStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScanStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealGroupedAggregateStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashJoinStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashLeftOuterJoinStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashScanStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashTableStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealIndexRowToBaseRowStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealInsertResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealInsertVTIResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealJoinResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealLastIndexKeyScanStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealMaterializedResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopJoinStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopLeftOuterJoinStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNoPutResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNoRowsResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNormalizeResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealOnceResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealProjectRestrictStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealRowResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealScalarAggregateStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealScrollInsensitiveResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealSortStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealTableScanStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUnionResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUpdateResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealVTIStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/ResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RunTimeStatisticsImpl.java
Log:
Remove IBM's binary copyright in java files under java/engine/org/apache/derby/impl

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ColumnInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ColumnInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ColumnInfo.java	Thu Nov 11 12:01:50 2004
@@ -33,10 +33,6 @@
  * @author suresht
  */
 class ColumnInfo {
-	/**
-	   IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
 
 	private ArrayList vtiColumnNames ;
 	private ArrayList insertColumnNames;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/Export.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/Export.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/Export.java	Thu Nov 11 12:01:50 2004
@@ -22,10 +22,6 @@
  * in this  class are called through Systement Procedures.  
  */
 public class Export extends ExportAbstract{
-	/**
-	   IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	private String outputFileName;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ExportAbstract.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ExportAbstract.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ExportAbstract.java	Thu Nov 11 12:01:50 2004
@@ -21,10 +21,6 @@
  * <P>
  */
 abstract class ExportAbstract {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
   protected ControlInfo controlFileReader;
   protected ExportResultSetForObject exportResultSetForObject;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ExportResultSetForObject.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ExportResultSetForObject.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ExportResultSetForObject.java	Thu Nov 11 12:01:50 2004
@@ -19,10 +19,6 @@
 //that entity. If the entity to be exported has non-sql types in it, an
 //exception will be thrown
 class ExportResultSetForObject {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
   private Connection con;
   private String entityName;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ExportWriteData.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ExportWriteData.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ExportWriteData.java	Thu Nov 11 12:01:50 2004
@@ -24,10 +24,6 @@
 
 final class ExportWriteData extends ExportWriteDataAbstract
 	implements java.security.PrivilegedExceptionAction {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
   private String outputFileName;
   // i18n support - instead of using DataOutputStream.writeBytes - use

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ExportWriteDataAbstract.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ExportWriteDataAbstract.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ExportWriteDataAbstract.java	Thu Nov 11 12:01:50 2004
@@ -11,10 +11,6 @@
 package org.apache.derby.impl.load;
 
 abstract class ExportWriteDataAbstract {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
   protected ControlInfo controlFileReader;
   protected int[] columnLengths;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportReadData.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportReadData.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportReadData.java	Thu Nov 11 12:01:50 2004
@@ -21,10 +21,6 @@
 import org.apache.derby.iapi.services.sanity.SanityManager;
 
 final class ImportReadData implements java.security.PrivilegedExceptionAction {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
   //Read data from this file
   private String inputFileName;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportResultSetMetaData.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportResultSetMetaData.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportResultSetMetaData.java	Thu Nov 11 12:01:50 2004
@@ -16,10 +16,6 @@
 import org.apache.derby.iapi.reference.DB2Limit;
 
 class ImportResultSetMetaData extends VTIMetaDataTemplate {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
   private final int numberOfColumns;
   private final String[] columnNames;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/LoadError.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/LoadError.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/LoadError.java	Thu Nov 11 12:01:50 2004
@@ -24,10 +24,6 @@
 	@see SQLException
  */
 class LoadError {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	
 	/**
 	 Raised if, the Cloudscape database connection is null.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/CursorInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/CursorInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/CursorInfo.java	Thu Nov 11 12:01:50 2004
@@ -31,10 +31,6 @@
 public class CursorInfo
 	implements Formatable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	/********************************************************
 	**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericActivationHolder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericActivationHolder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericActivationHolder.java	Thu Nov 11 12:01:50 2004
@@ -81,10 +81,6 @@
 
 final class GenericActivationHolder implements Activation
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	BaseActivation			ac;
 	ExecPreparedStatement	ps;
 	GeneratedClass			gc;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericColumnDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericColumnDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericColumnDescriptor.java	Thu Nov 11 12:01:50 2004
@@ -35,10 +35,6 @@
 public final class GenericColumnDescriptor
 	implements ResultColumnDescriptor, Formatable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/********************************************************
 	**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java	Thu Nov 11 12:01:50 2004
@@ -42,10 +42,6 @@
 
 final class GenericParameterValueSet implements ParameterValueSet 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
   //all this has to be copied in the clone constructor
 	private final GenericParameter[]				parms;
 	final ClassInspector 			ci;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericPreparedStatement.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericPreparedStatement.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericPreparedStatement.java	Thu Nov 11 12:01:50 2004
@@ -94,10 +94,6 @@
 public class GenericPreparedStatement
 	implements ExecPreparedStatement
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	///////////////////////////////////////////////
 	//
 	// WARNING: when adding members to this class, be

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/LanguageDbPropertySetter.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/LanguageDbPropertySetter.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/LanguageDbPropertySetter.java	Thu Nov 11 12:01:50 2004
@@ -26,10 +26,6 @@
  */
 public class LanguageDbPropertySetter implements PropertySetCallback
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	public void init(boolean dbOnly, Dictionary p) {
 		// not called yet ...
 	}

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/CoreDDFinderClassInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/CoreDDFinderClassInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/CoreDDFinderClassInfo.java	Thu Nov 11 12:01:50 2004
@@ -13,12 +13,7 @@
 import org.apache.derby.iapi.services.io.StoredFormatIds;
 import org.apache.derby.iapi.services.io.FormatableInstanceGetter;
 
-public class CoreDDFinderClassInfo extends FormatableInstanceGetter { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
+public class CoreDDFinderClassInfo extends FormatableInstanceGetter {
 
 	public Object getNewInstance() 
 	{

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDColumnDependableFinder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDColumnDependableFinder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDColumnDependableFinder.java	Thu Nov 11 12:01:50 2004
@@ -33,10 +33,6 @@
 
 public class DDColumnDependableFinder extends DDdependableFinder
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
 	////////////////////////////////////////////////////////////////////////
 	//
 	//  STATE

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java	Thu Nov 11 12:01:50 2004
@@ -69,10 +69,6 @@
 
 public	class DD_Version implements	Formatable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	////////////////////////////////////////////////////////////////////////
 	//
 	//	STATE

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDdependableFinder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDdependableFinder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDdependableFinder.java	Thu Nov 11 12:01:50 2004
@@ -54,10 +54,6 @@
 
 public class DDdependableFinder implements	DependableFinder, Formatable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	////////////////////////////////////////////////////////////////////////
 	//
 	//	STATE

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryContextImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryContextImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryContextImpl.java	Thu Nov 11 12:01:50 2004
@@ -32,10 +32,6 @@
 	extends ContextImpl
 	implements DataDictionaryContext
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	//
 	// True means this is a nested data dictionary. We pop a nested data dictionary
 	// when we clean up an error.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java	Thu Nov 11 12:01:50 2004
@@ -154,10 +154,6 @@
 public	class	DataDictionaryImpl
 	implements DataDictionary, CacheableFactory, ModuleControl, ModuleSupportable,java.security.PrivilegedAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
     private static final String		CFG_SYSTABLES_ID = "SystablesIdentifier";
 	private static final String		CFG_SYSTABLES_INDEX1_ID = "SystablesIndex1Identifier";

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DropDependencyFilter.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DropDependencyFilter.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DropDependencyFilter.java	Thu Nov 11 12:01:50 2004
@@ -41,10 +41,6 @@
 */
 public class DropDependencyFilter implements TupleFilter
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	//////////////////////////////////////////////////////////////////////////////////////
 	//
 	//	CONSTANTS

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/IndexInfoImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/IndexInfoImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/IndexInfoImpl.java	Thu Nov 11 12:01:50 2004
@@ -26,10 +26,6 @@
 */
 public class IndexInfoImpl
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	boolean				isUnique;
 	String[]			columnNames;
 	int[]				columnPositions;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/IndexScan.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/IndexScan.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/IndexScan.java	Thu Nov 11 12:01:50 2004
@@ -38,10 +38,6 @@
   */
 public class IndexScan
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	//
 	//Glorp the caller supplies
 	TabInfo ti;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/NameTDCacheable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/NameTDCacheable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/NameTDCacheable.java	Thu Nov 11 12:01:50 2004
@@ -27,10 +27,6 @@
  */
 class NameTDCacheable extends TDCacheable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	private TableKey identity;
 
 	NameTDCacheable(DataDictionaryImpl dd) {

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/OIDTDCacheable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/OIDTDCacheable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/OIDTDCacheable.java	Thu Nov 11 12:01:50 2004
@@ -26,10 +26,6 @@
  */
 class OIDTDCacheable extends TDCacheable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	private UUID	identity;
 
 	OIDTDCacheable(DataDictionaryImpl dd) {

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SPSNameCacheable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SPSNameCacheable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SPSNameCacheable.java	Thu Nov 11 12:01:50 2004
@@ -40,10 +40,6 @@
  */
 class SPSNameCacheable implements Cacheable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	private TableKey 			identity;
 	private SPSDescriptor		spsd;
 	private final DataDictionaryImpl	dd;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java	Thu Nov 11 12:01:50 2004
@@ -69,10 +69,6 @@
 
 class SYSALIASESRowFactory extends CatalogRowFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
 
 	private static final int		SYSALIASES_COLUMN_COUNT = 9;
 	private static final int		SYSALIASES_ALIASID = 1;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java	Thu Nov 11 12:01:50 2004
@@ -55,10 +55,6 @@
 
 public class SYSCHECKSRowFactory extends CatalogRowFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001;
 	private  static final String	TABLENAME_STRING = "SYSCHECKS";
 
 	protected static final int		SYSCHECKS_COLUMN_COUNT = 3;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java	Thu Nov 11 12:01:50 2004
@@ -73,10 +73,6 @@
 
 public class SYSCOLUMNSRowFactory extends CatalogRowFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001;
 	static final String		TABLENAME_STRING = "SYSCOLUMNS";
 
 	/**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java	Thu Nov 11 12:01:50 2004
@@ -53,10 +53,6 @@
 
 public class SYSCONGLOMERATESRowFactory extends CatalogRowFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001;
 	private static final String		TABLENAME_STRING = "SYSCONGLOMERATES";
 
 	protected static final int		SYSCONGLOMERATES_COLUMN_COUNT = 8;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java	Thu Nov 11 12:01:50 2004
@@ -56,10 +56,6 @@
 
 public class SYSCONSTRAINTSRowFactory extends CatalogRowFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001;
 	private static final String		TABLENAME_STRING = "SYSCONSTRAINTS";
 
 	protected static final int		SYSCONSTRAINTS_COLUMN_COUNT = 7;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java	Thu Nov 11 12:01:50 2004
@@ -54,10 +54,6 @@
 
 public class SYSDEPENDSRowFactory extends CatalogRowFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001;
 	private static final String		TABLENAME_STRING = "SYSDEPENDS";
 
 	protected static final int		SYSDEPENDS_COLUMN_COUNT = 4;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDUMMY1RowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDUMMY1RowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDUMMY1RowFactory.java	Thu Nov 11 12:01:50 2004
@@ -36,11 +36,7 @@
  */
 
 public class SYSDUMMY1RowFactory extends CatalogRowFactory
-	/**
-		IBM Copyright &copy notice.
-	*/
-
-{ private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
+{
 	static final String TABLENAME_STRING = "SYSDUMMY1";
 
 	/* column #s for sysstatistics (1 based) */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java	Thu Nov 11 12:01:50 2004
@@ -48,10 +48,6 @@
 
 public class SYSFILESRowFactory extends CatalogRowFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	protected static final String	TABLENAME_STRING = "SYSFILES";
 
 	protected static final int		SYSFILES_COLUMN_COUNT = 4;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java	Thu Nov 11 12:01:50 2004
@@ -56,10 +56,6 @@
 
 public class SYSFOREIGNKEYSRowFactory extends CatalogRowFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001;
 	private  static final String	TABLENAME_STRING = "SYSFOREIGNKEYS";
 
 	protected static final int		SYSFOREIGNKEYS_COLUMN_COUNT = 5;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java	Thu Nov 11 12:01:50 2004
@@ -53,10 +53,6 @@
 
 public class SYSKEYSRowFactory extends CatalogRowFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001;
 	private static final String		TABLENAME_STRING = "SYSKEYS";
 
 	protected static final int		SYSKEYS_COLUMN_COUNT = 2;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java	Thu Nov 11 12:01:50 2004
@@ -50,10 +50,6 @@
 
 public class SYSSCHEMASRowFactory extends CatalogRowFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001;
 	private	static	final	String	TABLENAME_STRING = "SYSSCHEMAS";
 
 	public	static	final	int		SYSSCHEMAS_COLUMN_COUNT = 3;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java	Thu Nov 11 12:01:50 2004
@@ -59,10 +59,6 @@
 
 public class SYSSTATEMENTSRowFactory extends CatalogRowFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	static	final	String	TABLENAME_STRING = "SYSSTATEMENTS";
 
 	/* Column #s for sysinfo (1 based) */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java	Thu Nov 11 12:01:50 2004
@@ -44,10 +44,6 @@
 
 public class SYSSTATISTICSRowFactory extends CatalogRowFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
 	static final String TABLENAME_STRING = "SYSSTATISTICS";
 
 	/* column #s for sysstatistics (1 based) */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java	Thu Nov 11 12:01:50 2004
@@ -47,10 +47,6 @@
 
 public class SYSTABLESRowFactory extends CatalogRowFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001;
 	private static final String		TABLENAME_STRING = "SYSTABLES";
 
 	protected static final int		SYSTABLES_COLUMN_COUNT = 5;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java	Thu Nov 11 12:01:50 2004
@@ -52,10 +52,6 @@
 
 public class SYSTRIGGERSRowFactory extends CatalogRowFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	static	final	String	TABLENAME_STRING = "SYSTRIGGERS";
 
 	/* Column #s for sysinfo (1 based) */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java	Thu Nov 11 12:01:50 2004
@@ -51,10 +51,6 @@
 
 public class SYSVIEWSRowFactory extends CatalogRowFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001;
 	private  static final String	TABLENAME_STRING = "SYSVIEWS";
 
 	protected static final int		SYSVIEWS_COLUMN_COUNT = 4;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SystemColumnImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SystemColumnImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SystemColumnImpl.java	Thu Nov 11 12:01:50 2004
@@ -26,10 +26,6 @@
 
 public class SystemColumnImpl implements SystemColumn
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	private	String	name;
 	private	int		id;
 	private	int		precision;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TDCacheable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TDCacheable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TDCacheable.java	Thu Nov 11 12:01:50 2004
@@ -44,10 +44,6 @@
  */
 abstract class TDCacheable implements Cacheable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	protected TableDescriptor	td;
 	protected final DataDictionaryImpl	dd;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TabInfoImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TabInfoImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TabInfoImpl.java	Thu Nov 11 12:01:50 2004
@@ -52,10 +52,6 @@
 */
 public class TabInfoImpl implements TabInfo
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	private IndexInfoImpl[]				indexes;
 	private String						name;
 	private long						heapConglomerate;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TableKey.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TableKey.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TableKey.java	Thu Nov 11 12:01:50 2004
@@ -21,10 +21,6 @@
 
 final class TableKey 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	private final String	tableName;
 	private final UUID	schemaId;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AddJarConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AddJarConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AddJarConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -22,10 +22,6 @@
  */
 class AddJarConstantAction extends DDLConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	private final UUID id;
 	private	final String schemaName;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AggregateSortObserver.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AggregateSortObserver.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AggregateSortObserver.java	Thu Nov 11 12:01:50 2004
@@ -36,11 +36,6 @@
  */
 public class AggregateSortObserver extends BasicSortObserver
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	protected GenericAggregator[]	aggsToProcess;
 	protected GenericAggregator[]	aggsToInitialize;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AggregatorInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AggregatorInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AggregatorInfo.java	Thu Nov 11 12:01:50 2004
@@ -30,10 +30,6 @@
  */
 public class AggregatorInfo implements Formatable 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	/********************************************************
 	**
 	**	This class implements Formatable. That means that it

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AggregatorInfoList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AggregatorInfoList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AggregatorInfoList.java	Thu Nov 11 12:01:50 2004
@@ -28,10 +28,6 @@
  */
 public class AggregatorInfoList extends Vector implements Formatable 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	/********************************************************
 	**
 	**	This class implements Formatable. That means that it

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AlterSPSConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AlterSPSConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AlterSPSConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -49,10 +49,6 @@
  */
 public class AlterSPSConstantAction extends GenericSPSConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	private SchemaDescriptor		sd;
 	private String					spsName;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -107,10 +107,6 @@
 class AlterTableConstantAction extends DDLSingleTableConstantAction
  implements RowLocationRetRowSource
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	protected	SchemaDescriptor			sd;
 	protected	String						tableName;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AnyResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AnyResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AnyResultSet.java	Thu Nov 11 12:01:50 2004
@@ -37,10 +37,6 @@
  */
 public class AnyResultSet extends NoPutResultSetImpl
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/* Used to cache row with nulls for case when subquery result set
 	 * is empty.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AutoincrementCounter.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AutoincrementCounter.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AutoincrementCounter.java	Thu Nov 11 12:01:50 2004
@@ -39,10 +39,6 @@
  */
 public class AutoincrementCounter 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 	private Long start;
 	private long increment;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AvgAggregator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AvgAggregator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AvgAggregator.java	Thu Nov 11 12:01:50 2004
@@ -40,10 +40,6 @@
  */
 public final class AvgAggregator extends SumAggregator
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	private long count;
 	private int scale;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BaseActivation.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BaseActivation.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BaseActivation.java	Thu Nov 11 12:01:50 2004
@@ -96,10 +96,6 @@
 public abstract class BaseActivation implements CursorActivation, GeneratedByteCode
 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	protected ResultSetFactory rsFactory;
 	protected ExecutionFactory exFactory;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BaseExpressionActivation.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BaseExpressionActivation.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BaseExpressionActivation.java	Thu Nov 11 12:01:50 2004
@@ -45,10 +45,6 @@
  */
 public abstract class BaseExpressionActivation
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	
 	//

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BasicNoPutResultSetImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BasicNoPutResultSetImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BasicNoPutResultSetImpl.java	Thu Nov 11 12:01:50 2004
@@ -58,10 +58,6 @@
 abstract class BasicNoPutResultSetImpl
 implements NoPutResultSet
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/* Modified during the life of this object */
     protected boolean isOpen;
     protected boolean finished;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BasicSortObserver.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BasicSortObserver.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BasicSortObserver.java	Thu Nov 11 12:01:50 2004
@@ -33,10 +33,6 @@
  */
 public class BasicSortObserver implements SortObserver
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	protected boolean 	doClone;
 	protected boolean	distinct;
 	private	  boolean	reuseWrappers;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BulkTableScanResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BulkTableScanResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BulkTableScanResultSet.java	Thu Nov 11 12:01:50 2004
@@ -59,10 +59,6 @@
 public class BulkTableScanResultSet extends TableScanResultSet
 	implements CursorResultSet
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	private DataValueDescriptor[][] rowArray;
 	private int curRowPosition;
 	private int numRowsInArray;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CallStatementResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CallStatementResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CallStatementResultSet.java	Thu Nov 11 12:01:50 2004
@@ -33,10 +33,6 @@
  */
 class CallStatementResultSet extends NoRowsResultSetImpl
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	private final GeneratedMethod methodCall;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CardinalityCounter.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CardinalityCounter.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CardinalityCounter.java	Thu Nov 11 12:01:50 2004
@@ -32,10 +32,6 @@
 
 public class CardinalityCounter implements RowLocationRetRowSource
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
 	private RowLocationRetRowSource rowSource;
 	private DataValueDescriptor[] prevKey;
 	private long[] cardinality;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ColumnInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ColumnInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ColumnInfo.java	Thu Nov 11 12:01:50 2004
@@ -42,10 +42,6 @@
 
 public class ColumnInfo implements Formatable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/********************************************************
 	**
 	**	This class implements Formatable. That means that it

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ConstantActionActivation.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ConstantActionActivation.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ConstantActionActivation.java	Thu Nov 11 12:01:50 2004
@@ -24,10 +24,6 @@
  */
 public final class ConstantActionActivation extends BaseActivation
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
 
 	public int getExecutionCount() { return 0;}
 	public void setExecutionCount(int count) {}

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ConstraintConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ConstraintConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ConstraintConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -64,10 +64,6 @@
 
 public abstract class ConstraintConstantAction extends DDLSingleTableConstantAction 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	protected	String			constraintName;
 	protected	int				constraintType;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ConstraintInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ConstraintInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ConstraintInfo.java	Thu Nov 11 12:01:50 2004
@@ -36,10 +36,6 @@
  */
 public class ConstraintInfo implements ConsInfo
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	/********************************************************
 	**
 	**	This class implements Formatable. That means that it

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CountAggregator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CountAggregator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CountAggregator.java	Thu Nov 11 12:01:50 2004
@@ -28,10 +28,6 @@
 public final class CountAggregator 
 	extends SystemAggregator
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	private long value;
 	private boolean isCountStar;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateAliasConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateAliasConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateAliasConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -50,10 +50,6 @@
  */
 class CreateAliasConstantAction extends DDLConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	private final String					aliasName;
 	private final String					schemaName;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateConstraintConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateConstraintConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateConstraintConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -63,10 +63,6 @@
 
 public class CreateConstraintConstantAction extends ConstraintConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	public	String[]		columnNames;
 	public	String			constraintText;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateIndexConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateIndexConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateIndexConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -74,10 +74,6 @@
 
 class CreateIndexConstantAction extends IndexConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	private boolean			unique;
 	private String			indexType;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateSPSConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateSPSConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateSPSConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -47,10 +47,6 @@
  */
 class CreateSPSConstantAction extends GenericSPSConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	private String					schemaName;
 	private String					spsName;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateSchemaConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateSchemaConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateSchemaConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -38,10 +38,6 @@
 
 class CreateSchemaConstantAction extends DDLConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	private final String					aid;	// authorization id
 	private final String					schemaName;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateTableConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateTableConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateTableConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -53,10 +53,6 @@
 
 class CreateTableConstantAction extends DDLConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	private char					lockGranularity;
 	private boolean					onCommitDeleteRows; //If true, on commit delete rows else on commit preserve rows of temporary table.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateViewConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateViewConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateViewConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -46,10 +46,6 @@
 
 class CreateViewConstantAction extends DDLConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	
 	private final String					tableName;
 	private final String					schemaName;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CurrentDatetime.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CurrentDatetime.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CurrentDatetime.java	Thu Nov 11 12:01:50 2004
@@ -32,10 +32,6 @@
 	@author ames
  */
 public class CurrentDatetime {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/**
 		Holds the current datetime on the first evaluation of a current function

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CursorActivation.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CursorActivation.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CursorActivation.java	Thu Nov 11 12:01:50 2004
@@ -21,10 +21,6 @@
 	extends BaseActivation
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
-	/**
 	 * remember the cursor name
 	 */
 	public void	setCursorName(String cursorName) 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DDLConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DDLConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DDLConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -50,10 +50,6 @@
  */
 public abstract class DDLConstantAction extends GenericConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	//TransactionController 		tc;
 	//protected LanguageConnectionContext 	lcc;
 	//DataDescriptorGenerator 	ddg;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DDLSingleTableConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DDLSingleTableConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DDLSingleTableConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -23,10 +23,6 @@
  */
 abstract class DDLSingleTableConstantAction extends DDLConstantAction 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	protected UUID					tableId;
 
 	

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DMLWriteResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DMLWriteResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DMLWriteResultSet.java	Thu Nov 11 12:01:50 2004
@@ -31,10 +31,6 @@
  */
 abstract class DMLWriteResultSet extends NoRowsResultSetImpl 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	protected WriteCursorConstantAction constantAction;
 	protected int[] baseRowReadMap;
 	protected int[] streamStorableHeapColIds;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -44,10 +44,6 @@
 
 public class DeleteConstantAction extends WriteCursorConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/********************************************************
 	**
 	**	This class implements Formatable. But it is NOT used

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteResultSet.java	Thu Nov 11 12:01:50 2004
@@ -53,10 +53,6 @@
  */
 public class DeleteResultSet extends DMLWriteResultSet
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	public TransactionController   	tc;
 	public DeleteConstantAction		constants;
     protected ResultDescription 				resultDescription;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteVTIResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteVTIResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteVTIResultSet.java	Thu Nov 11 12:01:50 2004
@@ -33,10 +33,6 @@
  */
 public class DeleteVTIResultSet extends DMLVTIResultSet
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 	private java.sql.ResultSet		rs;
     private TemporaryRowHolderImpl rowHolder;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DependentResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DependentResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DependentResultSet.java	Thu Nov 11 12:01:50 2004
@@ -49,10 +49,6 @@
 */
 public class DependentResultSet extends NoPutResultSetImpl implements CursorResultSet
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
 
 
 	ConglomerateController heapCC;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctGroupedAggregateResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctGroupedAggregateResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctGroupedAggregateResultSet.java	Thu Nov 11 12:01:50 2004
@@ -57,10 +57,6 @@
  */
 public class DistinctGroupedAggregateResultSet extends GroupedAggregateResultSet
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
     /**
 	 * Constructor

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScalarAggregateResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScalarAggregateResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScalarAggregateResultSet.java	Thu Nov 11 12:01:50 2004
@@ -60,10 +60,6 @@
  */
 public class DistinctScalarAggregateResultSet extends ScalarAggregateResultSet
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	private ColumnOrdering[] order;
 	private int maxRowSize;
 	private boolean dropDistinctAggSort;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScanResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScanResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScanResultSet.java	Thu Nov 11 12:01:50 2004
@@ -59,10 +59,6 @@
  */
 public class DistinctScanResultSet extends HashScanResultSet
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	Enumeration element = null;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropAliasConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropAliasConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropAliasConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -43,10 +43,6 @@
 
 class DropAliasConstantAction extends DDLConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	private SchemaDescriptor	sd;
 	private final String schemaName;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropConstraintConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropConstraintConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropConstraintConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -58,10 +58,6 @@
 
 class DropConstraintConstantAction extends ConstraintConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	private boolean cascade;		// default false
 	private String constraintSchemaName;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropIndexConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropIndexConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropIndexConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -46,10 +46,6 @@
 
 class DropIndexConstantAction extends IndexConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	private String				fullIndexName;
 	private long				tableConglomerateId;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropJarConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropJarConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropJarConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -24,10 +24,6 @@
  */
 class DropJarConstantAction extends DDLConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	private final UUID id;
 	private final String schemaName;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropSPSConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropSPSConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropSPSConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -43,10 +43,6 @@
  */
 class DropSPSConstantAction extends DDLConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	private final String				spsName;
 	private final SchemaDescriptor	sd;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropSchemaConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropSchemaConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropSchemaConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -39,10 +39,6 @@
 
 class DropSchemaConstantAction extends DDLConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 
 	private final String				schemaName;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropStatisticsConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropStatisticsConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropStatisticsConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -31,10 +31,6 @@
 
 class DropStatisticsConstantAction extends DDLConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
 	private final String objectName;
 	private final boolean forTable;
 	private final SchemaDescriptor sd;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropTableConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropTableConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropTableConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -51,10 +51,6 @@
 
 class DropTableConstantAction extends DDLSingleTableConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	private final long				conglomerateNumber;
 	private final String				fullTableName;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropTriggerConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropTriggerConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropTriggerConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -43,10 +43,6 @@
  */
 class DropTriggerConstantAction extends DDLSingleTableConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	private final String			triggerName;
 	private final SchemaDescriptor	sd;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropViewConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropViewConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropViewConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -45,10 +45,6 @@
 
 class DropViewConstantAction extends DDLConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	private String				fullTableName;
 	private String				tableName;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/FKInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/FKInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/FKInfo.java	Thu Nov 11 12:01:50 2004
@@ -42,10 +42,6 @@
  */
 public class FKInfo implements Formatable 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	/********************************************************
 	**
 	**	This class implements Formatable. That means that it

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ForeignKeyRIChecker.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ForeignKeyRIChecker.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ForeignKeyRIChecker.java	Thu Nov 11 12:01:50 2004
@@ -30,10 +30,6 @@
 public class ForeignKeyRIChecker extends GenericRIChecker
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	 * @param tc		the xact controller
 	 * @param fkInfo	the foreign key information 
 	 *

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericAggregateResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericAggregateResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericAggregateResultSet.java	Thu Nov 11 12:01:50 2004
@@ -60,10 +60,6 @@
  */
 abstract class GenericAggregateResultSet extends NoPutResultSetImpl
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	protected GenericAggregator[]		aggregates;	
 	protected GeneratedMethod			rowAllocator;
 	protected AggregatorInfoList	aggInfoList;	

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -43,10 +43,6 @@
 abstract class GenericConstantAction implements ConstantAction
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	 * Does this constant action modify the passed in table
 	 * uuid?  By modify we mean add or drop things tied to
 	 * this table (e.g. index, trigger, constraint).  Things

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericConstantActionFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericConstantActionFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericConstantActionFactory.java	Thu Nov 11 12:01:50 2004
@@ -63,10 +63,6 @@
  */
 public class GenericConstantActionFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	///////////////////////////////////////////////////////////////////////
 	//
 	//	CONSTRUCTORS

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericExecutionContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericExecutionContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericExecutionContext.java	Thu Nov 11 12:01:50 2004
@@ -41,10 +41,6 @@
 public class GenericExecutionContext
 	extends ContextImpl 
 	implements ExecutionContext {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	private ResultSet sourceRS;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericExecutionFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericExecutionFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericExecutionFactory.java	Thu Nov 11 12:01:50 2004
@@ -64,10 +64,6 @@
  */
 public class GenericExecutionFactory
 	implements ModuleControl, ModuleSupportable, ExecutionFactory {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	//
 	// ModuleControl interface

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericRIChecker.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericRIChecker.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericRIChecker.java	Thu Nov 11 12:01:50 2004
@@ -36,10 +36,6 @@
  */
 public abstract class GenericRIChecker
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	protected FKInfo					fkInfo;
 	protected DynamicCompiledOpenConglomInfo[] fkDcocis;
 	protected StaticCompiledOpenConglomInfo[] fkScocis;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericSPSConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericSPSConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericSPSConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -38,10 +38,6 @@
 public abstract class GenericSPSConstantAction extends DDLConstantAction
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	 * Public niladic constructor. 
 	 */
 	public GenericSPSConstantAction() {}

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericScanQualifier.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericScanQualifier.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericScanQualifier.java	Thu Nov 11 12:01:50 2004
@@ -31,11 +31,6 @@
 
 public class GenericScanQualifier implements ScanQualifier
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	private int                 columnId        = -1;
 	private DataValueDescriptor orderable       = null;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericTriggerExecutor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericTriggerExecutor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericTriggerExecutor.java	Thu Nov 11 12:01:50 2004
@@ -29,10 +29,6 @@
  */
 public abstract class GenericTriggerExecutor
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	protected InternalTriggerExecutionContext	tec;
 	protected TriggerDescriptor					triggerd;
 	protected Activation						activation;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GroupedAggregateResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GroupedAggregateResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GroupedAggregateResultSet.java	Thu Nov 11 12:01:50 2004
@@ -59,10 +59,6 @@
  */
 public class GroupedAggregateResultSet extends GenericAggregateResultSet
 	implements CursorResultSet {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/* Run time statistics variables */
 	public int rowsInput;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashScanResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashScanResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashScanResultSet.java	Thu Nov 11 12:01:50 2004
@@ -72,10 +72,6 @@
 public class HashScanResultSet extends NoPutResultSetImpl
 	implements CursorResultSet
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	private boolean		hashtableBuilt;
 	private ExecIndexRow	startPosition;
 	private ExecIndexRow	stopPosition;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashTableResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashTableResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashTableResultSet.java	Thu Nov 11 12:01:50 2004
@@ -59,10 +59,6 @@
 public class HashTableResultSet extends NoPutResultSetImpl
 	implements CursorResultSet 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	/* Run time statistics variables */
 	public long restrictionTime;
 	public long projectionTime;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexColumnOrder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexColumnOrder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexColumnOrder.java	Thu Nov 11 12:01:50 2004
@@ -28,10 +28,6 @@
  */
 public class IndexColumnOrder implements ColumnOrdering, Formatable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/********************************************************
 	**
 	**	This class implements Formatable. That means that it

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -37,10 +37,6 @@
 
 public abstract class IndexConstantAction extends DDLSingleTableConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	String				indexName;
 	String				tableName;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexRow.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexRow.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexRow.java	Thu Nov 11 12:01:50 2004
@@ -33,10 +33,6 @@
  */
 public class IndexRow extends ValueRow implements ExecIndexRow
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/********************************************************
 	**
 	**	This class implements Formatable. That means that it

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexRowToBaseRowResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexRowToBaseRowResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexRowToBaseRowResultSet.java	Thu Nov 11 12:01:50 2004
@@ -55,10 +55,6 @@
  */
 public class IndexRowToBaseRowResultSet extends NoPutResultSetImpl
 	implements CursorResultSet {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
     // set in constructor and not altered during
     // life of object.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexSetChanger.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexSetChanger.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexSetChanger.java	Thu Nov 11 12:01:50 2004
@@ -34,10 +34,6 @@
   */
 public class IndexSetChanger
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	//
 	//Index row generators.
 	IndexRowGenerator[] irgs;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexValueRow.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexValueRow.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexValueRow.java	Thu Nov 11 12:01:50 2004
@@ -30,10 +30,6 @@
 	@author ames
  */
 class IndexValueRow implements ExecIndexRow {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	private ExecRow valueRow;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -49,10 +49,6 @@
 
 public class InsertConstantAction extends WriteCursorConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/********************************************************
 	**
 	**	This class implements Formatable. But it is NOT used

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java	Thu Nov 11 12:01:50 2004
@@ -98,10 +98,6 @@
  */
 public class InsertResultSet extends DMLWriteResultSet implements TargetResultSet
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	// RESOLVE. Embarassingly large public state. If we could move the Replication
 	// code into the same package, then these variables could be protected.
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertVTIResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertVTIResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertVTIResultSet.java	Thu Nov 11 12:01:50 2004
@@ -40,10 +40,6 @@
  */
 public class InsertVTIResultSet extends DMLVTIResultSet
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 	private PreparedStatement		ps;
 	private VTIResultSet			vtiRS;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InternalTriggerExecutionContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InternalTriggerExecutionContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InternalTriggerExecutionContext.java	Thu Nov 11 12:01:50 2004
@@ -49,10 +49,6 @@
  */
 public class InternalTriggerExecutionContext implements TriggerExecutionContext, ExecutionStmtValidator
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	/*
 	** Immutable
 	*/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JarDDL.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JarDDL.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JarDDL.java	Thu Nov 11 12:01:50 2004
@@ -19,10 +19,6 @@
 public class JarDDL
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	  Add a jar file to the current connection's database.
 
  	  @exception StandardException Opps

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JarUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JarUtil.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JarUtil.java	Thu Nov 11 12:01:50 2004
@@ -39,10 +39,6 @@
 
 public class JarUtil
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	public static final String ADD_JAR_DDL = "ADD JAR";
 	public static final String DROP_JAR_DDL = "DROP JAR";
 	public static final String REPLACE_JAR_DDL = "REPLACE JAR";

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JoinResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JoinResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JoinResultSet.java	Thu Nov 11 12:01:50 2004
@@ -34,10 +34,6 @@
 public abstract class JoinResultSet extends NoPutResultSetImpl
 	implements CursorResultSet
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/* Run time statistics variables */
 	public int rowsSeenLeft;
 	public int rowsSeenRight;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/KeyToBaseRowConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/KeyToBaseRowConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/KeyToBaseRowConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -21,10 +21,6 @@
 public interface KeyToBaseRowConstantAction
 extends ConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	public ExecRow getEmptyHeapRow(LanguageConnectionContext lcc)
 		 throws StandardException;
 	public ExecRow getEmptyKeyRow()

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/LockTableConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/LockTableConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/LockTableConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -35,10 +35,6 @@
 
 class LockTableConstantAction extends GenericConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	private final String					fullTableName;
 	private final long					conglomerateNumber;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MaterializedResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MaterializedResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MaterializedResultSet.java	Thu Nov 11 12:01:50 2004
@@ -48,10 +48,6 @@
 public class MaterializedResultSet extends NoPutResultSetImpl
 	implements CursorResultSet
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	/*
     ** Set in constructor and not altered during life of object.
 	*/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MaxMinAggregator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MaxMinAggregator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MaxMinAggregator.java	Thu Nov 11 12:01:50 2004
@@ -31,10 +31,6 @@
 public final class MaxMinAggregator 
 	extends OrderableAggregator
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
 
 	private boolean isMax; // true for max, false for min
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MergeJoinResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MergeJoinResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MergeJoinResultSet.java	Thu Nov 11 12:01:50 2004
@@ -40,10 +40,6 @@
  */
 public class MergeJoinResultSet extends JoinResultSet
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	private static final int GREATER_THAN = 1;
 	private static final int EQUAL = 0;
 	private static final int LESS_THAN = -1;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MiscResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MiscResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MiscResultSet.java	Thu Nov 11 12:01:50 2004
@@ -25,10 +25,6 @@
 
 class MiscResultSet extends NoRowsResultSetImpl
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	private final ConstantAction constantAction;
 
 	/**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NestedLoopJoinResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NestedLoopJoinResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NestedLoopJoinResultSet.java	Thu Nov 11 12:01:50 2004
@@ -36,10 +36,6 @@
  */
 public class NestedLoopJoinResultSet extends JoinResultSet
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	private boolean returnedRowMatchingRightSide = false;
 	private ExecRow rightTemplate;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NestedLoopLeftOuterJoinResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NestedLoopLeftOuterJoinResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NestedLoopLeftOuterJoinResultSet.java	Thu Nov 11 12:01:50 2004
@@ -39,10 +39,6 @@
  */
 public class NestedLoopLeftOuterJoinResultSet extends NestedLoopJoinResultSet
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	protected GeneratedMethod emptyRowFun;
 	/* Was this originally a right outer join? */
 	private boolean wasRightOuterJoin;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoPutResultSetImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoPutResultSetImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoPutResultSetImpl.java	Thu Nov 11 12:01:50 2004
@@ -66,10 +66,6 @@
 abstract class NoPutResultSetImpl
 extends BasicNoPutResultSetImpl
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/* Set in constructor and not modified */
 	public final int				resultSetNumber;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java	Thu Nov 11 12:01:50 2004
@@ -69,10 +69,6 @@
  */
 abstract class NoRowsResultSetImpl implements ResultSet
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	protected final Activation    activation;
 	private boolean isTopResultSet = true;
 	private boolean dumpedStats;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NormalizeResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NormalizeResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NormalizeResultSet.java	Thu Nov 11 12:01:50 2004
@@ -46,10 +46,6 @@
 public class NormalizeResultSet extends NoPutResultSetImpl
 	implements CursorResultSet
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/*
     ** Set in constructor and not altered during life of object.
 	*/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/OnceResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/OnceResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/OnceResultSet.java	Thu Nov 11 12:01:50 2004
@@ -41,10 +41,6 @@
  */
 public class OnceResultSet extends NoPutResultSetImpl
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/* Statics for cardinality check */
 	public static final int DO_CARDINALITY_CHECK		= 1;
 	public static final int NO_CARDINALITY_CHECK		= 2;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/OrderableAggregator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/OrderableAggregator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/OrderableAggregator.java	Thu Nov 11 12:01:50 2004
@@ -28,10 +28,6 @@
  */
 abstract class OrderableAggregator extends SystemAggregator
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	protected DataValueDescriptor value;
 
 	/**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RIBulkChecker.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RIBulkChecker.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RIBulkChecker.java	Thu Nov 11 12:01:50 2004
@@ -51,10 +51,6 @@
  */
 public class RIBulkChecker 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	private static final int EQUAL = 0;
 	private static final int GREATER_THAN = 1;
 	private static final int LESS_THAN = -1;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RISetChecker.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RISetChecker.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RISetChecker.java	Thu Nov 11 12:01:50 2004
@@ -24,10 +24,6 @@
  */
 public class RISetChecker
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	private GenericRIChecker[] 	checkers;
 
 	/**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RealResultSetStatisticsFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RealResultSetStatisticsFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RealResultSetStatisticsFactory.java	Thu Nov 11 12:01:50 2004
@@ -113,10 +113,6 @@
 public class RealResultSetStatisticsFactory 
 		implements ResultSetStatisticsFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	//
 	// ExecutionFactory interface

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ReferencedKeyRIChecker.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ReferencedKeyRIChecker.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ReferencedKeyRIChecker.java	Thu Nov 11 12:01:50 2004
@@ -32,10 +32,6 @@
 public class ReferencedKeyRIChecker extends GenericRIChecker
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	 * @param tc		the xact controller
 	 * @param fkInfo	the foreign key information 
 	 *

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RenameConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RenameConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RenameConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -49,10 +49,6 @@
 
 class RenameConstantAction extends DDLSingleTableConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
 
 
 	private String fullTableName;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ReplaceJarConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ReplaceJarConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ReplaceJarConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -23,10 +23,6 @@
  */
 class ReplaceJarConstantAction extends DDLConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	private final UUID id;
 	private final String schemaName;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowChangerImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowChangerImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowChangerImpl.java	Thu Nov 11 12:01:50 2004
@@ -43,10 +43,6 @@
   */
 public class RowChangerImpl	implements	RowChanger
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	boolean isOpen = false;
 
 	//

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowResultSet.java	Thu Nov 11 12:01:50 2004
@@ -43,10 +43,6 @@
  */
 public class RowResultSet extends NoPutResultSetImpl
 	implements CursorResultSet {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/* Run time statistics variables */
 	public int rowsReturned;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowTriggerExecutor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowTriggerExecutor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowTriggerExecutor.java	Thu Nov 11 12:01:50 2004
@@ -25,10 +25,6 @@
 public class RowTriggerExecutor extends GenericTriggerExecutor
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
-	/**
 	 * Constructor
 	 *
 	 * @param tec the execution context

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowUtil.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowUtil.java	Thu Nov 11 12:01:50 2004
@@ -32,10 +32,6 @@
   */
 public class RowUtil
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
  	/**
 	  Get an empty ExecRow.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SavepointConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SavepointConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SavepointConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -28,10 +28,6 @@
 
 class SavepointConstantAction extends DDLConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
 
 	private final String savepointName; //name of the savepoint
 	private final int	savepointStatementType; //Type of savepoint statement ie rollback, release or set savepoint

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScalarAggregateResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScalarAggregateResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScalarAggregateResultSet.java	Thu Nov 11 12:01:50 2004
@@ -55,10 +55,6 @@
 public class ScalarAggregateResultSet extends GenericAggregateResultSet
 	implements CursorResultSet 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/* Run time statistics variables */
 	public int rowsInput;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScrollInsensitiveResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScrollInsensitiveResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScrollInsensitiveResultSet.java	Thu Nov 11 12:01:50 2004
@@ -47,10 +47,6 @@
 public class ScrollInsensitiveResultSet extends NoPutResultSetImpl
 	implements CursorResultSet
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	/*
     ** Set in constructor and not altered during life of object.
 	*/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetConstraintsConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetConstraintsConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetConstraintsConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -70,10 +70,6 @@
  */
 class SetConstraintsConstantAction extends DDLConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	private boolean 					enable;
 	private	boolean						unconditionallyEnforce;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetSchemaConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetSchemaConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetSchemaConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -38,10 +38,6 @@
 
 class SetSchemaConstantAction extends GenericConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	private final String					schemaName;
 	private final int						type;	

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetTransactionIsolationConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetTransactionIsolationConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetTransactionIsolationConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -32,10 +32,6 @@
 
 class SetTransactionIsolationConstantAction extends GenericConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	private final int isolationLevel;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetTransactionResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetTransactionResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetTransactionResultSet.java	Thu Nov 11 12:01:50 2004
@@ -27,10 +27,6 @@
 class SetTransactionResultSet extends MiscResultSet
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
      * Construct a SetTransactionResultSet
 	 *
 	 *  @param activation		Describes run-time environment.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SortResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SortResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SortResultSet.java	Thu Nov 11 12:01:50 2004
@@ -103,10 +103,6 @@
 public class SortResultSet extends NoPutResultSetImpl
 	implements CursorResultSet 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/* Run time statistics variables */
 	public int rowsInput;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/StatementTriggerExecutor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/StatementTriggerExecutor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/StatementTriggerExecutor.java	Thu Nov 11 12:01:50 2004
@@ -25,10 +25,6 @@
 public class StatementTriggerExecutor extends GenericTriggerExecutor
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
-	/**
 	 * Constructor
 	 *
 	 * @param tec the execution context

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SystemAggregator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SystemAggregator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SystemAggregator.java	Thu Nov 11 12:01:50 2004
@@ -26,10 +26,6 @@
  */
 abstract class SystemAggregator implements ExecAggregator
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
     private boolean eliminatedNulls;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TableScanResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TableScanResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TableScanResultSet.java	Thu Nov 11 12:01:50 2004
@@ -64,10 +64,6 @@
 public class TableScanResultSet extends NoPutResultSetImpl
 	implements CursorResultSet, Cloneable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
     protected ScanController scanController;
 	protected boolean		scanControllerOpened;
 	protected boolean		isKeyed;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderImpl.java	Thu Nov 11 12:01:50 2004
@@ -44,10 +44,6 @@
  */
 public class TemporaryRowHolderImpl implements TemporaryRowHolder
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	public static final int DEFAULT_OVERFLOWTHRESHOLD = 5;
 
 	protected static final int STATE_UNINIT = 0;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TriggerEvent.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TriggerEvent.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TriggerEvent.java	Thu Nov 11 12:01:50 2004
@@ -21,10 +21,6 @@
  */
 public class TriggerEvent
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	static final int BEFORE_INSERT = 0;	
 	static final int BEFORE_DELETE = 1;	
 	static final int BEFORE_UPDATE = 2;	

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TriggerEventActivator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TriggerEventActivator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TriggerEventActivator.java	Thu Nov 11 12:01:50 2004
@@ -36,10 +36,6 @@
  */
 public class TriggerEventActivator
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	private LanguageConnectionContext		lcc; 
 	private TransactionController 			tc; 
 	private TriggerInfo 					triggerInfo; 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TriggerEvents.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TriggerEvents.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TriggerEvents.java	Thu Nov 11 12:01:50 2004
@@ -19,10 +19,6 @@
  */
 public class TriggerEvents
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	public static final TriggerEvent BEFORE_INSERT = new TriggerEvent(TriggerEvent.BEFORE_INSERT);
 	public static final TriggerEvent BEFORE_DELETE = new TriggerEvent(TriggerEvent.BEFORE_DELETE);
 	public static final TriggerEvent BEFORE_UPDATE = new TriggerEvent(TriggerEvent.BEFORE_UPDATE);

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TriggerInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TriggerInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TriggerInfo.java	Thu Nov 11 12:01:50 2004
@@ -42,10 +42,6 @@
  */
 public class TriggerInfo implements Formatable 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	/********************************************************
 	**
 	**	This class implements Formatable. That means that it

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UnionResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UnionResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UnionResultSet.java	Thu Nov 11 12:01:50 2004
@@ -40,10 +40,6 @@
  */
 public class UnionResultSet extends NoPutResultSetImpl
 	implements CursorResultSet {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/* Run time statistics variables */
 	public int rowsSeenLeft;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UniqueIndexSortObserver.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UniqueIndexSortObserver.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UniqueIndexSortObserver.java	Thu Nov 11 12:01:50 2004
@@ -30,10 +30,6 @@
  */
 class UniqueIndexSortObserver extends BasicSortObserver 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	private boolean		isConstraint;
 	private String		indexOrConstraintName;
 	private String 		tableName;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdatableVTIConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdatableVTIConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdatableVTIConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -49,10 +49,6 @@
 
 public class UpdatableVTIConstantAction extends WriteCursorConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 	/********************************************************
 	**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -46,10 +46,6 @@
 
 public class UpdateConstantAction extends WriteCursorConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/********************************************************
 	**
 	**	This class implements Formatable. But it is NOT used

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateResultSet.java	Thu Nov 11 12:01:50 2004
@@ -60,10 +60,6 @@
  */
 public class UpdateResultSet extends DMLWriteResultSet
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	public TransactionController 	tc;
 	public ExecRow					newBaseRow;
 	public ExecRow 					row;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateStatisticsConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateStatisticsConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateStatisticsConstantAction.java	Thu Nov 11 12:01:50 2004
@@ -33,10 +33,6 @@
 
 class UpdateStatisticsConstantAction extends DDLConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
 	private UUID tableUUID;
 	private UUID[] objectUUID;
 	private String objectName;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/VTIResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/VTIResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/VTIResultSet.java	Thu Nov 11 12:01:50 2004
@@ -55,12 +55,6 @@
  */
 public class VTIResultSet extends NoPutResultSetImpl
 	implements CursorResultSet, VTIEnvironment {
-	
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/* Run time statistics variables */
 	public int rowsReturned;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ValueRow.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ValueRow.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ValueRow.java	Thu Nov 11 12:01:50 2004
@@ -46,10 +46,6 @@
  */
 public class ValueRow implements ExecRow, Formatable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/********************************************************
 	**
 	**	This class implements Formatable. That means that it

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealAnyResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealAnyResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealAnyResultSetStatistics.java	Thu Nov 11 12:01:50 2004
@@ -30,10 +30,6 @@
 public class RealAnyResultSetStatistics 
 	extends RealNoPutResultSetStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/* Leave these fields public for object inspectors */
 	public int subqueryNumber;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealBasicNoPutResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealBasicNoPutResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealBasicNoPutResultSetStatistics.java	Thu Nov 11 12:01:50 2004
@@ -36,10 +36,6 @@
 abstract class RealBasicNoPutResultSetStatistics
 	implements ResultSetStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/* Leave these fields public for object inspectors */
 	public int numOpens;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealCurrentOfStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealCurrentOfStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealCurrentOfStatistics.java	Thu Nov 11 12:01:50 2004
@@ -27,10 +27,6 @@
 public class RealCurrentOfStatistics 
 	extends RealNoPutResultSetStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/* Leave these fields public for object inspectors */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteCascadeResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteCascadeResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteCascadeResultSetStatistics.java	Thu Nov 11 12:01:50 2004
@@ -22,10 +22,6 @@
 public class RealDeleteCascadeResultSetStatistics 
 	extends RealDeleteResultSetStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
 
 	/* Leave these fields public for object inspectors */
 	public 	ResultSetStatistics[] 	dependentTrackingArray;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteResultSetStatistics.java	Thu Nov 11 12:01:50 2004
@@ -22,10 +22,6 @@
 public class RealDeleteResultSetStatistics 
 	extends RealNoRowsResultSetStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/* Leave these fields public for object inspectors */
     public	int 					rowCount;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteVTIResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteVTIResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteVTIResultSetStatistics.java	Thu Nov 11 12:01:50 2004
@@ -22,10 +22,6 @@
 public class RealDeleteVTIResultSetStatistics
 	extends RealNoRowsResultSetStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 	/* Leave these fields public for object inspectors */
     public	int 					rowCount;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScalarAggregateStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScalarAggregateStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScalarAggregateStatistics.java	Thu Nov 11 12:01:50 2004
@@ -22,10 +22,6 @@
 public class RealDistinctScalarAggregateStatistics 
 	extends RealScalarAggregateStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/* Leave these fields public for object inspectors */
 	public int rowsInput;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScanStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScanStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScanStatistics.java	Thu Nov 11 12:01:50 2004
@@ -29,10 +29,6 @@
 public class RealDistinctScanStatistics
 	extends RealHashScanStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	// CONSTRUCTORS
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealGroupedAggregateStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealGroupedAggregateStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealGroupedAggregateStatistics.java	Thu Nov 11 12:01:50 2004
@@ -27,10 +27,6 @@
 public class RealGroupedAggregateStatistics 
 	extends RealNoPutResultSetStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/* Leave these fields public for object inspectors */
 	public int rowsInput;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashJoinStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashJoinStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashJoinStatistics.java	Thu Nov 11 12:01:50 2004
@@ -22,10 +22,6 @@
 public class RealHashJoinStatistics 
 	extends RealNestedLoopJoinStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	// CONSTRUCTORS
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashLeftOuterJoinStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashLeftOuterJoinStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashLeftOuterJoinStatistics.java	Thu Nov 11 12:01:50 2004
@@ -23,10 +23,6 @@
 public class RealHashLeftOuterJoinStatistics 
 	extends RealNestedLoopLeftOuterJoinStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 
 	// CONSTRUCTORS

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashScanStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashScanStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashScanStatistics.java	Thu Nov 11 12:01:50 2004
@@ -37,10 +37,6 @@
 public class RealHashScanStatistics
 	extends RealNoPutResultSetStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/* Leave these fields public for object inspectors */
 	public boolean isConstraint;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashTableStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashTableStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashTableStatistics.java	Thu Nov 11 12:01:50 2004
@@ -35,10 +35,6 @@
 public class RealHashTableStatistics
 	extends RealNoPutResultSetStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	/* Leave these fields public for object inspectors */
 	public int hashtableSize;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealIndexRowToBaseRowStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealIndexRowToBaseRowStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealIndexRowToBaseRowStatistics.java	Thu Nov 11 12:01:50 2004
@@ -31,10 +31,6 @@
 public class RealIndexRowToBaseRowStatistics 
 	extends RealNoPutResultSetStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/* Leave these fields public for object inspectors */
 	public String tableName;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealInsertResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealInsertResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealInsertResultSetStatistics.java	Thu Nov 11 12:01:50 2004
@@ -30,10 +30,6 @@
 public class RealInsertResultSetStatistics
 	extends RealNoRowsResultSetStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/* Leave these fields public for object inspectors */
     public	int 					rowCount;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealInsertVTIResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealInsertVTIResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealInsertVTIResultSetStatistics.java	Thu Nov 11 12:01:50 2004
@@ -30,10 +30,6 @@
 public class RealInsertVTIResultSetStatistics
 	extends RealNoRowsResultSetStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 	/* Leave these fields public for object inspectors */
     public	int 					rowCount;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealJoinResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealJoinResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealJoinResultSetStatistics.java	Thu Nov 11 12:01:50 2004
@@ -30,10 +30,6 @@
 public abstract class RealJoinResultSetStatistics 
 	extends RealNoPutResultSetStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/* Leave these fields public for object inspectors */
 	public int rowsSeenLeft;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealLastIndexKeyScanStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealLastIndexKeyScanStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealLastIndexKeyScanStatistics.java	Thu Nov 11 12:01:50 2004
@@ -35,10 +35,6 @@
 public class RealLastIndexKeyScanStatistics 
 	extends RealNoPutResultSetStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	/* Leave these fields public for object inspectors */
 	public String isolationLevel;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealMaterializedResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealMaterializedResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealMaterializedResultSetStatistics.java	Thu Nov 11 12:01:50 2004
@@ -30,10 +30,6 @@
 public class RealMaterializedResultSetStatistics 
 	extends RealNoPutResultSetStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 
 	/* Leave these fields public for object inspectors */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopJoinStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopJoinStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopJoinStatistics.java	Thu Nov 11 12:01:50 2004
@@ -30,10 +30,6 @@
 public class RealNestedLoopJoinStatistics 
 	extends RealJoinResultSetStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/* Leave these fields public for object inspectors */
 	public boolean oneRowRightSide;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopLeftOuterJoinStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopLeftOuterJoinStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopLeftOuterJoinStatistics.java	Thu Nov 11 12:01:50 2004
@@ -30,10 +30,6 @@
 public class RealNestedLoopLeftOuterJoinStatistics 
 	extends RealNestedLoopJoinStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/* Leave these fields public for object inspectors */
 	public int emptyRightRowsReturned;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNoPutResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNoPutResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNoPutResultSetStatistics.java	Thu Nov 11 12:01:50 2004
@@ -27,10 +27,6 @@
 abstract class RealNoPutResultSetStatistics 
 	extends RealBasicNoPutResultSetStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	/* Leave these fields public for object inspectors */
 	public int resultSetNumber;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNoRowsResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNoRowsResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNoRowsResultSetStatistics.java	Thu Nov 11 12:01:50 2004
@@ -29,10 +29,6 @@
 abstract class RealNoRowsResultSetStatistics
 	implements ResultSetStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 
 	/* Leave these fields public for object inspectors */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNormalizeResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNormalizeResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNormalizeResultSetStatistics.java	Thu Nov 11 12:01:50 2004
@@ -30,10 +30,6 @@
 public class RealNormalizeResultSetStatistics 
 	extends RealNoPutResultSetStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/* Leave these fields public for object inspectors */
 	public ResultSetStatistics childResultSetStatistics;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealOnceResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealOnceResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealOnceResultSetStatistics.java	Thu Nov 11 12:01:50 2004
@@ -30,10 +30,6 @@
 public class RealOnceResultSetStatistics 
 	extends RealNoPutResultSetStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/* Leave these fields public for object inspectors */
 	public int subqueryNumber;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealProjectRestrictStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealProjectRestrictStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealProjectRestrictStatistics.java	Thu Nov 11 12:01:50 2004
@@ -30,10 +30,6 @@
 public class RealProjectRestrictStatistics 
 	extends RealNoPutResultSetStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/* Leave these fields public for object inspectors */
 	public boolean doesProjection;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealRowResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealRowResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealRowResultSetStatistics.java	Thu Nov 11 12:01:50 2004
@@ -30,10 +30,6 @@
 public class RealRowResultSetStatistics 
 	extends RealNoPutResultSetStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/* Leave these fields public for object inspectors */
 	public int rowsReturned;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealScalarAggregateStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealScalarAggregateStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealScalarAggregateStatistics.java	Thu Nov 11 12:01:50 2004
@@ -30,10 +30,6 @@
 public class RealScalarAggregateStatistics 
 	extends RealNoPutResultSetStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/* Leave these fields public for object inspectors */
 	public int rowsInput = 0;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealScrollInsensitiveResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealScrollInsensitiveResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealScrollInsensitiveResultSetStatistics.java	Thu Nov 11 12:01:50 2004
@@ -30,10 +30,6 @@
 public class RealScrollInsensitiveResultSetStatistics 
 	extends RealNoPutResultSetStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	/* Leave these fields public for object inspectors */
 	public ResultSetStatistics childResultSetStatistics;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealSortStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealSortStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealSortStatistics.java	Thu Nov 11 12:01:50 2004
@@ -35,10 +35,6 @@
 public class RealSortStatistics 
 	extends RealNoPutResultSetStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/* Leave these fields public for object inspectors */
 	public int rowsInput;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealTableScanStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealTableScanStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealTableScanStatistics.java	Thu Nov 11 12:01:50 2004
@@ -36,10 +36,6 @@
 public class RealTableScanStatistics 
 	extends RealNoPutResultSetStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/* Leave these fields public for object inspectors */
 	public boolean isConstraint;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUnionResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUnionResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUnionResultSetStatistics.java	Thu Nov 11 12:01:50 2004
@@ -30,10 +30,6 @@
 public class RealUnionResultSetStatistics 
 	extends RealNoPutResultSetStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/* Leave these fields public for object inspectors */
 	public int rowsSeenLeft;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUpdateResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUpdateResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUpdateResultSetStatistics.java	Thu Nov 11 12:01:50 2004
@@ -30,10 +30,6 @@
 public class RealUpdateResultSetStatistics 
 	extends RealNoRowsResultSetStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 
 	/* Leave these fields public for object inspectors */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealVTIStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealVTIStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealVTIStatistics.java	Thu Nov 11 12:01:50 2004
@@ -31,10 +31,6 @@
 public class RealVTIStatistics 
 	extends RealNoPutResultSetStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 
 	/* Leave these fields public for object inspectors */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/ResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/ResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/ResultSetStatistics.java	Thu Nov 11 12:01:50 2004
@@ -22,10 +22,6 @@
 public interface ResultSetStatistics 
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	 * Return the statement execution plan as a String.
 	 *
 	 * @param depth	Indentation level.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RunTimeStatisticsImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RunTimeStatisticsImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RunTimeStatisticsImpl.java	Thu Nov 11 12:01:50 2004
@@ -35,10 +35,6 @@
 */
 public final class RunTimeStatisticsImpl implements RunTimeStatistics
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 
 	/* Leave these fields public for object inspectors */

Mime
View raw message