The ByteHolder must be in writing mode to call this. Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ByteHolderInputStream.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ByteHolderInputStream.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ByteHolderInputStream.java Thu Nov 11 12:07:07 2004 @@ -16,10 +16,6 @@ public class ByteHolderInputStream extends InputStream { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004; protected ByteHolder bh; public ByteHolderInputStream(ByteHolder bh) { Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java Thu Nov 11 12:07:07 2004 @@ -44,10 +44,6 @@ public abstract class CachedPage extends BasePage implements Cacheable { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004; protected boolean alreadyReadPage; // set to true when the page was read by another class protected byte[] pageData; // the actual page data - this is Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ChainAllocPageOperation.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ChainAllocPageOperation.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ChainAllocPageOperation.java Thu Nov 11 12:07:07 2004 @@ -35,10 +35,6 @@ // Allocation page operation - to allocate, deallocate or free a page public final class ChainAllocPageOperation extends PhysicalPageOperation { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004; protected long newAllocPageNum; // the next alloc page's page number protected long newAllocPageOffset; // the next alloc page's page offset Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ContainerActionOnCommit.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ContainerActionOnCommit.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ContainerActionOnCommit.java Thu Nov 11 12:07:07 2004 @@ -21,10 +21,6 @@ */ abstract class ContainerActionOnCommit implements Observer { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004; protected ContainerKey identity; Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ContainerBasicOperation.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ContainerBasicOperation.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ContainerBasicOperation.java Thu Nov 11 12:07:07 2004 @@ -40,10 +40,6 @@ public abstract class ContainerBasicOperation implements Loggable { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004; /* page info this operation changed */ private long containerVersion; protected ContainerKey containerId; Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ContainerHandleActionOnCommit.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ContainerHandleActionOnCommit.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ContainerHandleActionOnCommit.java Thu Nov 11 12:07:07 2004 @@ -35,10 +35,6 @@ */ public abstract class ContainerHandleActionOnCommit extends ContainerActionOnCommit { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004; public ContainerHandleActionOnCommit(ContainerKey identity) { Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ContainerOperation.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ContainerOperation.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ContainerOperation.java Thu Nov 11 12:07:07 2004 @@ -58,10 +58,6 @@ */ public class ContainerOperation extends ContainerBasicOperation implements Undoable { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004; protected byte operation; // create, drop, or remove // in previous version of contianerOperation, there may not Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ContainerUndoOperation.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ContainerUndoOperation.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ContainerUndoOperation.java Thu Nov 11 12:07:07 2004 @@ -35,10 +35,6 @@ public class ContainerUndoOperation extends ContainerBasicOperation implements Compensation { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004; // the operation to rollback transient private ContainerOperation undoOp; Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CopyRowsOperation.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CopyRowsOperation.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CopyRowsOperation.java Thu Nov 11 12:07:07 2004 @@ -59,10 +59,6 @@ */ public class CopyRowsOperation extends PhysicalPageOperation { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004; protected int num_rows; protected int destSlot; // copy into this page starting from destSlot Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/D_BaseContainerHandle.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/D_BaseContainerHandle.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/D_BaseContainerHandle.java Thu Nov 11 12:07:07 2004 @@ -31,10 +31,6 @@ public class D_BaseContainerHandle extends DiagnosticableGeneric { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004; /** * Return string identifying the underlying container. Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/D_DiagnosticUtil.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/D_DiagnosticUtil.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/D_DiagnosticUtil.java Thu Nov 11 12:07:07 2004 @@ -43,10 +43,6 @@ public class D_DiagnosticUtil { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004; /* Constructors for This class: */ Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/D_RecordId.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/D_RecordId.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/D_RecordId.java Thu Nov 11 12:07:07 2004 @@ -30,10 +30,6 @@ public class D_RecordId extends DiagnosticableGeneric { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004; /** * Return string identifying the underlying container. Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/D_StoredPage.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/D_StoredPage.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/D_StoredPage.java Thu Nov 11 12:07:07 2004 @@ -44,10 +44,6 @@ public class D_StoredPage implements Diagnosticable { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004; protected StoredPage page; public D_StoredPage() Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/DecryptInputStream.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/DecryptInputStream.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/DecryptInputStream.java Thu Nov 11 12:07:07 2004 @@ -24,10 +24,6 @@ stream of bytes. */ public class DecryptInputStream extends BufferedByteHolderInputStream { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004; // if database is encrypted, bytes to reserve at the beginning of the buffer //protected static final int ENCRYPTION_RESERVE = dataFactory.getEncryptionBlockSize() - 1; Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/DeleteOperation.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/DeleteOperation.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/DeleteOperation.java Thu Nov 11 12:07:07 2004 @@ -66,11 +66,6 @@ */ public final class DeleteOperation extends LogicalPageOperation { - /** - IBM Copyright © notice. - */ - - private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004; protected int doMeSlot; // delete slot - only valid during a doMe() operation protected boolean delete; // set record as deleted if true, undeleted if false Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/DirectActions.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/DirectActions.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/DirectActions.java Thu Nov 11 12:07:07 2004 @@ -36,12 +36,6 @@ public class DirectActions implements PageActions { - /** - IBM Copyright © notice. - */ - - - private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004; protected DynamicByteArrayOutputStream outBytes; protected ArrayInputStream limitIn; Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/DirectAllocActions.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/DirectAllocActions.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/DirectAllocActions.java Thu Nov 11 12:07:07 2004 @@ -23,10 +23,6 @@ import org.apache.derby.iapi.error.StandardException; public class DirectAllocActions implements AllocationActions { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004; public DirectAllocActions() { } Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/DropOnCommit.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/DropOnCommit.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/DropOnCommit.java Thu Nov 11 12:07:07 2004 @@ -37,10 +37,6 @@ */ public class DropOnCommit extends ContainerActionOnCommit { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004; protected boolean isStreamContainer = false; Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java Thu Nov 11 12:07:07 2004 @@ -74,11 +74,6 @@ public abstract class FileContainer extends BaseContainer implements Cacheable, TypedFormat { - /** - IBM Copyright © notice. - */ - - private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004; /* * typed format Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InitPageOperation.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InitPageOperation.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InitPageOperation.java Thu Nov 11 12:07:07 2004 @@ -54,10 +54,6 @@ */ public final class InitPageOperation extends PhysicalPageOperation { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004; protected int nextRecordId; // next recordId protected int initFlag; protected int pageFormatId; Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InputStreamContainer.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InputStreamContainer.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InputStreamContainer.java Thu Nov 11 12:07:07 2004 @@ -35,10 +35,6 @@ */ public class InputStreamContainer extends FileContainer { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004; private StorageFile containerPath; Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InsertOperation.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InsertOperation.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InsertOperation.java Thu Nov 11 12:07:07 2004 @@ -67,11 +67,6 @@ */ public final class InsertOperation extends LogicalPageOperation { - /** - IBM Copyright © notice. - */ - - private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004; protected int doMeSlot; // insert slot - only valid during doMe() protected byte insertFlag; // see page insertFlag Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InvalidatePageOperation.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InvalidatePageOperation.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InvalidatePageOperation.java Thu Nov 11 12:07:07 2004 @@ -48,10 +48,6 @@ */ public final class InvalidatePageOperation extends PhysicalPageOperation { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004; public InvalidatePageOperation(BasePage page) { super(page); Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LoggableActions.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LoggableActions.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LoggableActions.java Thu Nov 11 12:07:07 2004 @@ -35,11 +35,6 @@ public class LoggableActions implements PageActions { - /** - IBM Copyright © notice. - */ - - private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004; public void actionDelete( Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LoggableAllocActions.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LoggableAllocActions.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LoggableAllocActions.java Thu Nov 11 12:07:07 2004 @@ -23,10 +23,6 @@ import org.apache.derby.iapi.error.StandardException; public class LoggableAllocActions implements AllocationActions { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004; /** Set the allocation status of pageNumber to doStatus. To undo this Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LogicalPageOperation.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LogicalPageOperation.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LogicalPageOperation.java Thu Nov 11 12:07:07 2004 @@ -63,11 +63,6 @@ public abstract class LogicalPageOperation extends PageBasicOperation implements LogicalUndoable { - /** - IBM Copyright © notice. - */ - - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004; protected LogicalUndo undo; // Callback to access for logical undo. // If non-null, then logical undo is necessary Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LogicalUndoOperation.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LogicalUndoOperation.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LogicalUndoOperation.java Thu Nov 11 12:07:07 2004 @@ -57,10 +57,6 @@ */ public class LogicalUndoOperation extends PageBasicOperation implements Compensation { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004; protected int recordId; // the record id to call undoOp.undoMe with Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LongColumnException.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LongColumnException.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LongColumnException.java Thu Nov 11 12:07:07 2004 @@ -22,11 +22,6 @@ */ public class LongColumnException extends StandardException { - /** - IBM Copyright © notice. - */ - - private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004; // YYZ? may need to make it a DynamicByteArrayOutputStream, or a ByteArray protected DynamicByteArrayOutputStream logBuffer; Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/MemByteHolder.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/MemByteHolder.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/MemByteHolder.java Thu Nov 11 12:07:07 2004 @@ -23,10 +23,6 @@ public class MemByteHolder implements ByteHolder { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004; int bufSize; boolean writing = true; Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/NoSpaceOnPage.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/NoSpaceOnPage.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/NoSpaceOnPage.java Thu Nov 11 12:07:07 2004 @@ -18,10 +18,6 @@ various layers of software. */ class NoSpaceOnPage extends StandardException { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004; private final boolean onOverflowPage; Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/OverflowInputStream.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/OverflowInputStream.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/OverflowInputStream.java Thu Nov 11 12:07:07 2004 @@ -29,10 +29,6 @@ extends BufferedByteHolderInputStream implements Resetable { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004; protected BaseContainerHandle owner; protected long overflowPage; protected int overflowId; Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PageActions.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PageActions.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PageActions.java Thu Nov 11 12:07:07 2004 @@ -25,12 +25,6 @@ public interface PageActions { - /** - IBM Copyright © notice. - */ - - - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004; /** * Set the Delete status of the record at the given slot. Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PageBasicOperation.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PageBasicOperation.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PageBasicOperation.java Thu Nov 11 12:07:07 2004 @@ -70,11 +70,6 @@ public abstract class PageBasicOperation implements Loggable, RePreparable { - /** - IBM Copyright © notice. - */ - - private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004; /* page info this operation changed */ Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PageVersion.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PageVersion.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PageVersion.java Thu Nov 11 12:07:07 2004 @@ -18,10 +18,6 @@ public class PageVersion implements PageTimeStamp { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004; private long pageNumber; private long pageVersion; Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PhysicalPageOperation.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PhysicalPageOperation.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PhysicalPageOperation.java Thu Nov 11 12:07:07 2004 @@ -47,10 +47,6 @@ public abstract class PhysicalPageOperation extends PageBasicOperation implements Undoable { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004; protected PhysicalPageOperation(BasePage page) { super(page); Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PhysicalUndoOperation.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PhysicalUndoOperation.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PhysicalUndoOperation.java Thu Nov 11 12:07:07 2004 @@ -52,10 +52,6 @@ */ public class PhysicalUndoOperation extends PageBasicOperation implements Compensation { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004; /** The operation to be rolled back */ transient private PhysicalPageOperation undoOp; Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PurgeOperation.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PurgeOperation.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PurgeOperation.java Thu Nov 11 12:07:07 2004 @@ -64,10 +64,6 @@ @see Page#purgeAtSlot */ public final class PurgeOperation extends PhysicalPageOperation { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004; protected int slot; // purge num_rows records starting at this slot // caller must guarentee that during undo of the Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RAFContainer.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RAFContainer.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RAFContainer.java Thu Nov 11 12:07:07 2004 @@ -52,10 +52,6 @@ public class RAFContainer extends FileContainer implements PrivilegedExceptionAction { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004; /* * Immutable fields Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RFResource.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RFResource.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RFResource.java Thu Nov 11 12:07:07 2004 @@ -33,10 +33,6 @@ import java.io.IOException; public class RFResource implements FileResource { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004; protected final BaseDataFileFactory factory; Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RawField.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RawField.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RawField.java Thu Nov 11 12:07:07 2004 @@ -11,10 +11,6 @@ package org.apache.derby.impl.store.raw.data; public class RawField { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004; private byte[] data; Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ReclaimSpace.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ReclaimSpace.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ReclaimSpace.java Thu Nov 11 12:07:07 2004 @@ -31,10 +31,6 @@ */ public final class ReclaimSpace implements Serviceable { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004; private boolean serviceASAP; private ContainerKey containerId; Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ReclaimSpaceHelper.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ReclaimSpaceHelper.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ReclaimSpaceHelper.java Thu Nov 11 12:07:07 2004 @@ -207,10 +207,6 @@ public class ReclaimSpaceHelper { /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004; - /** Reclaim space based on work. */ public static int reclaimSpace(BaseDataFileFactory dataFactory, Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RecordId.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RecordId.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RecordId.java Thu Nov 11 12:07:07 2004 @@ -34,10 +34,6 @@ */ public final class RecordId implements RecordHandle { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004; /** Page the record lives in. Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RememberBytesInputStream.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RememberBytesInputStream.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RememberBytesInputStream.java Thu Nov 11 12:07:07 2004 @@ -32,10 +32,6 @@ */ public class RememberBytesInputStream extends FilterInputStream { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004; ByteHolder bh; boolean recording = true; Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RemoveFileOperation.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RemoveFileOperation.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RemoveFileOperation.java Thu Nov 11 12:07:07 2004 @@ -39,10 +39,6 @@ public class RemoveFileOperation implements Undoable { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004; private String name; private long generationId; private boolean removeAtOnce; Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/SetReservedSpaceOperation.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/SetReservedSpaceOperation.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/SetReservedSpaceOperation.java Thu Nov 11 12:07:07 2004 @@ -42,10 +42,6 @@ This operation is not undoable. */ public class SetReservedSpaceOperation extends PageBasicOperation { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004; protected int doMeSlot; // slot where record is at protected int recordId; // recordId Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/SpaceInformation.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/SpaceInformation.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/SpaceInformation.java Thu Nov 11 12:07:07 2004 @@ -21,11 +21,6 @@ public class SpaceInformation implements SpaceInfo { - /** - IBM Copyright © notice. - */ - - private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004; private long numAllocatedPages; private long numFreePages; Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredFieldHeader.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredFieldHeader.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredFieldHeader.java Thu Nov 11 12:07:07 2004 @@ -102,11 +102,6 @@ */ public final class StoredFieldHeader { - /** - IBM Copyright © notice. - */ - - private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004; /************************************************************************** * Constants of the class Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java Thu Nov 11 12:07:07 2004 @@ -219,8 +219,6 @@ ************************************************************************** */ - private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004; - /* * typed format */ Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredRecordHeader.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredRecordHeader.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredRecordHeader.java Thu Nov 11 12:07:07 2004 @@ -46,11 +46,6 @@ public final class StoredRecordHeader { - /** - IBM Copyright © notice. - */ - - private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004; /************************************************************************** * Constants of the class Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java Thu Nov 11 12:07:07 2004 @@ -76,11 +76,6 @@ public class StreamFileContainer implements TypedFormat { - /** - IBM Copyright © notice. - */ - - private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004; /************************************************************************** * Constant Fields of the class Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainerHandle.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainerHandle.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainerHandle.java Thu Nov 11 12:07:07 2004 @@ -38,11 +38,6 @@ final class StreamFileContainerHandle implements StreamContainerHandle, Observer { - /** - IBM Copyright © notice. - */ - - private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004; /* ** Fields Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/SyncOnCommit.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/SyncOnCommit.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/SyncOnCommit.java Thu Nov 11 12:07:07 2004 @@ -36,10 +36,6 @@ */ public class SyncOnCommit extends ContainerHandleActionOnCommit { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004; public SyncOnCommit(ContainerKey identity) { Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/TempRAFContainer.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/TempRAFContainer.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/TempRAFContainer.java Thu Nov 11 12:07:07 2004 @@ -39,10 +39,6 @@ file descriptor is never synced */ class TempRAFContainer extends RAFContainer { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004; protected int inUseCount; Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/TruncateOnCommit.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/TruncateOnCommit.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/TruncateOnCommit.java Thu Nov 11 12:07:07 2004 @@ -36,10 +36,6 @@ */ public class TruncateOnCommit extends ContainerHandleActionOnCommit { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004; /** Truncate on a commit as well. Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/UpdateFieldOperation.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/UpdateFieldOperation.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/UpdateFieldOperation.java Thu Nov 11 12:07:07 2004 @@ -67,11 +67,6 @@ */ public final class UpdateFieldOperation extends LogicalPageOperation { - /** - IBM Copyright © notice. - */ - - private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004; protected int doMeSlot; // insert slot - only valid during a doMe() operation protected int fieldId; Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/UpdateOperation.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/UpdateOperation.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/UpdateOperation.java Thu Nov 11 12:07:07 2004 @@ -64,10 +64,6 @@ */ public final class UpdateOperation extends PhysicalPageOperation { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004; protected int doMeSlot; // record slot - only valid during a doMe() operation protected int recordId; // record id Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/CheckpointOperation.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/CheckpointOperation.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/CheckpointOperation.java Thu Nov 11 12:07:07 2004 @@ -42,10 +42,6 @@ public class CheckpointOperation implements Loggable { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004; // redo LWM protected long redoLWM; Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/D_FlushedScan.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/D_FlushedScan.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/D_FlushedScan.java Thu Nov 11 12:07:07 2004 @@ -20,10 +20,6 @@ extends DiagnosticableGeneric { /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004; - /** @exception StandardException Oops. @see Diagnosticable#diag */ Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/D_LogToFile.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/D_LogToFile.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/D_LogToFile.java Thu Nov 11 12:07:07 2004 @@ -20,11 +20,6 @@ public class D_LogToFile extends DiagnosticableGeneric { - /** - IBM Copyright © notice. - */ - - private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004; /** @exception StandardException Oops. Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/FlushedScanHandle.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/FlushedScanHandle.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/FlushedScanHandle.java Thu Nov 11 12:07:07 2004 @@ -31,10 +31,6 @@ public class FlushedScanHandle implements ScanHandle { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004; LogFactory lf; StreamLogScan fs; Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogAccessFile.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogAccessFile.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogAccessFile.java Thu Nov 11 12:07:07 2004 @@ -49,11 +49,6 @@ */ public class LogAccessFile extends OutputStream { - /** - IBM Copyright © notice. - */ - - private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004; /** * The fixed size of a log record is 16 bytes: Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogAccessFileBuffer.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogAccessFileBuffer.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogAccessFileBuffer.java Thu Nov 11 12:07:07 2004 @@ -19,10 +19,6 @@ final class LogAccessFileBuffer { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004; /************************************************************************** Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java Thu Nov 11 12:07:07 2004 @@ -200,11 +200,6 @@ public class LogToFile implements LogFactory, ModuleControl, ModuleSupportable, Serviceable, java.security.PrivilegedExceptionAction { - /** - IBM Copyright © notice. - */ - - private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004; private static int fid = StoredFormatIds.FILE_STREAM_LOG_FILE; Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/ReadOnly.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/ReadOnly.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/ReadOnly.java Thu Nov 11 12:07:07 2004 @@ -53,10 +53,6 @@ */ public class ReadOnly implements LogFactory, ModuleSupportable { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004; private String logArchiveDirectory = null; Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/Scan.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/Scan.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/Scan.java Thu Nov 11 12:07:07 2004 @@ -46,10 +46,6 @@ */ public class Scan implements StreamLogScan { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004; // value for scanDirection public static final byte FORWARD = 1; Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/StreamLogScan.java ============================================================================== --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/StreamLogScan.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/StreamLogScan.java Thu Nov 11 12:07:07 2004 @@ -27,10 +27,6 @@ */ public interface StreamLogScan extends LogScan { - /** - IBM Copyright © notice. - */ - public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004; /** Get the next record in the scan and place its data in the passed in