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 57466 - in incubator/derby/code/trunk/java/engine/org/apache/derby/impl: db io jdbc jdbc/authentication load services/bytecode services/cache services/daemon services/jce services/locks services/monitor services/reflect services/stream services/uuid store/access store/access/btree store/access/btree/index store/access/conglomerate store/access/heap store/access/sort store/raw/log store/raw/xact
Date Thu, 11 Nov 2004 20:05:41 GMT
Author: djd
Date: Thu Nov 11 12:05:39 2004
New Revision: 57466

Modified:
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/db/BasicDatabase.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/db/DatabaseContextImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/db/StoreClassFactoryContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/BaseStorageFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/CPFile.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/CPStorageFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile4.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirRandomAccessFile.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirRandomAccessFile4.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirStorageFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirStorageFactory4.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/InputStreamFile.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/JarDBFile.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/JarStorageFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/URLFile.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/URLStorageFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/BinaryToRawStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ConnectionChild.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement20.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement30.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedClob.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection20.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection30.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnectionContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedParameterMetaData30.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedParameterSetMetaData.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement20.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement30.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet20.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSetMetaData.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSQLException.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSQLWarning.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSavepoint30.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/RawToBinaryFormatStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ReaderToAscii.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ReaderToUTF8Stream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/UTF8Reader.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/Util.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/AuthenticationServiceBase.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationSchemeBase.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationService.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/LDAPAuthenticationSchemeImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/NoneAuthenticationServiceImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/SpecificAuthenticationServiceImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ControlInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/Import.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportAbstract.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCClass.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCExpr.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCLocalField.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethod.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethodCaller.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethodDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCUnsupported.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/CodeChunk.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/Conditional.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/GClass.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/OpcodeDebug.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/Type.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/VMTypeIdCacheable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/d_BCValidate.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/CacheStat.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/CachedItem.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/Clock.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/ClockFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/BasicDaemon.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/ServiceRecord.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/SingleThreadDaemonFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherProvider.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/ActiveLock.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Constants.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Control.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_ActiveLock.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_Lock.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_LockControl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Deadlock.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Lock.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockControl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockSpace.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockTableVTI.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/SinglePool.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/TableNameInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Timeout.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/FileMonitor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ModuleInstance.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/PersistentServiceImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ProtocolKey.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ReadOnly.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ServiceBootContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/TopService.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/UpdateServiceProperties.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/DatabaseClasses.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/GCInstanceFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarFile.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarFileJava2.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarLoader.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/LoadedGeneratedClass.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectClassesJava2.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectGeneratedClass.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectLoaderJava2.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectMethod.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/UpdateLoader.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/BasicGetLogHeader.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/BasicHeaderPrintWriter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/SingleStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/uuid/BasicUUID.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/uuid/BasicUUIDFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/uuid/BasicUUIDGetter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/BackingStoreHashTableFromScan.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/CacheableConglomerate.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/PC_XenaVersion.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/PropertyConglomerate.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMAccessManager.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransaction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransactionContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RllRAMAccessManager.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/StorableFormatId.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/UTF.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/UTFQualifier.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTree.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeCostController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeForwardScan.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeLockingPolicy.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeMaxScan.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreePostCommit.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeRowPosition.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScan.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScanInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchRow.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/D_BTreeController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/LeafControlRow.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/OpenBTree.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/SearchParameters.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/WaitError.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2ICostController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IForwardScan.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IMaxScan.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2INoLocking.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking1.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking2.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking3.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLockingRR.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IStaticCompiledInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2ITableLocking3.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IUndo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/D_B2IController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/BinaryOrderableWrapper.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/ConglomerateUtil.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerate.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerateController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericCostController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericScanController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerate.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerateScratchSpace.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/QualifierUtil.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/RowPosition.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/TemplateRow.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/D_HeapController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapClassInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapConglomerateFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapCostController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapPostCommit.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapRowLocation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapScan.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapScanInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/OpenHeap.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/ExternalSortFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeInserter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeScan.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeScanRowSource.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeSort.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeSortInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/Node.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/NodeAllocator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/Scan.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortBuffer.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortBufferRowSource.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortBufferScan.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortScan.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/FileLogger.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/FlushedScan.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogCounter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogRecord.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/BeginXact.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/ContainerLocking2.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/ContainerLocking3.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/D_Xact.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/EndXact.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/EscalateContainerKey.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/GlobalXactId.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/InternalXact.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/NoLocking.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking1.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking2.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking2nohold.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking3.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking3Escalate.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLockingRR.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/SavePoint.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTableEntry.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/Xact.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactId.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactXAResourceManager.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/db/BasicDatabase.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/db/BasicDatabase.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/db/BasicDatabase.java	Thu Nov 11 12:05:39 2004
@@ -98,10 +98,6 @@
 
 public class BasicDatabase implements ModuleControl, ModuleSupportable, PropertySetCallback, Database, JarReader
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	private boolean		active;
 	private AuthenticationService authenticationService;
 	protected AccessFactory af;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/db/DatabaseContextImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/db/DatabaseContextImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/db/DatabaseContextImpl.java	Thu Nov 11 12:05:39 2004
@@ -25,10 +25,6 @@
 */
 class DatabaseContextImpl extends ContextImpl implements DatabaseContext
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	private final Database	db;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/db/StoreClassFactoryContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/db/StoreClassFactoryContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/db/StoreClassFactoryContext.java	Thu Nov 11 12:05:39 2004
@@ -20,12 +20,7 @@
 
 /**
 */
-final class StoreClassFactoryContext extends ClassFactoryContext { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
+final class StoreClassFactoryContext extends ClassFactoryContext {
 
 	private final AccessFactory store;
 	private final JarReader	jarReader;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/BaseStorageFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/BaseStorageFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/BaseStorageFactory.java	Thu Nov 11 12:05:39 2004
@@ -25,10 +25,6 @@
 
 abstract class BaseStorageFactory implements StorageFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
 
     String home;
     protected StorageFile tempDir;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/CPFile.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/CPFile.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/CPFile.java	Thu Nov 11 12:05:39 2004
@@ -26,10 +26,6 @@
  */
 class CPFile extends InputStreamFile
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
 
     private final CPStorageFactory storageFactory;
     private int actionCode;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/CPStorageFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/CPStorageFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/CPStorageFactory.java	Thu Nov 11 12:05:39 2004
@@ -29,10 +29,6 @@
 
 public class CPStorageFactory extends BaseStorageFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
     boolean useContextLoader = true;
     
     /**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile.java	Thu Nov 11 12:05:39 2004
@@ -30,10 +30,6 @@
  */
 class DirFile extends File implements StorageFile
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-    private static final String copyrightNotice =  org.apache.derby.iapi.reference.Copyright.SHORT_2004;
 
     /**
      * Construct a DirFile from a path name.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile4.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile4.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile4.java	Thu Nov 11 12:05:39 2004
@@ -29,10 +29,6 @@
  */
 class DirFile4 extends DirFile
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
 
     private RandomAccessFile lockFileOpen;
     private FileChannel lockFileChannel;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirRandomAccessFile.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirRandomAccessFile.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirRandomAccessFile.java	Thu Nov 11 12:05:39 2004
@@ -26,10 +26,6 @@
  */
 class DirRandomAccessFile extends RandomAccessFile implements StorageRandomAccessFile
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
 
     /**
      * Construct a StorageRandomAccessFileImpl.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirRandomAccessFile4.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirRandomAccessFile4.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirRandomAccessFile4.java	Thu Nov 11 12:05:39 2004
@@ -25,10 +25,6 @@
  */
 class DirRandomAccessFile4 extends DirRandomAccessFile
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
 
 
     /**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirStorageFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirStorageFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirStorageFactory.java	Thu Nov 11 12:05:39 2004
@@ -35,10 +35,6 @@
 public class DirStorageFactory extends BaseStorageFactory
     implements WritableStorageFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
     /**
      * Construct a StorageFile from a path name.
      *

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirStorageFactory4.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirStorageFactory4.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirStorageFactory4.java	Thu Nov 11 12:05:39 2004
@@ -21,10 +21,6 @@
  */
 public class DirStorageFactory4 extends DirStorageFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
 
 	private static final boolean	rwsOK = JVMInfo.JDK_ID >= 5;
     

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/InputStreamFile.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/InputStreamFile.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/InputStreamFile.java	Thu Nov 11 12:05:39 2004
@@ -28,10 +28,6 @@
  */
 abstract class InputStreamFile implements StorageFile
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
 
     final String path;
     final int nameStart; // getName() = path.substring( nameStart)

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/JarDBFile.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/JarDBFile.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/JarDBFile.java	Thu Nov 11 12:05:39 2004
@@ -34,10 +34,6 @@
  */
 class JarDBFile extends InputStreamFile
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
 
     private final JarStorageFactory storageFactory;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/JarStorageFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/JarStorageFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/JarStorageFactory.java	Thu Nov 11 12:05:39 2004
@@ -32,10 +32,6 @@
 
 public class JarStorageFactory extends BaseStorageFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
     ZipFile zipData;
     
     /**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/URLFile.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/URLFile.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/URLFile.java	Thu Nov 11 12:05:39 2004
@@ -33,10 +33,6 @@
  */
 class URLFile extends InputStreamFile
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
 
     private final URLStorageFactory storageFactory;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/URLStorageFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/URLStorageFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/URLStorageFactory.java	Thu Nov 11 12:05:39 2004
@@ -27,10 +27,6 @@
 
 public class URLStorageFactory extends BaseStorageFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
     
     /**
      * Construct a persistent StorageFile from a path name.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/BinaryToRawStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/BinaryToRawStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/BinaryToRawStream.java	Thu Nov 11 12:05:39 2004
@@ -23,11 +23,7 @@
 */
 final class BinaryToRawStream
 extends java.io.FilterInputStream
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
+{
 
     // used by caller to insure that parent can not be GC'd until this
     // stream is no longer being used.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ConnectionChild.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ConnectionChild.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ConnectionChild.java	Thu Nov 11 12:05:39 2004
@@ -23,12 +23,7 @@
 	refer back to the EmbedConnection object extends this class.
 */
 
-public abstract class ConnectionChild { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+public abstract class ConnectionChild {
 
 	// parameters to handleException
 	protected static final boolean CLOSE = true;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java	Thu Nov 11 12:05:39 2004
@@ -52,10 +52,6 @@
 
 class EmbedBlob extends ConnectionChild implements Blob
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
     // clob is either bytes or stream
     private boolean         isBytes;
     private InputStream     myStream;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java	Thu Nov 11 12:05:39 2004
@@ -35,10 +35,6 @@
 public abstract class EmbedCallableStatement extends EmbedPreparedStatement
 	implements CallableStatement
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/*
 	** True if we are of the form ? = CALL() -- i.e. true
 	** if we have a return output parameter.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement20.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement20.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement20.java	Thu Nov 11 12:05:39 2004
@@ -51,10 +51,6 @@
 public class EmbedCallableStatement20
 	extends org.apache.derby.impl.jdbc.EmbedCallableStatement 
 {
-	/**
-		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/jdbc/EmbedCallableStatement30.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement30.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement30.java	Thu Nov 11 12:05:39 2004
@@ -29,10 +29,6 @@
  */
 public class EmbedCallableStatement30 extends EmbedCallableStatement20
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
 
 	//////////////////////////////////////////////////////////////
 	//

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedClob.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedClob.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedClob.java	Thu Nov 11 12:05:39 2004
@@ -53,10 +53,6 @@
  */
 final class EmbedClob extends ConnectionChild implements Clob
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
     // clob is either a string or stream
     private boolean         isString;
     private InputStream     myStream;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java	Thu Nov 11 12:05:39 2004
@@ -73,10 +73,6 @@
  */
 public abstract class EmbedConnection implements java.sql.Connection
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	private static final StandardException exceptionClose = StandardException.closeException();
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection20.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection20.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection20.java	Thu Nov 11 12:05:39 2004
@@ -34,10 +34,6 @@
  */
 public class EmbedConnection20 extends EmbedConnection
 {
-	/**
-		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/jdbc/EmbedConnection30.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection30.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection30.java	Thu Nov 11 12:05:39 2004
@@ -38,10 +38,6 @@
  */
 public class EmbedConnection30 extends EmbedConnection20
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
 
 	//////////////////////////////////////////////////////////
 	// CONSTRUCTORS

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnectionContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnectionContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnectionContext.java	Thu Nov 11 12:05:39 2004
@@ -29,10 +29,6 @@
 public class EmbedConnectionContext extends ContextImpl 
 		implements ConnectionContext
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/**
 		We hold a soft reference to the connection so that when the application

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java	Thu Nov 11 12:05:39 2004
@@ -88,12 +88,7 @@
  * @author ames
  */
 public class EmbedDatabaseMetaData extends ConnectionChild 
-	implements DatabaseMetaData, java.security.PrivilegedAction { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+	implements DatabaseMetaData, java.security.PrivilegedAction {
 
 	/*
 	** Property and values related to using

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedParameterMetaData30.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedParameterMetaData30.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedParameterMetaData30.java	Thu Nov 11 12:05:39 2004
@@ -26,11 +26,6 @@
  */
 class EmbedParameterMetaData30 extends org.apache.derby.impl.jdbc.EmbedParameterSetMetaData
     implements ParameterMetaData {
-	/**
-		IBM Copyright &copy notice.
-	*/
-
-    public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
 
 	//////////////////////////////////////////////////////////////
 	//

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedParameterSetMetaData.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedParameterSetMetaData.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedParameterSetMetaData.java	Thu Nov 11 12:05:39 2004
@@ -35,11 +35,6 @@
  */
 public class EmbedParameterSetMetaData
     {
-	/**
-		IBM Copyright &copy notice.
-	*/
-
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
 
     private final ParameterValueSet pvs;
     private final DataTypeDescriptor[] types;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java	Thu Nov 11 12:05:39 2004
@@ -67,10 +67,6 @@
 	extends EmbedStatement
 	implements java.sql.PreparedStatement
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	//Moving jdbc2.0 batch related code in this class because callableStatement in jdbc 20 needs
 	//this code too and it doesn't derive from prepared statement in jdbc 20 in our implementation.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement20.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement20.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement20.java	Thu Nov 11 12:05:39 2004
@@ -43,12 +43,7 @@
  *	@author francois
  */
 public class EmbedPreparedStatement20
-	extends org.apache.derby.impl.jdbc.EmbedPreparedStatement { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
+	extends org.apache.derby.impl.jdbc.EmbedPreparedStatement {
 
 	//////////////////////////////////////////////////////////////
 	//

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement30.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement30.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement30.java	Thu Nov 11 12:05:39 2004
@@ -27,12 +27,7 @@
  *
  */
 public class EmbedPreparedStatement30 extends EmbedPreparedStatement20
-{ 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
+{
 
 	//////////////////////////////////////////////////////////////
 	//

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java	Thu Nov 11 12:05:39 2004
@@ -62,11 +62,6 @@
 public abstract class EmbedResultSet extends ConnectionChild 
     implements java.sql.ResultSet, Comparable {
 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-
 	// cursor movement
 	protected static final int FIRST = 1;
 	protected static final int NEXT = 2;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet20.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet20.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet20.java	Thu Nov 11 12:05:39 2004
@@ -45,12 +45,7 @@
  */
 
 public class EmbedResultSet20
-        extends org.apache.derby.impl.jdbc.EmbedResultSet { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
+        extends org.apache.derby.impl.jdbc.EmbedResultSet {
 
         private int fetchDirection ;
         private int fetchSize  ;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSetMetaData.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSetMetaData.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSetMetaData.java	Thu Nov 11 12:05:39 2004
@@ -41,10 +41,6 @@
  */
 public class EmbedResultSetMetaData
 	implements ResultSetMetaData {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	private final ResultColumnDescriptor[] columnInfo;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSQLException.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSQLException.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSQLException.java	Thu Nov 11 12:05:39 2004
@@ -26,12 +26,7 @@
     on the server side and it also decreases the size of client
     jar file tremendously.
 */
-public class EmbedSQLException extends SQLException { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+public class EmbedSQLException extends SQLException {
 
 	private Object[] arguments;
 	private String messageId;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSQLWarning.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSQLWarning.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSQLWarning.java	Thu Nov 11 12:05:39 2004
@@ -32,10 +32,6 @@
 	@author ames
 */
 public class EmbedSQLWarning extends SQLWarning {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/*
 	** instance fields

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSavepoint30.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSavepoint30.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSavepoint30.java	Thu Nov 11 12:05:39 2004
@@ -35,11 +35,6 @@
 final class EmbedSavepoint30 extends ConnectionChild
     implements Savepoint {
 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
-
     //In order to avoid name conflict, the external names are prepanded
     //with "e." and internal names always start with "i." This is for bug 4467
     private final String savepointName;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java	Thu Nov 11 12:05:39 2004
@@ -40,12 +40,7 @@
  * @author ames
  */
 public class EmbedStatement extends ConnectionChild
-    implements java.sql.Statement { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+    implements java.sql.Statement {
 
 	private final java.sql.Connection applicationConnection;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/RawToBinaryFormatStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/RawToBinaryFormatStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/RawToBinaryFormatStream.java	Thu Nov 11 12:05:39 2004
@@ -24,10 +24,6 @@
 	length of the value. In this case 0 is always written.
 */
 class RawToBinaryFormatStream extends LimitInputStream {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
 
 	private int dummyBytes = 4;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ReaderToAscii.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ReaderToAscii.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ReaderToAscii.java	Thu Nov 11 12:05:39 2004
@@ -20,10 +20,6 @@
 */
 public final class ReaderToAscii extends InputStream
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
 
 	private final Reader data;
 	private char[]	conv;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ReaderToUTF8Stream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ReaderToUTF8Stream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ReaderToUTF8Stream.java	Thu Nov 11 12:05:39 2004
@@ -25,10 +25,6 @@
 final class ReaderToUTF8Stream
 	extends InputStream
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
 
 	private LimitReader reader;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java	Thu Nov 11 12:05:39 2004
@@ -98,10 +98,6 @@
  */
 public final class TransactionResourceImpl
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	/*
 	** instance variables set up in the constructor.
 	*/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/UTF8Reader.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/UTF8Reader.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/UTF8Reader.java	Thu Nov 11 12:05:39 2004
@@ -21,10 +21,6 @@
 */
 public final class UTF8Reader extends Reader
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
 
 	private InputStream in;
 	private final long         utfLen;	// bytes

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/Util.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/Util.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/Util.java	Thu Nov 11 12:05:39 2004
@@ -53,11 +53,6 @@
 //the actual changes made.
 public abstract class Util  {
 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-
 	/*
 	** Methods of Throwable
 	*/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/AuthenticationServiceBase.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/AuthenticationServiceBase.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/AuthenticationServiceBase.java	Thu Nov 11 12:05:39 2004
@@ -67,10 +67,6 @@
  */
 public abstract class AuthenticationServiceBase
 	implements AuthenticationService, ModuleControl, ModuleSupportable, PropertySetCallback {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	protected UserAuthenticator authenticationScheme; 
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java	Thu Nov 11 12:05:39 2004
@@ -48,10 +48,6 @@
  */
 public final class BasicAuthenticationServiceImpl
 	extends AuthenticationServiceBase implements UserAuthenticator {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	//
 	// ModuleControl implementation (overriden)

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationSchemeBase.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationSchemeBase.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationSchemeBase.java	Thu Nov 11 12:05:39 2004
@@ -42,10 +42,6 @@
 
 public abstract class JNDIAuthenticationSchemeBase implements UserAuthenticator
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	protected  final JNDIAuthenticationService authenticationService;
 	protected String providerURL;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationService.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationService.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationService.java	Thu Nov 11 12:05:39 2004
@@ -34,10 +34,6 @@
 
 public class JNDIAuthenticationService
 	extends AuthenticationServiceBase {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	private String authenticationProvider;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/LDAPAuthenticationSchemeImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/LDAPAuthenticationSchemeImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/LDAPAuthenticationSchemeImpl.java	Thu Nov 11 12:05:39 2004
@@ -59,10 +59,6 @@
 public final class LDAPAuthenticationSchemeImpl
 extends JNDIAuthenticationSchemeBase
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	private static final String dfltLDAPURL = "ldap://";
 
 	private String searchBaseDN;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/NoneAuthenticationServiceImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/NoneAuthenticationServiceImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/NoneAuthenticationServiceImpl.java	Thu Nov 11 12:05:39 2004
@@ -33,10 +33,6 @@
  */
 public final class NoneAuthenticationServiceImpl
 	extends AuthenticationServiceBase implements UserAuthenticator {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	//
 	// ModuleControl implementation (overriden)

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/SpecificAuthenticationServiceImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/SpecificAuthenticationServiceImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/SpecificAuthenticationServiceImpl.java	Thu Nov 11 12:05:39 2004
@@ -33,10 +33,6 @@
  */
 public class SpecificAuthenticationServiceImpl
 	extends AuthenticationServiceBase {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	private String specificAuthenticationScheme;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ControlInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ControlInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ControlInfo.java	Thu Nov 11 12:05:39 2004
@@ -22,10 +22,6 @@
 //redirecting system err to that message file
 class ControlInfo
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
   static final String ESCAPE = "Escape";
   static final String DEFAULT_ESCAPE = "\\";

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/Import.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/Import.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/Import.java	Thu Nov 11 12:05:39 2004
@@ -28,10 +28,6 @@
  */
 
 public class Import extends ImportAbstract{
-	/**
-	   IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	private String inputFileName;
 

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

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCClass.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCClass.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCClass.java	Thu Nov 11 12:05:39 2004
@@ -68,10 +68,6 @@
  *
  */
 class BCClass extends GClass {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	//
 	// ClassBuilder interface
 	//

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCExpr.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCExpr.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCExpr.java	Thu Nov 11 12:05:39 2004
@@ -17,12 +17,7 @@
  * it if so.
  *
  */
-interface BCExpr { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+interface BCExpr {
 
 	// maybe these should go into Declarations, instead?
 	// note there is no vm_boolean; boolean is an int

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java	Thu Nov 11 12:05:39 2004
@@ -124,10 +124,6 @@
 	@author ames
  */
 public class BCJava implements JavaFactory, CacheableFactory, ModuleControl {
-	/**
-		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/services/bytecode/BCLocalField.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCLocalField.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCLocalField.java	Thu Nov 11 12:05:39 2004
@@ -15,10 +15,6 @@
 import org.apache.derby.iapi.services.classfile.VMOpcode;
 
 class BCLocalField implements LocalField {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 	final int	   cpi; // of the Field Reference
 	final Type     type;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethod.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethod.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethod.java	Thu Nov 11 12:05:39 2004
@@ -55,10 +55,6 @@
  *
  */
 public class BCMethod implements MethodBuilder {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	final BCClass		cb;
 	protected final ClassHolder modClass; // the class it is in (modifiable fmt)

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethodCaller.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethodCaller.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethodCaller.java	Thu Nov 11 12:05:39 2004
@@ -13,10 +13,6 @@
 /**
  */
 class BCMethodCaller extends BCLocalField {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 	final short opcode;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethodDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethodDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethodDescriptor.java	Thu Nov 11 12:05:39 2004
@@ -20,10 +20,6 @@
 	This has no generated class specific state.
  */
 class BCMethodDescriptor {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	static final String[] EMPTY = new String[0];
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCUnsupported.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCUnsupported.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCUnsupported.java	Thu Nov 11 12:05:39 2004
@@ -15,10 +15,6 @@
 	Convienence SanityManager methods.
  */
 class BCUnsupported {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	static void checkImplementationMatch(boolean matches) {
 		if (!matches)

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/CodeChunk.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/CodeChunk.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/CodeChunk.java	Thu Nov 11 12:05:39 2004
@@ -29,10 +29,6 @@
  * would be a forward reference.
  */
 class CodeChunk {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	// The use of ILOAD for the non-integer types is correct.
 	// We have to assume that the appropriate checks/conversions
 	// are defined on math operation results to ensure that

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/Conditional.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/Conditional.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/Conditional.java	Thu Nov 11 12:05:39 2004
@@ -30,10 +30,6 @@
 	 end:
 */
 class Conditional {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 	private final Conditional parent;
 	private final int   ifOffset;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/GClass.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/GClass.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/GClass.java	Thu Nov 11 12:05:39 2004
@@ -31,10 +31,6 @@
  * @author ames
  */
 public abstract class GClass implements ClassBuilder {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	protected ByteArray bytecode;
 	protected final ClassFactory cf;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/OpcodeDebug.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/OpcodeDebug.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/OpcodeDebug.java	Thu Nov 11 12:05:39 2004
@@ -20,10 +20,6 @@
  * debugging).  We even leave out the initialization in that case.
  */
 class OpcodeDebug {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	static final String Name[];
 
 	static {

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/Type.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/Type.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/Type.java	Thu Nov 11 12:05:39 2004
@@ -14,10 +14,6 @@
 import org.apache.derby.iapi.services.classfile.ClassHolder;
 
 final class Type {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	static final Type LONG = new Type("long", VMDescriptor.LONG);
 	static final Type INT = new Type("int", VMDescriptor.INT);

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/VMTypeIdCacheable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/VMTypeIdCacheable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/VMTypeIdCacheable.java	Thu Nov 11 12:05:39 2004
@@ -22,10 +22,6 @@
  * VMTypeIds.  It maps a Java class or type name to a VM type ID.
  */
 class VMTypeIdCacheable implements Cacheable {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	/* The VM name of the Java class name */
 	// either a Type (java type) or a String (method descriptor)
 	private Object descriptor;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/d_BCValidate.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/d_BCValidate.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/d_BCValidate.java	Thu Nov 11 12:05:39 2004
@@ -24,10 +24,6 @@
  */
 class d_BCValidate
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	private static final String[] csPackages = {
 		"java",

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/CacheStat.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/CacheStat.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/CacheStat.java	Thu Nov 11 12:05:39 2004
@@ -12,12 +12,7 @@
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
 
-class CacheStat { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
+class CacheStat {
 
 	/*
 	** Fields

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/CachedItem.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/CachedItem.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/CachedItem.java	Thu Nov 11 12:05:39 2004
@@ -54,12 +54,7 @@
 	@see org.apache.derby.impl.services.cache
 	@see Cacheable
 */
-public final class CachedItem { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+public final class CachedItem {
 
 	private static final int VALID            = 0x00000001;
 	private static final int REMOVE_REQUESTED = 0x00000002;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/Clock.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/Clock.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/Clock.java	Thu Nov 11 12:05:39 2004
@@ -86,12 +86,7 @@
 
 */
 
-final class Clock extends Hashtable implements CacheManager, Serviceable { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+final class Clock extends Hashtable implements CacheManager, Serviceable {
 
 	/*
 	** Fields

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/ClockFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/ClockFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/ClockFactory.java	Thu Nov 11 12:05:39 2004
@@ -27,10 +27,6 @@
 */
 
 public class ClockFactory implements CacheFactory {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/**
 		Trace flag to display cache statistics

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/BasicDaemon.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/BasicDaemon.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/BasicDaemon.java	Thu Nov 11 12:05:39 2004
@@ -64,10 +64,6 @@
 */
 public class BasicDaemon implements DaemonService, Runnable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	private int numClients;		// number of clients that needs services
 
 	private static final int OPTIMAL_QUEUE_SIZE = 100;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/ServiceRecord.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/ServiceRecord.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/ServiceRecord.java	Thu Nov 11 12:05:39 2004
@@ -15,10 +15,6 @@
 /** wrapper class for basic daemon's clients */
 class ServiceRecord
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	// immutable fields
 	final Serviceable client;	
 	private final boolean onDemandOnly;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/SingleThreadDaemonFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/SingleThreadDaemonFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/SingleThreadDaemonFactory.java	Thu Nov 11 12:05:39 2004
@@ -18,10 +18,6 @@
 
 public class SingleThreadDaemonFactory implements DaemonFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	private final ContextService contextService;
 	
 	public SingleThreadDaemonFactory()

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherFactory.java	Thu Nov 11 12:05:39 2004
@@ -58,10 +58,6 @@
  */
 public final class JCECipherFactory implements CipherFactory, ModuleControl, java.security.PrivilegedExceptionAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
     private final static String MESSAGE_DIGEST = "MD5";
 
 	private final static String DEFAULT_PROVIDER = "com.sun.crypto.provider.SunJCE";

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherProvider.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherProvider.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherProvider.java	Thu Nov 11 12:05:39 2004
@@ -37,10 +37,6 @@
  */
 class JCECipherProvider implements CipherProvider
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 	private Cipher cipher;
 	private int mode;
     private boolean ivUsed = true;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/ActiveLock.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/ActiveLock.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/ActiveLock.java	Thu Nov 11 12:05:39 2004
@@ -27,10 +27,6 @@
 */
 
 public final class ActiveLock extends Lock {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/**
 		Set to true if the object waiting on this thread should wake up,

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Constants.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Constants.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Constants.java	Thu Nov 11 12:05:39 2004
@@ -14,10 +14,6 @@
 */
 
 public class Constants {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	/**
 		Trace flag to display lock requests, grants and unlocks.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Control.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Control.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Control.java	Thu Nov 11 12:05:39 2004
@@ -15,10 +15,6 @@
 import java.util.List;
 
 public interface Control {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	public Lockable getLockable();
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_ActiveLock.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_ActiveLock.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_ActiveLock.java	Thu Nov 11 12:05:39 2004
@@ -16,10 +16,6 @@
 */
 
 public class D_ActiveLock extends D_Lock  {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/**
 		@exception StandardException Standard cloudscape policy

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_Lock.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_Lock.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_Lock.java	Thu Nov 11 12:05:39 2004
@@ -21,10 +21,6 @@
 
 public class D_Lock implements Diagnosticable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
     protected Lock lock;
 
     public D_Lock()

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_LockControl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_LockControl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_LockControl.java	Thu Nov 11 12:05:39 2004
@@ -25,10 +25,6 @@
 
 public class D_LockControl implements Diagnosticable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
     protected LockControl control;
 
     public D_LockControl()

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Deadlock.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Deadlock.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Deadlock.java	Thu Nov 11 12:05:39 2004
@@ -36,10 +36,6 @@
 */
 
 class Deadlock  {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	private Deadlock() {}
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Lock.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Lock.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Lock.java	Thu Nov 11 12:05:39 2004
@@ -25,10 +25,6 @@
 */
 
 public class Lock implements Latch, Control {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/**
 		Compatibility space the object is locked in.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockControl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockControl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockControl.java	Thu Nov 11 12:05:39 2004
@@ -31,10 +31,6 @@
 */
 
 public class LockControl implements Control {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	private final Lockable		ref;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockSet.java	Thu Nov 11 12:05:39 2004
@@ -56,10 +56,6 @@
 
 public final class LockSet extends Hashtable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/*
 	** Fields
 	*/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockSpace.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockSpace.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockSpace.java	Thu Nov 11 12:05:39 2004
@@ -33,10 +33,6 @@
 
 */
 class LockSpace extends Hashtable {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	private final Object compatSpace;
 	// the object I live in

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockTableVTI.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockTableVTI.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockTableVTI.java	Thu Nov 11 12:05:39 2004
@@ -27,10 +27,6 @@
  */
 class LockTableVTI implements Enumeration
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	// the clonedLockTable temporarily holds a copy of the lock table.
 	//
 	// The copy is necessary because the real lock manager needs to be single

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/SinglePool.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/SinglePool.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/SinglePool.java	Thu Nov 11 12:05:39 2004
@@ -55,10 +55,6 @@
 	implements  LockFactory
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 		The complete set of locks in the system
 
 		<BR>

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/TableNameInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/TableNameInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/TableNameInfo.java	Thu Nov 11 12:05:39 2004
@@ -24,10 +24,6 @@
 import java.util.Hashtable;
 
 public class TableNameInfo {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	// things to look up table name etc
 	private DataDictionary dd;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Timeout.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Timeout.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Timeout.java	Thu Nov 11 12:05:39 2004
@@ -37,10 +37,6 @@
 
 public final class Timeout
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
     public static final int TABLE_AND_ROWLOCK = VirtualLockTable.TABLE_AND_ROWLOCK;
     public static final int ALL = VirtualLockTable.ALL;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java	Thu Nov 11 12:05:39 2004
@@ -91,10 +91,6 @@
 
 public abstract class BaseMonitor
 	implements ModuleFactory, BundleFinder {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/* Fields */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/FileMonitor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/FileMonitor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/FileMonitor.java	Thu Nov 11 12:05:39 2004
@@ -34,11 +34,6 @@
 public final class FileMonitor extends BaseMonitor implements java.security.PrivilegedExceptionAction
 {
 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-
 	/* Fields */
 	private File home;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ModuleInstance.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ModuleInstance.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ModuleInstance.java	Thu Nov 11 12:05:39 2004
@@ -20,10 +20,6 @@
 
 
 class ModuleInstance {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/*
 	** Fields.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/PersistentServiceImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/PersistentServiceImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/PersistentServiceImpl.java	Thu Nov 11 12:05:39 2004
@@ -53,10 +53,6 @@
  */
 public class PersistentServiceImpl implements PersistentService
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
 
     private String home; // the path of the database home directory. Can be null
     private String canonicalHome; // will be null if home is null

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ProtocolKey.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ProtocolKey.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ProtocolKey.java	Thu Nov 11 12:05:39 2004
@@ -20,10 +20,6 @@
 
 
 class ProtocolKey {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/*
 	** Fields.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ReadOnly.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ReadOnly.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ReadOnly.java	Thu Nov 11 12:05:39 2004
@@ -25,11 +25,6 @@
 
 public abstract class ReadOnly implements PersistentService {
 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-
 	protected final Properties readProperties(InputStream is, Properties defaultProperties) throws StandardException {
 
 		try {

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ServiceBootContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ServiceBootContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ServiceBootContext.java	Thu Nov 11 12:05:39 2004
@@ -19,10 +19,6 @@
 	stop cleanup on the stack at this point.
 */
 class ServiceBootContext extends ContextImpl {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	ServiceBootContext(ContextManager cm) {
 		super(cm, "ServiceBoot");

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/TopService.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/TopService.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/TopService.java	Thu Nov 11 12:05:39 2004
@@ -31,10 +31,6 @@
 
 
 class TopService {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/*
 	** Fields.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/UpdateServiceProperties.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/UpdateServiceProperties.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/UpdateServiceProperties.java	Thu Nov 11 12:05:39 2004
@@ -24,10 +24,6 @@
 /**
 */
 public class UpdateServiceProperties extends Properties {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	private PersistentService serviceType;
 	private String serviceName;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/DatabaseClasses.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/DatabaseClasses.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/DatabaseClasses.java	Thu Nov 11 12:05:39 2004
@@ -69,10 +69,6 @@
 public abstract class DatabaseClasses
 	implements ClassFactory, ModuleControl
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	/*
 	** Fields
 	*/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/GCInstanceFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/GCInstanceFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/GCInstanceFactory.java	Thu Nov 11 12:05:39 2004
@@ -16,11 +16,6 @@
 import org.apache.derby.iapi.error.StandardException;
 
 public abstract class GCInstanceFactory {
-	/**
-		IBM Copyright &copy notice.
-	*/
-
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
 
 	public abstract GeneratedByteCode getNewInstance();
 }

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarFile.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarFile.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarFile.java	Thu Nov 11 12:05:39 2004
@@ -22,10 +22,6 @@
 import org.apache.derby.iapi.services.io.InputStreamUtil;
 
 class JarFile {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	final String[] name;
 	protected ZipFile zip;
 	boolean isStream;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarFileJava2.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarFileJava2.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarFileJava2.java	Thu Nov 11 12:05:39 2004
@@ -33,10 +33,6 @@
 */
 
 final class JarFileJava2 extends JarFile {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 	JarFileJava2() {
 		super();

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarLoader.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarLoader.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarLoader.java	Thu Nov 11 12:05:39 2004
@@ -33,10 +33,6 @@
 
 
 public class JarLoader extends ClassLoader {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	private static final JarFile jarFileFactory;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/LoadedGeneratedClass.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/LoadedGeneratedClass.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/LoadedGeneratedClass.java	Thu Nov 11 12:05:39 2004
@@ -25,10 +25,6 @@
 public abstract class LoadedGeneratedClass
 	implements GeneratedClass
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/*
 	** Fields

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectClassesJava2.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectClassesJava2.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectClassesJava2.java	Thu Nov 11 12:05:39 2004
@@ -18,10 +18,6 @@
 public final class ReflectClassesJava2 extends DatabaseClasses
 	implements java.security.PrivilegedAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 	private java.util.HashMap preCompiled;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectGeneratedClass.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectGeneratedClass.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectGeneratedClass.java	Thu Nov 11 12:05:39 2004
@@ -23,10 +23,6 @@
 import java.util.Hashtable;
 
 public final class ReflectGeneratedClass extends LoadedGeneratedClass {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	private final Hashtable methodCache;
 	private static final GeneratedMethod[] directs;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectLoaderJava2.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectLoaderJava2.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectLoaderJava2.java	Thu Nov 11 12:05:39 2004
@@ -12,12 +12,8 @@
 
 import org.apache.derby.iapi.util.ByteArray;
 import org.apache.derby.iapi.sql.compile.CodeGeneration;
-	/**
-		IBM Copyright &copy notice.
-	*/
 
-
-final class ReflectLoaderJava2 extends ClassLoader { private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
+final class ReflectLoaderJava2 extends ClassLoader {
 
 	/*
 	**	Fields

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectMethod.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectMethod.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectMethod.java	Thu Nov 11 12:05:39 2004
@@ -18,10 +18,6 @@
 import java.lang.reflect.InvocationTargetException;
 
 class ReflectMethod implements GeneratedMethod {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	private final Method	realMethod;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/UpdateLoader.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/UpdateLoader.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/UpdateLoader.java	Thu Nov 11 12:05:39 2004
@@ -35,10 +35,6 @@
 import org.apache.derby.iapi.services.i18n.MessageService;
 
 public class UpdateLoader {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	private JarLoader[] jarList;
 	private HeaderPrintWriter vs;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/BasicGetLogHeader.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/BasicGetLogHeader.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/BasicGetLogHeader.java	Thu Nov 11 12:05:39 2004
@@ -23,10 +23,6 @@
 
 class BasicGetLogHeader implements PrintWriterGetHeader
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	
 	private boolean doThreadId;
 	private boolean doTimeStamp;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/BasicHeaderPrintWriter.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/BasicHeaderPrintWriter.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/BasicHeaderPrintWriter.java	Thu Nov 11 12:05:39 2004
@@ -29,10 +29,6 @@
 	extends PrintWriter
 	implements HeaderPrintWriter
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	private final PrintWriterGetHeader headerGetter;
 	private final boolean canClose;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/SingleStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/SingleStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/SingleStream.java	Thu Nov 11 12:05:39 2004
@@ -62,11 +62,6 @@
 implements InfoStreams, ModuleControl, java.security.PrivilegedAction
 {
 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-
 	/*
 	** Instance fields
 	*/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/uuid/BasicUUID.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/uuid/BasicUUID.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/uuid/BasicUUID.java	Thu Nov 11 12:05:39 2004
@@ -25,10 +25,6 @@
 
 public class BasicUUID implements UUID, Formatable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/*
 	** Fields of BasicUUID
 	*/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/uuid/BasicUUIDFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/uuid/BasicUUIDFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/uuid/BasicUUIDFactory.java	Thu Nov 11 12:05:39 2004
@@ -46,11 +46,7 @@
 
 public final class BasicUUIDFactory
 	implements UUIDFactory
-{	
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+{
     /*
 	** Fields of BasicUUIDFactory.
 	*/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/uuid/BasicUUIDGetter.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/uuid/BasicUUIDGetter.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/uuid/BasicUUIDGetter.java	Thu Nov 11 12:05:39 2004
@@ -18,10 +18,6 @@
 
 public class BasicUUIDGetter extends FormatableInstanceGetter
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 	public Object getNewInstance() {
 		return new BasicUUID();
 	}

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/BackingStoreHashTableFromScan.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/BackingStoreHashTableFromScan.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/BackingStoreHashTableFromScan.java	Thu Nov 11 12:05:39 2004
@@ -43,11 +43,6 @@
 
 class BackingStoreHashTableFromScan extends BackingStoreHashtable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
     /**************************************************************************
      * Fields of the class

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/CacheableConglomerate.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/CacheableConglomerate.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/CacheableConglomerate.java	Thu Nov 11 12:05:39 2004
@@ -35,10 +35,6 @@
 
 class CacheableConglomerate implements Cacheable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
     private Long            conglomid;
     private Conglomerate    conglom;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/PC_XenaVersion.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/PC_XenaVersion.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/PC_XenaVersion.java	Thu Nov 11 12:05:39 2004
@@ -30,10 +30,6 @@
 
 public class PC_XenaVersion implements Formatable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	private static final int XENA_MAJOR_VERSION = 1;
 	private static final int XENA_MINOR_VERSION_0 = 0;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/PropertyConglomerate.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/PropertyConglomerate.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/PropertyConglomerate.java	Thu Nov 11 12:05:39 2004
@@ -85,10 +85,6 @@
 **/
 class PropertyConglomerate
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	protected long propertiesConglomId;
 	protected Properties serviceProperties;
 	private LockFactory lf;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMAccessManager.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMAccessManager.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMAccessManager.java	Thu Nov 11 12:05:39 2004
@@ -67,10 +67,6 @@
                ModuleControl, 
                PropertySetCallback
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
     /**************************************************************************
      * Fields of the class
      **************************************************************************

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransaction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransaction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransaction.java	Thu Nov 11 12:05:39 2004
@@ -81,11 +81,6 @@
 public class RAMTransaction 
     implements XATransactionController, TransactionManager
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/**
 	The corresponding raw store transaction.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransactionContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransactionContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransactionContext.java	Thu Nov 11 12:05:39 2004
@@ -20,10 +20,6 @@
 public class RAMTransactionContext extends ContextImpl
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	The transaction this context is managing.
 	**/
 	protected RAMTransaction transaction;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RllRAMAccessManager.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RllRAMAccessManager.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RllRAMAccessManager.java	Thu Nov 11 12:05:39 2004
@@ -33,10 +33,6 @@
 
 public class RllRAMAccessManager extends RAMAccessManager
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
     private int system_lock_level = TransactionController.MODE_RECORD;
 
     /**************************************************************************

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/StorableFormatId.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/StorableFormatId.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/StorableFormatId.java	Thu Nov 11 12:05:39 2004
@@ -40,11 +40,6 @@
 
 public class StorableFormatId extends DataType 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
     private int    format_id;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/UTF.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/UTF.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/UTF.java	Thu Nov 11 12:05:39 2004
@@ -23,10 +23,6 @@
 
 public class UTF extends UserType
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
     public UTF()
     {
     }

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/UTFQualifier.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/UTFQualifier.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/UTFQualifier.java	Thu Nov 11 12:05:39 2004
@@ -18,10 +18,6 @@
 */
 public class UTFQualifier implements Qualifier
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
     private UTF      value;
 	private int		 columnId;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTree.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTree.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTree.java	Thu Nov 11 12:05:39 2004
@@ -88,10 +88,6 @@
 
 public abstract class BTree extends GenericConglomerate
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
     /**************************************************************************
      * Public Constants of BTree class:
      **************************************************************************

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java	Thu Nov 11 12:05:39 2004
@@ -62,12 +62,7 @@
 **/
 
 public class BTreeController extends OpenBTree implements ConglomerateController
-{ 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+{
 
     transient DataValueDescriptor[] scratch_template = null;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeCostController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeCostController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeCostController.java	Thu Nov 11 12:05:39 2004
@@ -70,11 +70,6 @@
 public class BTreeCostController extends OpenBTree 
     implements StoreCostController
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
     // 1.5 numbers on mikem old machine:
     //

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeForwardScan.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeForwardScan.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeForwardScan.java	Thu Nov 11 12:05:39 2004
@@ -60,10 +60,6 @@
 
 public class BTreeForwardScan extends BTreeScan
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	/*
 	** Private/Protected methods of This class, sorted alphabetically
 	*/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeLockingPolicy.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeLockingPolicy.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeLockingPolicy.java	Thu Nov 11 12:05:39 2004
@@ -66,10 +66,6 @@
 
 public interface BTreeLockingPolicy
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
     /**************************************************************************
      * Abstract Protected lockScan*() locking methods of BTree:
      *     lockScan                 - lock the scan page

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeMaxScan.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeMaxScan.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeMaxScan.java	Thu Nov 11 12:05:39 2004
@@ -54,11 +54,6 @@
 
 public class BTreeMaxScan extends BTreeScan
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
     /**************************************************************************
      * Private methods of This class:

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreePostCommit.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreePostCommit.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreePostCommit.java	Thu Nov 11 12:05:39 2004
@@ -54,10 +54,6 @@
 
 class BTreePostCommit implements Serviceable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
     private     AccessFactory access_factory  = null;
     private     long          page_number = ContainerHandle.INVALID_PAGE_NUMBER;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeRowPosition.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeRowPosition.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeRowPosition.java	Thu Nov 11 12:05:39 2004
@@ -29,10 +29,6 @@
 
 public class BTreeRowPosition extends RowPosition
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
     /**************************************************************************
      * Fields of the class
      **************************************************************************

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScan.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScan.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScan.java	Thu Nov 11 12:05:39 2004
@@ -63,11 +63,6 @@
 
 public abstract class BTreeScan extends OpenBTree implements ScanManager
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/*
 	** Fields of BTreeScan

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScanInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScanInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScanInfo.java	Thu Nov 11 12:05:39 2004
@@ -31,10 +31,6 @@
 **/
 class BTreeScanInfo implements ScanInfo
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
     /**
      * Performance counters ...
      */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java	Thu Nov 11 12:05:39 2004
@@ -69,10 +69,6 @@
 **/
 public class BranchControlRow extends ControlRow
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
     protected SQLLongint    left_child_page = null;
 
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchRow.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchRow.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchRow.java	Thu Nov 11 12:05:39 2004
@@ -43,10 +43,6 @@
 
 public class BranchRow
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
     /* a dummy page number value (should not be compressable) */
     public static final long DUMMY_PAGE_NUMBER = 0xffffffffffffffffL;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java	Thu Nov 11 12:05:39 2004
@@ -77,10 +77,6 @@
 
 public abstract class ControlRow implements AuxObject, TypedFormat
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
     /**
      * Version indentifier of the control row within the page.  
      * <p>

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/D_BTreeController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/D_BTreeController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/D_BTreeController.java	Thu Nov 11 12:05:39 2004
@@ -39,10 +39,6 @@
 **/
 class LevelInfo
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
     public int num_pages          = 0; // number of pages in heap.
     public int num_overflow_pgs   = 0; // number of overflow pages heap.
     public int num_entries        = 0; // number recs on page

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/LeafControlRow.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/LeafControlRow.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/LeafControlRow.java	Thu Nov 11 12:05:39 2004
@@ -62,11 +62,7 @@
  **/
 
 public class LeafControlRow extends ControlRow
-{	
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+{
 	/*
 	** Constructors of BranchControlRow
 	*/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/OpenBTree.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/OpenBTree.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/OpenBTree.java	Thu Nov 11 12:05:39 2004
@@ -52,10 +52,6 @@
 
 public class OpenBTree 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/*
 	** Fields of OpenBTree
 	*/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/SearchParameters.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/SearchParameters.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/SearchParameters.java	Thu Nov 11 12:05:39 2004
@@ -33,11 +33,6 @@
 
 public class SearchParameters
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
     /**
      * Position on key just left of a sequence of partial key matches.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/WaitError.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/WaitError.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/WaitError.java	Thu Nov 11 12:05:39 2004
@@ -19,8 +19,4 @@
 
 public class WaitError extends Throwable
 {
-	/**
-		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/store/access/btree/index/B2I.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java	Thu Nov 11 12:05:39 2004
@@ -120,11 +120,6 @@
 
 public class B2I extends BTree
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
     public    static final String PROPERTY_BASECONGLOMID = "baseConglomerateId";
     public    static final String PROPERTY_ROWLOCCOLUMN  = "rowLocationColumn";
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IController.java	Thu Nov 11 12:05:39 2004
@@ -45,10 +45,6 @@
 
 public class B2IController extends BTreeController
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/*
 	** Fields of B2IController.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2ICostController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2ICostController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2ICostController.java	Thu Nov 11 12:05:39 2004
@@ -35,10 +35,6 @@
 
 public class B2ICostController extends BTreeCostController
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/*
 	** Fields of B2IController.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IFactory.java	Thu Nov 11 12:05:39 2004
@@ -66,10 +66,6 @@
 
 public class B2IFactory implements ConglomerateFactory, ModuleControl
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	private static final String IMPLEMENTATIONID = "BTREE";
 	private static final String FORMATUUIDSTRING = "C6CEEEF0-DAD3-11d0-BB01-0060973F0942";

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IForwardScan.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IForwardScan.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IForwardScan.java	Thu Nov 11 12:05:39 2004
@@ -48,10 +48,6 @@
 
 public class B2IForwardScan extends BTreeForwardScan
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	/*
 	** Fields of B2IForwardScan.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IMaxScan.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IMaxScan.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IMaxScan.java	Thu Nov 11 12:05:39 2004
@@ -46,11 +46,6 @@
 
 public class B2IMaxScan extends BTreeMaxScan
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	/*
 	** Fields of B2IMaxScan.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2INoLocking.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2INoLocking.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2INoLocking.java	Thu Nov 11 12:05:39 2004
@@ -40,11 +40,6 @@
 
 public class B2INoLocking implements BTreeLockingPolicy
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
     /**************************************************************************
      * Constructors for This class:

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking1.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking1.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking1.java	Thu Nov 11 12:05:39 2004
@@ -54,12 +54,6 @@
      * Fields of the class
      **************************************************************************
      */
-	/**
-		IBM Copyright &copy notice.
-	*/
-
-
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
 
     /**************************************************************************
      * Constructors for This class:

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking2.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking2.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking2.java	Thu Nov 11 12:05:39 2004
@@ -41,11 +41,6 @@
 
 class B2IRowLocking2 extends B2IRowLockingRR implements BTreeLockingPolicy
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
     /**************************************************************************
      * Constructors for This class:

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking3.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking3.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking3.java	Thu Nov 11 12:05:39 2004
@@ -45,11 +45,6 @@
 
 class B2IRowLocking3 implements BTreeLockingPolicy
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
     /**************************************************************************
      * Private/Protected fields of This class:

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLockingRR.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLockingRR.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLockingRR.java	Thu Nov 11 12:05:39 2004
@@ -42,11 +42,6 @@
 
 class B2IRowLockingRR extends B2IRowLocking3 implements BTreeLockingPolicy
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
     /**************************************************************************
      * Constructors for This class:

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IStaticCompiledInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IStaticCompiledInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IStaticCompiledInfo.java	Thu Nov 11 12:05:39 2004
@@ -44,11 +44,6 @@
 
 public class B2IStaticCompiledInfo implements StaticCompiledOpenConglomInfo
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
     /**************************************************************************
      * Fields of the class 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2ITableLocking3.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2ITableLocking3.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2ITableLocking3.java	Thu Nov 11 12:05:39 2004
@@ -36,10 +36,6 @@
 
 class B2ITableLocking3 extends B2INoLocking
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
     /**************************************************************************
      * Constructors for This class:
      **************************************************************************

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IUndo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IUndo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IUndo.java	Thu Nov 11 12:05:39 2004
@@ -85,10 +85,6 @@
 public class B2IUndo implements LogicalUndo, Formatable
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	 * Find the page and record to undo.  If no logical undo is necessary,
 	 * i.e., row has not moved, then just return the latched page where undo
 	 * should go.  If the record has moved, it has a new recordId on the new

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/D_B2IController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/D_B2IController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/D_B2IController.java	Thu Nov 11 12:05:39 2004
@@ -15,8 +15,4 @@
 
 public class D_B2IController extends D_BTreeController
 {
-	/**
-		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/store/access/conglomerate/BinaryOrderableWrapper.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/BinaryOrderableWrapper.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/BinaryOrderableWrapper.java	Thu Nov 11 12:05:39 2004
@@ -36,11 +36,6 @@
 
 class BinaryOrderableWrapper implements Storable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
     BinaryOrderable    ref_object; 
     BinaryOrderable    other_object;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/ConglomerateUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/ConglomerateUtil.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/ConglomerateUtil.java	Thu Nov 11 12:05:39 2004
@@ -47,11 +47,6 @@
  **/
 public final class ConglomerateUtil
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
     /* Public Methods of This class: (arranged Alphabetically ) */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerate.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerate.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerate.java	Thu Nov 11 12:05:39 2004
@@ -36,10 +36,6 @@
 public abstract class GenericConglomerate 
     extends DataType implements Conglomerate
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
 
     /**************************************************************************
      * Public Methods implementing DataValueDescriptor interface.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerateController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerateController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerateController.java	Thu Nov 11 12:05:39 2004
@@ -47,11 +47,6 @@
 public abstract class GenericConglomerateController 
     extends GenericController implements ConglomerateController
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
     /**************************************************************************
      * Fields of the class

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericController.java	Thu Nov 11 12:05:39 2004
@@ -43,10 +43,6 @@
 
 public abstract class GenericController 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
     /**************************************************************************
      * Fields of the class
      **************************************************************************

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericCostController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericCostController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericCostController.java	Thu Nov 11 12:05:39 2004
@@ -34,11 +34,6 @@
 public class GenericCostController 
     extends GenericController implements StoreCostController
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
     /**************************************************************************
      * Fields of the class

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericScanController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericScanController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericScanController.java	Thu Nov 11 12:05:39 2004
@@ -102,11 +102,6 @@
 public abstract class GenericScanController 
     extends GenericController implements ScanManager
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
     /**************************************************************************
      * Constants of the class

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerate.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerate.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerate.java	Thu Nov 11 12:05:39 2004
@@ -54,10 +54,6 @@
 
 public abstract class OpenConglomerate
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
     /**************************************************************************
      * Fields of the class
      **************************************************************************

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerateScratchSpace.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerateScratchSpace.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerateScratchSpace.java	Thu Nov 11 12:05:39 2004
@@ -30,11 +30,6 @@
 public class OpenConglomerateScratchSpace 
     implements DynamicCompiledOpenConglomInfo
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
     /**************************************************************************
      * Fields of the class

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/QualifierUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/QualifierUtil.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/QualifierUtil.java	Thu Nov 11 12:05:39 2004
@@ -16,10 +16,6 @@
 
 public class QualifierUtil implements Qualifier 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
     private int                 column_id;
     private DataValueDescriptor key_val;
     private int                 operator;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/RowPosition.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/RowPosition.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/RowPosition.java	Thu Nov 11 12:05:39 2004
@@ -24,10 +24,6 @@
 
 public class RowPosition
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
     /**************************************************************************
      * Fields of the class
      **************************************************************************

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/TemplateRow.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/TemplateRow.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/TemplateRow.java	Thu Nov 11 12:05:39 2004
@@ -27,10 +27,6 @@
 
 public final class TemplateRow
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/*
 	** Constructors of TemplateRow

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/D_HeapController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/D_HeapController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/D_HeapController.java	Thu Nov 11 12:05:39 2004
@@ -32,10 +32,6 @@
 
 class TableStats
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
     public int num_pages          = 0; // number of pages in heap.
     public int num_overflow_pgs   = 0; // number of overflow pages heap.
     public int num_entries        = 0; // number recs on page

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java	Thu Nov 11 12:05:39 2004
@@ -118,11 +118,6 @@
     extends    GenericConglomerate
     implements Conglomerate, StaticCompiledOpenConglomInfo
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/*
 	** Fields of Heap.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapClassInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapClassInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapClassInfo.java	Thu Nov 11 12:05:39 2004
@@ -13,10 +13,6 @@
 import org.apache.derby.iapi.services.io.FormatableInstanceGetter;
 
 public class HeapClassInfo extends FormatableInstanceGetter {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 	// only supports a single class at the moment
 	public Object getNewInstance() {

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapConglomerateFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapConglomerateFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapConglomerateFactory.java	Thu Nov 11 12:05:39 2004
@@ -56,10 +56,6 @@
 
 public class HeapConglomerateFactory implements ConglomerateFactory, ModuleControl, ModuleSupportable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	// RESOLVE (mikem) (STO062) 
     // The heap implementation id should be "heap table".

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapController.java	Thu Nov 11 12:05:39 2004
@@ -48,10 +48,6 @@
     extends GenericConglomerateController 
     implements ConglomerateController
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
     /**************************************************************************
      * Fields of the class
      **************************************************************************

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapCostController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapCostController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapCostController.java	Thu Nov 11 12:05:39 2004
@@ -68,10 +68,6 @@
 public class HeapCostController 
     extends GenericCostController implements StoreCostController
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
     /**
      * Only lookup these estimates from raw store once.
      **/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapPostCommit.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapPostCommit.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapPostCommit.java	Thu Nov 11 12:05:39 2004
@@ -61,10 +61,6 @@
 
 class HeapPostCommit implements Serviceable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
     /**************************************************************************
      * Fields of the class
      **************************************************************************

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapRowLocation.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapRowLocation.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapRowLocation.java	Thu Nov 11 12:05:39 2004
@@ -66,10 +66,6 @@
 public class HeapRowLocation extends DataType implements RowLocation
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	The HeapRowLocation simply maintains a raw store record handle.
 	**/
     private long         pageno;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapScan.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapScan.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapScan.java	Thu Nov 11 12:05:39 2004
@@ -60,11 +60,6 @@
 class HeapScan 
     extends GenericScanController implements ScanManager
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
     /**************************************************************************
      * Constants of HeapScan

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapScanInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapScanInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapScanInfo.java	Thu Nov 11 12:05:39 2004
@@ -32,10 +32,6 @@
 **/
 class HeapScanInfo implements ScanInfo
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
     /**
      * Performance counters ...
      */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/OpenHeap.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/OpenHeap.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/OpenHeap.java	Thu Nov 11 12:05:39 2004
@@ -24,10 +24,6 @@
 
 class OpenHeap extends OpenConglomerate
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
     /**************************************************************************
      * Fields of the class
      **************************************************************************

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/ExternalSortFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/ExternalSortFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/ExternalSortFactory.java	Thu Nov 11 12:05:39 2004
@@ -42,10 +42,6 @@
 public class ExternalSortFactory implements 
     SortFactory, ModuleControl, ModuleSupportable, SortCostController
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	private boolean userSpecified; // did the user specify sortBufferMax
 	private int defaultSortBufferMax; 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeInserter.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeInserter.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeInserter.java	Thu Nov 11 12:05:39 2004
@@ -35,10 +35,6 @@
 public final class MergeInserter implements SortController
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	The sort this inserter is for.
 	**/
 	protected MergeSort sort = null;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeScan.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeScan.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeScan.java	Thu Nov 11 12:05:39 2004
@@ -34,10 +34,6 @@
 public class MergeScan extends SortScan
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	The sort buffer we will use.
 	**/
 	protected SortBuffer sortBuffer;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeScanRowSource.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeScanRowSource.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeScanRowSource.java	Thu Nov 11 12:05:39 2004
@@ -39,10 +39,6 @@
 */
 public class MergeScanRowSource extends MergeScan implements ScanControllerRowSource
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
     /* Constructors for This class: */
 	MergeScanRowSource(

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeSort.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeSort.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeSort.java	Thu Nov 11 12:05:39 2004
@@ -54,10 +54,6 @@
 
 public final class MergeSort implements Sort
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/*
 	 * Fields

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeSortInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeSortInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeSortInfo.java	Thu Nov 11 12:05:39 2004
@@ -33,10 +33,6 @@
 **/
 class MergeSortInfo implements SortInfo
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
     /**
      * Performance counters ...
      */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/Node.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/Node.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/Node.java	Thu Nov 11 12:05:39 2004
@@ -22,10 +22,6 @@
 
 final class Node
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	public int balance;
 	public Node leftLink;
 	public Node rightLink;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/NodeAllocator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/NodeAllocator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/NodeAllocator.java	Thu Nov 11 12:05:39 2004
@@ -18,10 +18,6 @@
 
 final class NodeAllocator
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	private static final int DEFAULT_INIT_SIZE = 128;
 	private static final int GROWTH_MULTIPLIER = 2;
 	private static final int DEFAULT_MAX_SIZE = 1024;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/Scan.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/Scan.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/Scan.java	Thu Nov 11 12:05:39 2004
@@ -45,10 +45,6 @@
 
 public abstract class Scan implements ScanManager, ScanInfo
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/*
 	 * Methods of ScanController
 	 */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortBuffer.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortBuffer.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortBuffer.java	Thu Nov 11 12:05:39 2004
@@ -32,10 +32,6 @@
 class SortBuffer
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	Returned from insert when the row was inserted
 	without incident.
 	**/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortBufferRowSource.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortBufferRowSource.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortBufferRowSource.java	Thu Nov 11 12:05:39 2004
@@ -36,10 +36,6 @@
 		implements ScanControllerRowSource
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	The Sort buffer where rows come from
 	**/
 	SortBuffer sortBuffer = null;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortBufferScan.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortBufferScan.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortBufferScan.java	Thu Nov 11 12:05:39 2004
@@ -25,10 +25,6 @@
 public class SortBufferScan extends SortScan
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	The sorter we're returning rows from.
 	**/
 	protected SortBuffer sortBuffer;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortScan.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortScan.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortScan.java	Thu Nov 11 12:05:39 2004
@@ -34,11 +34,6 @@
 
 public abstract class SortScan extends Scan
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/**
 	The sort that this class is scanning.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/FileLogger.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/FileLogger.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/FileLogger.java	Thu Nov 11 12:05:39 2004
@@ -103,10 +103,6 @@
 */
 
 public class FileLogger implements Logger {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	private LogRecord		 logRecord;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/FlushedScan.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/FlushedScan.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/FlushedScan.java	Thu Nov 11 12:05:39 2004
@@ -44,10 +44,6 @@
 
 */
 public class FlushedScan implements StreamLogScan {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	private StorageRandomAccessFile scan;		// an output stream to the log file
 	LogToFile logFactory; 				// log factory knows how to to skip

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogCounter.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogCounter.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogCounter.java	Thu Nov 11 12:05:39 2004
@@ -33,10 +33,6 @@
 
 */
 public class LogCounter implements LogInstant {
-	/**
-		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/store/raw/log/LogRecord.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogRecord.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogRecord.java	Thu Nov 11 12:05:39 2004
@@ -56,10 +56,6 @@
 
 */
 public class LogRecord implements Formatable {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	private TransactionId	xactId;	// the transaction Id
 	private Loggable		op;		// the loggable

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/BeginXact.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/BeginXact.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/BeginXact.java	Thu Nov 11 12:05:39 2004
@@ -36,10 +36,6 @@
 */
 
 public class BeginXact implements Loggable {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	protected int transactionStatus;
 	protected GlobalTransactionId xactId;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/ContainerLocking2.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/ContainerLocking2.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/ContainerLocking2.java	Thu Nov 11 12:05:39 2004
@@ -27,10 +27,6 @@
 	@see org.apache.derby.iapi.store.raw.LockingPolicy
 */
 public class ContainerLocking2 extends NoLocking {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	private final LockFactory	lf;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/ContainerLocking3.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/ContainerLocking3.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/ContainerLocking3.java	Thu Nov 11 12:05:39 2004
@@ -27,10 +27,6 @@
 	@see org.apache.derby.iapi.store.raw.LockingPolicy
 */
 public class ContainerLocking3 extends NoLocking {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	protected final LockFactory	lf;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/D_Xact.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/D_Xact.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/D_Xact.java	Thu Nov 11 12:05:39 2004
@@ -25,10 +25,6 @@
 
 public class D_Xact extends DiagnosticableGeneric
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
     /**
      * Default implementation of diagnostic on the object.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/EndXact.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/EndXact.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/EndXact.java	Thu Nov 11 12:05:39 2004
@@ -37,10 +37,6 @@
 */
 
 public class EndXact implements Loggable {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	private int transactionStatus;
 	private GlobalTransactionId xactId;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/EscalateContainerKey.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/EscalateContainerKey.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/EscalateContainerKey.java	Thu Nov 11 12:05:39 2004
@@ -17,10 +17,6 @@
 
 public final class EscalateContainerKey implements Matchable
 {
-    /**
-       IBM Copyright &copy notice.
-    */
-    public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
 
     /**************************************************************************
      * Fields of the class

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/GlobalXactId.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/GlobalXactId.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/GlobalXactId.java	Thu Nov 11 12:05:39 2004
@@ -27,10 +27,6 @@
 
 public class GlobalXactId extends GlobalXact implements GlobalTransactionId
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
     /**************************************************************************
      * Private Fields of the class
      **************************************************************************

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/InternalXact.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/InternalXact.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/InternalXact.java	Thu Nov 11 12:05:39 2004
@@ -31,10 +31,6 @@
 */
 public class InternalXact extends Xact  
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/*
 	** Constructor

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/NoLocking.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/NoLocking.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/NoLocking.java	Thu Nov 11 12:05:39 2004
@@ -26,10 +26,6 @@
 	@see LockingPolicy
 */
 class NoLocking implements LockingPolicy {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	protected NoLocking() {
 	}

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking1.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking1.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking1.java	Thu Nov 11 12:05:39 2004
@@ -53,11 +53,6 @@
 */
 public class RowLocking1 extends RowLocking2
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	protected RowLocking1(LockFactory lf) 
     {

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking2.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking2.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking2.java	Thu Nov 11 12:05:39 2004
@@ -42,10 +42,6 @@
 */
 public class RowLocking2 extends RowLockingRR
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	// no locking has no state, so it's safe to hold
 	// it as a static
 	private static final LockingPolicy NO_LOCK = new NoLocking();

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking2nohold.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking2nohold.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking2nohold.java	Thu Nov 11 12:05:39 2004
@@ -38,10 +38,6 @@
 */
 public class RowLocking2nohold extends RowLocking2
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	protected RowLocking2nohold(LockFactory lf) 
     {
 		super(lf);

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking3.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking3.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking3.java	Thu Nov 11 12:05:39 2004
@@ -33,10 +33,6 @@
 */
 public class RowLocking3 extends NoLocking 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	// no locking has no state, so it's safe to hold
 	// it as a static
 	private static final LockingPolicy NO_LOCK = new NoLocking();

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking3Escalate.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking3Escalate.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking3Escalate.java	Thu Nov 11 12:05:39 2004
@@ -30,10 +30,6 @@
 */
 public class RowLocking3Escalate extends ContainerLocking3 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	protected RowLocking3Escalate(LockFactory lf) 
     {
 		super(lf);

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLockingRR.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLockingRR.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLockingRR.java	Thu Nov 11 12:05:39 2004
@@ -36,11 +36,6 @@
 */
 public class RowLockingRR extends RowLocking3 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
     protected RowLockingRR(LockFactory lf)
     {

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/SavePoint.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/SavePoint.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/SavePoint.java	Thu Nov 11 12:05:39 2004
@@ -16,10 +16,6 @@
 
 class SavePoint
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/*
 	** Fields
 	*/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTable.java	Thu Nov 11 12:05:39 2004
@@ -76,10 +76,6 @@
 
 public class TransactionTable implements Formatable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/*
 	 * Fields
 	 */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTableEntry.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTableEntry.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTableEntry.java	Thu Nov 11 12:05:39 2004
@@ -42,10 +42,6 @@
 
 public class TransactionTableEntry implements Formatable, TransactionInfo, Cloneable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	// These fields are only populated if this TTE has been read in from the
 	// log.  Otherwise, they are gotten from the transaction object myxact.
 	private TransactionId           xid;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/Xact.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/Xact.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/Xact.java	Thu Nov 11 12:05:39 2004
@@ -85,10 +85,6 @@
 
 */
 public class Xact extends RawTransaction implements Limit  {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/*
 	** Static Fields

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactContext.java	Thu Nov 11 12:05:39 2004
@@ -30,10 +30,6 @@
 
 */
 public class XactContext extends ContextImpl {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	private		RawTransaction	xact;
 	private     RawStoreFactory factory;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactFactory.java	Thu Nov 11 12:05:39 2004
@@ -59,10 +59,6 @@
 
 public class XactFactory implements TransactionFactory, ModuleControl, ModuleSupportable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	protected static final String USER_CONTEXT_ID        = "UserTransaction";
 	protected static final String NESTED_READONLY_USER_CONTEXT_ID = 
         "NestedRawReadOnlyUserTransaction";

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactId.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactId.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactId.java	Thu Nov 11 12:05:39 2004
@@ -38,10 +38,6 @@
 */
 public class XactId implements TransactionId
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/*
 	** Fields
 	*/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactXAResourceManager.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactXAResourceManager.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactXAResourceManager.java	Thu Nov 11 12:05:39 2004
@@ -67,10 +67,6 @@
 
 public class XactXAResourceManager implements XAResourceManager
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
     /**************************************************************************
      * Fields of the class
      **************************************************************************

Mime
View raw message