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 57456 - in incubator/derby/code/trunk/java/engine/org/apache/derby/iapi: sql/dictionary sql/execute store/access store/access/conglomerate store/access/xa store/raw store/raw/data store/raw/log store/raw/xact types util
Date Thu, 11 Nov 2004 18:38:35 GMT
Author: djd
Date: Thu Nov 11 10:38:33 2004
New Revision: 57456

Modified:
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ViewDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/CursorActivation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/CursorResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecAggregator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecCursorTableReference.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecIndexRow.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecPreparedStatement.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecRow.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecutionContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecutionFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecutionStmtValidator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/NoPutResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetStatisticsFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/RowChanger.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/RunTimeStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ScanQualifier.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/TargetResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/TemporaryRowHolder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/TupleFilter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/AccessFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/AccessFactoryGlobals.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/BackingStoreHashtable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/BinaryOrderable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ColumnOrdering.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ConglomPropertyQueryable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ConglomerateController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/DatabaseInstant.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/DynamicCompiledOpenConglomInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/FileResource.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/GenericScanController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/GlobalXact.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/GroupFetchScanController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/KeyHasher.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/Qualifier.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowCountable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowLocationRetRowSource.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowSource.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowUtil.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ScanController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ScanInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SortController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SortCostController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SortInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SortObserver.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SpaceInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/StaticCompiledOpenConglomInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/StoreCostController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/StoreCostResult.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/TransactionController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/TransactionInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/XATransactionController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/Conglomerate.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/ConglomerateFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/LogicalUndo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/MethodFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/ScanControllerRowSource.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/ScanManager.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/Sort.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/SortFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/TransactionManager.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/xa/XAResourceManager.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/xa/XAXactId.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/AuxObject.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Compensation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ContainerHandle.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ContainerKey.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ContainerLock.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Corruptable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/D_ContainerKey.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/D_ContainerLock.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/D_RowLock.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/FetchDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/GlobalTransactionId.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/LockingPolicy.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Loggable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/LogicalUndoable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Page.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/PageKey.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/PageTimeStamp.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RePreparable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RecordHandle.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RowLock.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ScanHandle.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ScannedTransactionHandle.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/StreamContainerHandle.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Transaction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Undoable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/data/DataFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/data/RawContainerHandle.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogInstant.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogScan.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/Logger.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/xact/RawTransaction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/xact/TransactionFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/xact/TransactionId.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/BitDataValue.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/BooleanDataValue.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/CloneableObject.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/ConcatableDataValue.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DTSClassInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataType.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeUtilities.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactoryImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DateTimeDataValue.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DateTimeParser.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/JSQLType.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/Like.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/NumberDataType.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/NumberDataValue.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/Orderable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/RefDataValue.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/Resetable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/RowLocation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBinary.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBit.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBlob.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBoolean.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLChar.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLClob.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDate.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDecimal.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDouble.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLInteger.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLLongVarbit.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLLongint.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLLongvarchar.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNClob.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalChar.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalLongvarchar.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalVarchar.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLReal.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLRef.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLSmallint.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTime.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTimestamp.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTinyint.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLVarbit.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLVarchar.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/StringDataValue.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/TypeId.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/UserDataValue.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/UserType.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/VariableSizeDataValue.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/ByteArray.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/CheapDateFormatter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/DoubleProperties.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/IdUtil.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/JBitSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/Matchable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/Operator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/PropertyUtil.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/ReuseFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/StringUtil.java
Log:
Remove IBM's binary copyright in java files under java/engine/org/apache/derby/iapi

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ViewDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ViewDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ViewDescriptor.java	Thu Nov 11 10:38:33 2004
@@ -48,10 +48,6 @@
 public class ViewDescriptor extends TupleDescriptor
 	implements UniqueTupleDescriptor, Dependent, Provider
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	private int			checkOption;
 	private String		viewName;
 	private String		viewText;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ConstantAction.java	Thu Nov 11 10:38:33 2004
@@ -29,10 +29,6 @@
 
 public interface ConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/* Types of Statistics commands */
 	public static final int STATISTICSTIMING = 1;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/CursorActivation.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/CursorActivation.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/CursorActivation.java	Thu Nov 11 10:38:33 2004
@@ -17,12 +17,7 @@
  *
  * @author ames
  */
-public interface CursorActivation extends Activation { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+public interface CursorActivation extends Activation {
 
 	/**
 	 * Returns the target result set for this activation,

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/CursorResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/CursorResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/CursorResultSet.java	Thu Nov 11 10:38:33 2004
@@ -23,12 +23,7 @@
  *
  * @author ames
  */
-public interface CursorResultSet extends ResultSet { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+public interface CursorResultSet extends ResultSet {
 
 	/**
 	 * Returns the row location of the current base table row of the cursor.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecAggregator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecAggregator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecAggregator.java	Thu Nov 11 10:38:33 2004
@@ -38,10 +38,6 @@
 public interface ExecAggregator extends Formatable
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
-	/**
 	    Set's up the aggregate for processing.
 	 */
 	public void setup(String aggregateName);

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecCursorTableReference.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecCursorTableReference.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecCursorTableReference.java	Thu Nov 11 10:38:33 2004
@@ -21,10 +21,6 @@
 public interface ExecCursorTableReference
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
-	/**
 	 * Return the base name of the table
  	 *
 	 * @return the base name

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecIndexRow.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecIndexRow.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecIndexRow.java	Thu Nov 11 10:38:33 2004
@@ -16,12 +16,7 @@
  *
  * @author jeff after ames
  */
-public interface ExecIndexRow extends ExecRow  { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+public interface ExecIndexRow extends ExecRow  {
 
 	/**
 	 * These two methods are a sort of a hack.  The store implements ordered

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecPreparedStatement.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecPreparedStatement.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecPreparedStatement.java	Thu Nov 11 10:38:33 2004
@@ -26,12 +26,7 @@
  *	@author ames
  */
 public interface ExecPreparedStatement 
-	extends PreparedStatement { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+	extends PreparedStatement {
 
 	/**
 	 * set the statement text

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecRow.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecRow.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecRow.java	Thu Nov 11 10:38:33 2004
@@ -27,12 +27,7 @@
  *
  * @author ames
  */
-public interface ExecRow extends Row { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+public interface ExecRow extends Row {
 
 	/**
 	 * Clone the Row and its contents.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecutionContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecutionContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecutionContext.java	Thu Nov 11 10:38:33 2004
@@ -23,12 +23,7 @@
  *
  * @author ames
  */
-public interface ExecutionContext extends Context { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+public interface ExecutionContext extends Context {
 
 	/**
 	 * this is the ID we expect execution contexts

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecutionFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecutionFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecutionFactory.java	Thu Nov 11 10:38:33 2004
@@ -47,11 +47,6 @@
  */
 public interface ExecutionFactory {
 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-
 		/**
 		Module name for the monitor's module locating system.
 	 */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecutionStmtValidator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecutionStmtValidator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecutionStmtValidator.java	Thu Nov 11 10:38:33 2004
@@ -29,10 +29,6 @@
 public interface ExecutionStmtValidator
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
-	/**
 	 * Validate the statement.
 	 *
 	 * @param constantAction The constant action that we are about to execute.  

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/NoPutResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/NoPutResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/NoPutResultSet.java	Thu Nov 11 10:38:33 2004
@@ -28,10 +28,6 @@
  */
 public interface NoPutResultSet extends ResultSet, RowLocationRetRowSource 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	// method names for use with SQLState.LANG_RESULT_SET_NOT_OPEN exception
 
 	public	static	final	String	ABSOLUTE		=	"absolute";

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetFactory.java	Thu Nov 11 10:38:33 2004
@@ -33,10 +33,6 @@
  */
 public interface ResultSetFactory {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 		Module name for the monitor's module locating system.
 	 */
 	String MODULE = "org.apache.derby.iapi.sql.execute.ResultSetFactory";

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetStatisticsFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetStatisticsFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetStatisticsFactory.java	Thu Nov 11 10:38:33 2004
@@ -28,10 +28,6 @@
 public interface ResultSetStatisticsFactory 
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 		Module name for the monitor's module locating system.
 	 */
 	String MODULE = "org.apache.derby.iapi.sql.execute.ResultSetStatisticsFactory";

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/RowChanger.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/RowChanger.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/RowChanger.java	Thu Nov 11 10:38:33 2004
@@ -28,10 +28,6 @@
 public interface RowChanger
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	  Open this RowChanger.
 
 	  <P>Note to avoid the cost of fixing indexes that do not

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/RunTimeStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/RunTimeStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/RunTimeStatistics.java	Thu Nov 11 10:38:33 2004
@@ -35,10 +35,6 @@
 public interface RunTimeStatistics
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	 * Get the total compile time for the associated query in milliseconds.
 	 * Compile time can be divided into parse, bind, optimize and generate times.
 	 * <P>

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ScanQualifier.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ScanQualifier.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ScanQualifier.java	Thu Nov 11 10:38:33 2004
@@ -23,11 +23,6 @@
 
 public interface ScanQualifier extends Qualifier 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/**
 	 * Set the info in a ScanQualifier

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/TargetResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/TargetResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/TargetResultSet.java	Thu Nov 11 10:38:33 2004
@@ -29,10 +29,6 @@
 public interface TargetResultSet extends ResultSet
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	 * Pass a changed row and the row location for that row
 	 * to the target result set.
 	 *

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/TemporaryRowHolder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/TemporaryRowHolder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/TemporaryRowHolder.java	Thu Nov 11 10:38:33 2004
@@ -28,10 +28,6 @@
 public interface TemporaryRowHolder
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
-	/**
 	 * Insert a row
 	 *
 	 * @param row the row to insert 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/TupleFilter.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/TupleFilter.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/TupleFilter.java	Thu Nov 11 10:38:33 2004
@@ -22,10 +22,6 @@
 public interface TupleFilter
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	  *	Initialize a Filter with a vector of parameters.
 	  *
 	  *	@param	parameters	An ExecRow of parameter values

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/AccessFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/AccessFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/AccessFactory.java	Thu Nov 11 10:38:33 2004
@@ -41,10 +41,6 @@
 public interface AccessFactory
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	 * Used to identify this interface when finding it with the Monitor.
      **/
 	public static final String MODULE = 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/AccessFactoryGlobals.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/AccessFactoryGlobals.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/AccessFactoryGlobals.java	Thu Nov 11 10:38:33 2004
@@ -18,10 +18,6 @@
 
 public interface AccessFactoryGlobals
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
     /**************************************************************************
      * Static constants.
      **************************************************************************

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/BackingStoreHashtable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/BackingStoreHashtable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/BackingStoreHashtable.java	Thu Nov 11 10:38:33 2004
@@ -87,10 +87,6 @@
 
 public class BackingStoreHashtable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public 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/iapi/store/access/BinaryOrderable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/BinaryOrderable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/BinaryOrderable.java	Thu Nov 11 10:38:33 2004
@@ -37,10 +37,6 @@
 public interface BinaryOrderable extends Orderable
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	 * Compare this Orderable with a given Orderable for the purpose of
 	 * index positioning.  This method treats nulls as ordered values -
 	 * that is, it treats SQL null as equal to null and less than all

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ColumnOrdering.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ColumnOrdering.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ColumnOrdering.java	Thu Nov 11 10:38:33 2004
@@ -24,10 +24,6 @@
 
 public interface ColumnOrdering
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	int getColumnId();
 	boolean getIsAscending();
 }

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ConglomPropertyQueryable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ConglomPropertyQueryable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ConglomPropertyQueryable.java	Thu Nov 11 10:38:33 2004
@@ -28,10 +28,6 @@
 
 public interface ConglomPropertyQueryable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
     /**
      * Request the system properties associated with a table. 
      * <p>

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ConglomerateController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ConglomerateController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ConglomerateController.java	Thu Nov 11 10:38:33 2004
@@ -71,10 +71,6 @@
 
 public interface ConglomerateController extends ConglomPropertyQueryable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
     public static final int ROWISDUPLICATE = 1;
 
     /**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/DatabaseInstant.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/DatabaseInstant.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/DatabaseInstant.java	Thu Nov 11 10:38:33 2004
@@ -41,10 +41,6 @@
 public interface DatabaseInstant
 extends Serializable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/**
 	  Return true if this DatabaseInstant is before another

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/DynamicCompiledOpenConglomInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/DynamicCompiledOpenConglomInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/DynamicCompiledOpenConglomInfo.java	Thu Nov 11 10:38:33 2004
@@ -40,8 +40,4 @@
 
 public interface DynamicCompiledOpenConglomInfo
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 }

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/FileResource.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/FileResource.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/FileResource.java	Thu Nov 11 10:38:33 2004
@@ -47,11 +47,6 @@
 	useful when processing old transactions in the stage. 
 */
 public interface FileResource {
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	
 	/**
 	  Add a file resource, copying from the input stream.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/GenericScanController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/GenericScanController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/GenericScanController.java	Thu Nov 11 10:38:33 2004
@@ -47,10 +47,6 @@
 
 public interface GenericScanController extends RowCountable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
     /**
     Close the scan.  This method always succeeds, and never throws
     any exceptions. Callers must not use the scan controller after

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/GlobalXact.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/GlobalXact.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/GlobalXact.java	Thu Nov 11 10:38:33 2004
@@ -30,10 +30,6 @@
 **/
 
 public abstract class GlobalXact {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
     
     /**************************************************************************
      * Protected Fields of the class

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/GroupFetchScanController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/GroupFetchScanController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/GroupFetchScanController.java	Thu Nov 11 10:38:33 2004
@@ -43,10 +43,6 @@
 
 public interface GroupFetchScanController extends GenericScanController
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
     /**
      * Fetch the next N rows from the table.
      * <p>

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/KeyHasher.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/KeyHasher.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/KeyHasher.java	Thu Nov 11 10:38:33 2004
@@ -17,10 +17,6 @@
 */
 public class KeyHasher 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	
 	private final Object[] objects;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/Qualifier.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/Qualifier.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/Qualifier.java	Thu Nov 11 10:38:33 2004
@@ -158,10 +158,6 @@
 
 public interface Qualifier
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/**	
 	 * The DataValueDescriptor can be 1 of 4 types:<ul>

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowCountable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowCountable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowCountable.java	Thu Nov 11 10:38:33 2004
@@ -24,10 +24,6 @@
 
 public interface RowCountable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
     /**
      * Get the total estimated number of rows in the container.
      * <p>

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowLocationRetRowSource.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowLocationRetRowSource.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowLocationRetRowSource.java	Thu Nov 11 10:38:33 2004
@@ -27,10 +27,6 @@
 */ 
 public interface RowLocationRetRowSource extends RowSource 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	/**
 		needsRowLocation returns true iff this the row source expects the

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowSource.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowSource.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowSource.java	Thu Nov 11 10:38:33 2004
@@ -27,12 +27,7 @@
   import, to rows coming out of a sort for index creation.
 
 */ 
-public interface RowSource { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
+public interface RowSource {
 
 	/**
 		Get the next row as an array of column objects. The column objects can

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowUtil.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowUtil.java	Thu Nov 11 10:38:33 2004
@@ -86,10 +86,6 @@
 **/
 public class RowUtil
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	private RowUtil() {}
 
 	/**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ScanController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ScanController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ScanController.java	Thu Nov 11 10:38:33 2004
@@ -46,10 +46,6 @@
 
 public interface ScanController extends GenericScanController
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
     /**
 
     GE is used to position a scan at values greater than or or equal to the

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ScanInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ScanInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ScanInfo.java	Thu Nov 11 10:38:33 2004
@@ -27,10 +27,6 @@
 
 public interface ScanInfo
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
     /**
      * Return all information gathered about the scan.
      * <p>

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SortController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SortController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SortController.java	Thu Nov 11 10:38:33 2004
@@ -36,10 +36,6 @@
 public interface SortController
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	Close this sort controller.
 	<p>
 	Currently, since only one sort controller is allowed per sort,

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SortCostController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SortCostController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SortCostController.java	Thu Nov 11 10:38:33 2004
@@ -30,10 +30,6 @@
 
 public interface SortCostController
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
     /**
      * Close the controller.
      * <p>

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SortInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SortInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SortInfo.java	Thu Nov 11 10:38:33 2004
@@ -25,10 +25,6 @@
 
 public interface SortInfo
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
     /**
      * Return all information gathered about the sort.
      * <p>

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SortObserver.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SortObserver.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SortObserver.java	Thu Nov 11 10:38:33 2004
@@ -60,10 +60,6 @@
 public interface SortObserver
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
-	/**
 	 * Called prior to inserting a distinct sort
 	 * key; in other words, the first time that a
 	 * key is inserted into the sorter, this method

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SpaceInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SpaceInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SpaceInfo.java	Thu Nov 11 10:38:33 2004
@@ -21,10 +21,6 @@
 
 public interface SpaceInfo
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
     /**
      * Get the estimated number of allocated pages
      **/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/StaticCompiledOpenConglomInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/StaticCompiledOpenConglomInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/StaticCompiledOpenConglomInfo.java	Thu Nov 11 10:38:33 2004
@@ -40,10 +40,6 @@
 
 public interface StaticCompiledOpenConglomInfo extends Storable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
     /**
      * routine for internal use of store only.
      **/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/StoreCostController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/StoreCostController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/StoreCostController.java	Thu Nov 11 10:38:33 2004
@@ -46,10 +46,6 @@
 
 public interface StoreCostController extends RowCountable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
     // The folllowing constants should only be used by StoreCostController
     // implementors.
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/StoreCostResult.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/StoreCostResult.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/StoreCostResult.java	Thu Nov 11 10:38:33 2004
@@ -21,10 +21,6 @@
 
 public interface StoreCostResult
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
     /**
      * Get the estimated row count.
      **/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/TransactionController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/TransactionController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/TransactionController.java	Thu Nov 11 10:38:33 2004
@@ -69,10 +69,6 @@
 public interface TransactionController
     extends PersistentSet
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
     /**
      * Constant used for the lock_level argument to openConglomerate() and 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/TransactionInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/TransactionInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/TransactionInfo.java	Thu Nov 11 10:38:33 2004
@@ -12,10 +12,6 @@
 
 public interface TransactionInfo
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	String getGlobalTransactionIdString();
 	String getTransactionIdString();
 	String getUsernameString();

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/XATransactionController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/XATransactionController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/XATransactionController.java	Thu Nov 11 10:38:33 2004
@@ -44,10 +44,6 @@
 
 public interface XATransactionController extends TransactionController
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
     /**************************************************************************
      * Public Methods of This class:
      **************************************************************************

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/Conglomerate.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/Conglomerate.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/Conglomerate.java	Thu Nov 11 10:38:33 2004
@@ -52,11 +52,6 @@
 
 public interface Conglomerate extends Storable, DataValueDescriptor
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
     /**
      * Add a column to the conglomerate.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/ConglomerateFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/ConglomerateFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/ConglomerateFactory.java	Thu Nov 11 10:38:33 2004
@@ -31,10 +31,6 @@
 
 public interface ConglomerateFactory extends MethodFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
     static final int    HEAP_FACTORY_ID     = 0x00;
     static final int    BTREE_FACTORY_ID    = 0x01;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/LogicalUndo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/LogicalUndo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/LogicalUndo.java	Thu Nov 11 10:38:33 2004
@@ -96,10 +96,6 @@
 */
 
 public interface LogicalUndo {
-	/**
-		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,

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/MethodFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/MethodFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/MethodFactory.java	Thu Nov 11 10:38:33 2004
@@ -25,10 +25,6 @@
 public interface MethodFactory extends ModuleSupportable
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	Used to identify this interface when finding it with the Monitor.
 	**/
 	public static final String MODULE = 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/ScanControllerRowSource.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/ScanControllerRowSource.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/ScanControllerRowSource.java	Thu Nov 11 10:38:33 2004
@@ -23,8 +23,4 @@
 public interface ScanControllerRowSource 
     extends ScanController, RowLocationRetRowSource
 {
-	/**
-		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/iapi/store/access/conglomerate/ScanManager.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/ScanManager.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/ScanManager.java	Thu Nov 11 10:38:33 2004
@@ -29,10 +29,6 @@
 
 public interface ScanManager extends ScanController, GroupFetchScanController
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
     /**
      * Close scan as part of terminating a transaction.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/Sort.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/Sort.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/Sort.java	Thu Nov 11 10:38:33 2004
@@ -28,10 +28,6 @@
 public interface Sort
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	Open a sort controller.
 	<p>
 	The sort may have been dropped already, in which case

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/SortFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/SortFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/SortFactory.java	Thu Nov 11 10:38:33 2004
@@ -29,10 +29,6 @@
 public interface SortFactory extends MethodFactory
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	Used to identify this interface when finding it with the Monitor.
 	**/
 	public static final String MODULE = 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/TransactionManager.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/TransactionManager.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/TransactionManager.java	Thu Nov 11 10:38:33 2004
@@ -33,10 +33,6 @@
 
 public interface TransactionManager extends TransactionController
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
     /**
      * Constant used for the lock_level argument to openConglomerate() and 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/xa/XAResourceManager.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/xa/XAResourceManager.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/xa/XAResourceManager.java	Thu Nov 11 10:38:33 2004
@@ -39,10 +39,6 @@
 
 public interface XAResourceManager
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
     /**************************************************************************
      * Public Methods of This class:
      **************************************************************************

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/xa/XAXactId.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/xa/XAXactId.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/xa/XAXactId.java	Thu Nov 11 10:38:33 2004
@@ -32,10 +32,6 @@
 
 public class XAXactId extends GlobalXact implements Xid
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
     /**************************************************************************
      * Private Fields of the class
      **************************************************************************

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/AuxObject.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/AuxObject.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/AuxObject.java	Thu Nov 11 10:38:33 2004
@@ -19,10 +19,6 @@
 */
 public interface AuxObject
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/** 
 		This method is called by the page manager when it's about to evict a
 		page which is holding an aux object, or when a rollback occurred on the

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Compensation.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Compensation.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Compensation.java	Thu Nov 11 10:38:33 2004
@@ -22,10 +22,6 @@
 	@see Undoable#generateUndo
 */
 public interface Compensation extends Loggable {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/**
 	  Set up the undoable operation during recovery redo.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ContainerHandle.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ContainerHandle.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ContainerHandle.java	Thu Nov 11 10:38:33 2004
@@ -103,10 +103,6 @@
 
 public interface ContainerHandle 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/**
 		Used in add container.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ContainerKey.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ContainerKey.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ContainerKey.java	Thu Nov 11 10:38:33 2004
@@ -30,10 +30,6 @@
 */
 public final class ContainerKey implements Matchable, Lockable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	private final long	segmentId;		// segment identifier
 	private final long	containerId;	// container identifier
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ContainerLock.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ContainerLock.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ContainerLock.java	Thu Nov 11 10:38:33 2004
@@ -22,10 +22,6 @@
 */
 
 public final class ContainerLock {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	private final int type;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Corruptable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Corruptable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Corruptable.java	Thu Nov 11 10:38:33 2004
@@ -13,10 +13,6 @@
 import org.apache.derby.iapi.error.StandardException;
 
 public interface Corruptable {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/**
 		Mark the module as corrupt.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/D_ContainerKey.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/D_ContainerKey.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/D_ContainerKey.java	Thu Nov 11 10:38:33 2004
@@ -23,10 +23,6 @@
 
 public class D_ContainerKey extends DiagnosticableGeneric
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
     /**
      * Return string identifying the underlying container.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/D_ContainerLock.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/D_ContainerLock.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/D_ContainerLock.java	Thu Nov 11 10:38:33 2004
@@ -25,10 +25,6 @@
 
 public class D_ContainerLock extends DiagnosticableGeneric
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
     // Names of locks for lock trace print out.
 	private static String[] names = { "CIS", "CIX", "CS", "CU", "CX" };
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/D_RowLock.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/D_RowLock.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/D_RowLock.java	Thu Nov 11 10:38:33 2004
@@ -25,10 +25,6 @@
 
 public class D_RowLock extends DiagnosticableGeneric
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
     // Names of locks for lock trace print out.
 	private static String[] names = { "RS2", "RS3", "RU2", "RU3", "RIP", "RI", "RX2", "RX3" };
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/FetchDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/FetchDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/FetchDescriptor.java	Thu Nov 11 10:38:33 2004
@@ -30,10 +30,6 @@
 
 public final class FetchDescriptor
 {
-    /**
-       IBM Copyright &copy notice.
-    */
-    public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
 
     /**************************************************************************
      * Fields of the class

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/GlobalTransactionId.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/GlobalTransactionId.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/GlobalTransactionId.java	Thu Nov 11 10:38:33 2004
@@ -22,10 +22,6 @@
 */
 public interface GlobalTransactionId extends Formatable 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
     /**
      * Obtain the format id part of the GlobalTransactionId.
      * <p>

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/LockingPolicy.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/LockingPolicy.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/LockingPolicy.java	Thu Nov 11 10:38:33 2004
@@ -47,10 +47,6 @@
 */
 
 public interface LockingPolicy {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/**
 		No locking what so ever, isolation parameter will be ignored by

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Loggable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Loggable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Loggable.java	Thu Nov 11 10:38:33 2004
@@ -29,12 +29,7 @@
 	@see Transaction#logAndDo
 */
 
-public interface Loggable extends Formatable { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+public interface Loggable extends Formatable {
 
 	/**
 		Apply the change indicated by this operation and optional data.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/LogicalUndoable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/LogicalUndoable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/LogicalUndoable.java	Thu Nov 11 10:38:33 2004
@@ -33,10 +33,6 @@
 */
 public interface LogicalUndoable extends Undoable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/** 
 		Return the containerHandle used by this log operation.  Logical cannot
 		change container identity between roll forward and roll back.  This

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Page.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Page.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Page.java	Thu Nov 11 10:38:33 2004
@@ -78,11 +78,6 @@
 
 public interface Page  
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
     /**************************************************************************
      * Constants of the class

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/PageKey.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/PageKey.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/PageKey.java	Thu Nov 11 10:38:33 2004
@@ -28,10 +28,6 @@
 
 public class PageKey
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 	private final ContainerKey	container;
 	private final long	pageNumber;		// page number
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/PageTimeStamp.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/PageTimeStamp.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/PageTimeStamp.java	Thu Nov 11 10:38:33 2004
@@ -22,9 +22,5 @@
 
 public interface PageTimeStamp
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/** No method definition.  This is a type definition */
 }

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java	Thu Nov 11 10:38:33 2004
@@ -83,10 +83,6 @@
 
 
 public interface RawStoreFactory extends Corruptable {
-	/**
-		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/iapi/store/raw/RePreparable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RePreparable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RePreparable.java	Thu Nov 11 10:38:33 2004
@@ -24,10 +24,6 @@
 
 public interface RePreparable 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
     /**
      * reclaim locks associated with the changes in this log record.
      * <p>

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RecordHandle.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RecordHandle.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RecordHandle.java	Thu Nov 11 10:38:33 2004
@@ -23,10 +23,6 @@
 */
 
 public interface RecordHandle extends Lockable {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/*****************************************************************
 	 * Special record Identifiers.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RowLock.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RowLock.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RowLock.java	Thu Nov 11 10:38:33 2004
@@ -22,10 +22,6 @@
 */
 
 public final class RowLock {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	private final int   type;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ScanHandle.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ScanHandle.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ScanHandle.java	Thu Nov 11 10:38:33 2004
@@ -20,10 +20,6 @@
 public interface ScanHandle
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
-	/**
 	  Position to the next log record. 
 	  @return true if the log contains a next flushed log record and
 	           false otherwise. If this returns false it is incorrect

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ScannedTransactionHandle.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ScannedTransactionHandle.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ScannedTransactionHandle.java	Thu Nov 11 10:38:33 2004
@@ -16,10 +16,6 @@
 
 public interface ScannedTransactionHandle
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	Loggable getNextRecord()
 		 throws StandardException;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/StreamContainerHandle.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/StreamContainerHandle.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/StreamContainerHandle.java	Thu Nov 11 10:38:33 2004
@@ -21,12 +21,6 @@
 */
 
 public interface StreamContainerHandle {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-
-    public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	public static final int TEMPORARY_SEGMENT = -1;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Transaction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Transaction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Transaction.java	Thu Nov 11 10:38:33 2004
@@ -26,12 +26,7 @@
 /**
 */
 
-public interface Transaction { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+public interface Transaction {
 
 	/**
 		Return the context manager this transaction is associated with.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Undoable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Undoable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Undoable.java	Thu Nov 11 10:38:33 2004
@@ -23,12 +23,7 @@
 	@see Compensation
 */
 
-public interface Undoable extends Loggable { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+public interface Undoable extends Loggable {
 
 
 	/**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/data/DataFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/data/DataFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/data/DataFactory.java	Thu Nov 11 10:38:33 2004
@@ -35,10 +35,6 @@
 import java.util.Properties;
 
 public interface DataFactory extends Corruptable {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	public static final String MODULE = "org.apache.derby.iapi.store.raw.data.DataFactory";
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/data/RawContainerHandle.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/data/RawContainerHandle.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/data/RawContainerHandle.java	Thu Nov 11 10:38:33 2004
@@ -26,10 +26,6 @@
 */
 
 public interface RawContainerHandle extends ContainerHandle {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/** A container can be in 4 states:
 		non_existent - this is represented by a null ContainerHandle

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogFactory.java	Thu Nov 11 10:38:33 2004
@@ -25,10 +25,6 @@
 import java.io.File;
 
 public interface LogFactory extends Corruptable {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/**
 		The name of a runtime property in the service set that defines any runtime

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogInstant.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogInstant.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogInstant.java	Thu Nov 11 10:38:33 2004
@@ -18,12 +18,7 @@
 */
 
 public interface LogInstant
-extends Formatable, DatabaseInstant { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+extends Formatable, DatabaseInstant {
 
 	public static final long INVALID_LOG_INSTANT = 0;
 }

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogScan.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogScan.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogScan.java	Thu Nov 11 10:38:33 2004
@@ -16,10 +16,6 @@
 
 public interface LogScan {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 		The how and what a logScan returns is left to the specific
 		implementation. 
 		This interface is here so that a LogFactory can return it.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/Logger.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/Logger.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/Logger.java	Thu Nov 11 10:38:33 2004
@@ -25,10 +25,6 @@
 import org.apache.derby.iapi.services.io.LimitObjectInput;
 
 public interface Logger {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/**
 		Log the loggable operation under the context of the transaction and then

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/xact/RawTransaction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/xact/RawTransaction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/xact/RawTransaction.java	Thu Nov 11 10:38:33 2004
@@ -55,10 +55,6 @@
 */
 
 public abstract class RawTransaction extends Observable implements Transaction {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	public static final Integer		COMMIT =             new Integer(0);
 	public static final Integer		ABORT =              new Integer(1);

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/xact/TransactionFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/xact/TransactionFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/xact/TransactionFactory.java	Thu Nov 11 10:38:33 2004
@@ -40,10 +40,6 @@
 */
 
 public interface TransactionFactory extends Corruptable {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	public static String MODULE =
         "org.apache.derby.iapi.store.raw.xact.TransactionFactory";

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/xact/TransactionId.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/xact/TransactionId.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/xact/TransactionId.java	Thu Nov 11 10:38:33 2004
@@ -28,10 +28,6 @@
 
 */
 public interface TransactionId extends Formatable {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/** 
 		Return the maximum number of bytes the transactionId will take

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/BitDataValue.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/BitDataValue.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/BitDataValue.java	Thu Nov 11 10:38:33 2004
@@ -22,10 +22,6 @@
 public interface BitDataValue extends ConcatableDataValue, StreamStorable
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
-	/**
 	 * The SQL concatenation '||' operator.
 	 *
 	 * @param leftOperand	String on the left hand side of '||'

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/BooleanDataValue.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/BooleanDataValue.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/BooleanDataValue.java	Thu Nov 11 10:38:33 2004
@@ -14,10 +14,6 @@
 
 public interface BooleanDataValue extends DataValueDescriptor
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	public boolean	getBoolean();
 
 	/**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/CloneableObject.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/CloneableObject.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/CloneableObject.java	Thu Nov 11 10:38:33 2004
@@ -18,10 +18,6 @@
 public interface CloneableObject
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
-	/**
 	 * Get a shallow copy of the object and return
 	 * it.  This is used by the sorter to clone
 	 * columns.  It should be cloning the column

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/ConcatableDataValue.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/ConcatableDataValue.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/ConcatableDataValue.java	Thu Nov 11 10:38:33 2004
@@ -29,10 +29,6 @@
  */
 public interface ConcatableDataValue extends DataValueDescriptor, VariableSizeDataValue
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	/**
 	 * The SQL char_length() function.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DTSClassInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DTSClassInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DTSClassInfo.java	Thu Nov 11 10:38:33 2004
@@ -14,10 +14,6 @@
 import org.apache.derby.iapi.services.io.FormatableInstanceGetter;
 
 public class DTSClassInfo extends FormatableInstanceGetter {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
         public Object getNewInstance() {
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataType.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataType.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataType.java	Thu Nov 11 10:38:33 2004
@@ -62,10 +62,6 @@
 public abstract class DataType
 	implements DataValueDescriptor, CloneableObject
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	/*
 	 * DataValueDescriptor Interface
 	 */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java	Thu Nov 11 10:38:33 2004
@@ -49,10 +49,6 @@
 
 public final class DataTypeDescriptor implements TypeDescriptor, Formatable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	/********************************************************
 	**
 	**	This class implements Formatable. That means that it

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeUtilities.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeUtilities.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeUtilities.java	Thu Nov 11 10:38:33 2004
@@ -22,10 +22,6 @@
  * @author djd
  */
 public abstract class DataTypeUtilities  {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 	/**
 		Get the precision of the datatype.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueDescriptor.java	Thu Nov 11 10:38:33 2004
@@ -90,11 +90,6 @@
 
 public interface DataValueDescriptor extends Storable, Orderable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	/**
 	 * Gets the length of the data value.  The meaning of this is

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactory.java	Thu Nov 11 10:38:33 2004
@@ -31,10 +31,6 @@
 
 public interface DataValueFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
         /**
          * Get a SQL int with the given value.  A null argument means get
          * a SQL null value.  The second form uses the previous value (if non-null)

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactoryImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactoryImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactoryImpl.java	Thu Nov 11 10:38:33 2004
@@ -53,10 +53,6 @@
  */
 public class DataValueFactoryImpl implements DataValueFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
         LocaleFinder localeFinder;
 
         /**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DateTimeDataValue.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DateTimeDataValue.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DateTimeDataValue.java	Thu Nov 11 10:38:33 2004
@@ -18,10 +18,6 @@
 
 public interface DateTimeDataValue extends DataValueDescriptor
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	public static final int YEAR_FIELD = 0;
 	public static final int MONTH_FIELD = 1;
 	public static final int DAY_FIELD = 2;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DateTimeParser.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DateTimeParser.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DateTimeParser.java	Thu Nov 11 10:38:33 2004
@@ -19,11 +19,6 @@
 class DateTimeParser
 {
 
-    /**
-       IBM Copyright &copy notice.
-    */
-    public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
-
     private String str;
     private String trimmedString;
     private int len;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/JSQLType.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/JSQLType.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/JSQLType.java	Thu Nov 11 10:38:33 2004
@@ -29,10 +29,6 @@
  */
 public final class JSQLType implements Formatable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	///////////////////////////////////////////////////////////////////////
 	//
 	//	CONSTANTS

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/Like.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/Like.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/Like.java	Thu Nov 11 10:38:33 2004
@@ -34,10 +34,6 @@
 	@author ames
  */
 public class Like {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	private static final char anyChar = '_';
 	private static final char anyString = '%';
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/NumberDataType.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/NumberDataType.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/NumberDataType.java	Thu Nov 11 10:38:33 2004
@@ -35,11 +35,6 @@
 									 implements NumberDataValue
 {
 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
-
 
     /**
      * Numbers check for isNegative first and negate it if negative.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/NumberDataValue.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/NumberDataValue.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/NumberDataValue.java	Thu Nov 11 10:38:33 2004
@@ -15,10 +15,6 @@
 public interface NumberDataValue extends DataValueDescriptor
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
-	/**
 	 * The minimum scale when dividing Decimals
 	 */
 	public static final int MIN_DECIMAL_DIVIDE_SCALE = 4;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/Orderable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/Orderable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/Orderable.java	Thu Nov 11 10:38:33 2004
@@ -31,11 +31,6 @@
 
 public interface Orderable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	/**	 Ordering operation constant representing '<' **/
 	static final int ORDER_OP_LESSTHAN = 1;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/RefDataValue.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/RefDataValue.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/RefDataValue.java	Thu Nov 11 10:38:33 2004
@@ -15,10 +15,6 @@
 
 public interface RefDataValue extends DataValueDescriptor
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	/**
 	 * Set the value of this RefDataValue.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/Resetable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/Resetable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/Resetable.java	Thu Nov 11 10:38:33 2004
@@ -22,10 +22,6 @@
 public interface Resetable
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
-	/**
 	 *  Reset the stream to the beginning.
 	 */
 	public void resetStream() throws IOException, StandardException;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/RowLocation.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/RowLocation.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/RowLocation.java	Thu Nov 11 10:38:33 2004
@@ -27,8 +27,4 @@
 
 public interface RowLocation extends DataValueDescriptor, CloneableObject
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 }

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBinary.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBinary.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBinary.java	Thu Nov 11 10:38:33 2004
@@ -82,10 +82,6 @@
 public abstract class SQLBinary
 	extends DataType implements BitDataValue
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
 
 	static final byte PAD = (byte) 0x20;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBit.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBit.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBit.java	Thu Nov 11 10:38:33 2004
@@ -80,10 +80,6 @@
 public class SQLBit
 	extends SQLBinary
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	/**
 	 *

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBlob.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBlob.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBlob.java	Thu Nov 11 10:38:33 2004
@@ -51,10 +51,6 @@
  */
 public class SQLBlob extends SQLBinary
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
 
 	/*
 	 * constructors

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBoolean.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBoolean.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBoolean.java	Thu Nov 11 10:38:33 2004
@@ -65,10 +65,6 @@
 public final class SQLBoolean
 	extends DataType implements BooleanDataValue
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	/*
 	 * DataValueDescriptor interface
 	 * (mostly implemented in DataType)

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLChar.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLChar.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLChar.java	Thu Nov 11 10:38:33 2004
@@ -84,10 +84,6 @@
 public class SQLChar
 	extends DataType implements StringDataValue, StreamStorable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	/**
 		Static array that can be used for blank padding.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLClob.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLClob.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLClob.java	Thu Nov 11 10:38:33 2004
@@ -44,10 +44,6 @@
 public class SQLClob
 	extends SQLVarchar
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
 	/*
 	 * DataValueDescriptor interface.
 	 *

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDate.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDate.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDate.java	Thu Nov 11 10:38:33 2004
@@ -71,10 +71,6 @@
 public final class SQLDate extends DataType
 						implements DateTimeDataValue
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
 
 	private int	encodedDate;	//year << 16 + month << 8 + day
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDecimal.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDecimal.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDecimal.java	Thu Nov 11 10:38:33 2004
@@ -68,10 +68,6 @@
  */
 public final class SQLDecimal extends NumberDataType implements VariableSizeDataValue
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	public static final BigDecimal ZERO = BigDecimal.valueOf(0L);
 	public static final BigDecimal ONE = BigDecimal.valueOf(1L);
 	public static final BigDecimal MAXLONG_PLUS_ONE = BigDecimal.valueOf(Long.MAX_VALUE).add(ONE);

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDouble.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDouble.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDouble.java	Thu Nov 11 10:38:33 2004
@@ -73,11 +73,6 @@
  */
 public final class SQLDouble extends NumberDataType
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	/*
 	 * DataValueDescriptor interface

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLInteger.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLInteger.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLInteger.java	Thu Nov 11 10:38:33 2004
@@ -64,10 +64,6 @@
 public final class SQLInteger
 	extends NumberDataType
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	/*
 	 * DataValueDescriptor interface
 	 * (mostly implemented in DataType)

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLLongVarbit.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLLongVarbit.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLLongVarbit.java	Thu Nov 11 10:38:33 2004
@@ -51,10 +51,6 @@
  */
 public class SQLLongVarbit extends SQLVarbit
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	public String getTypeName()
 	{

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLLongint.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLLongint.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLLongint.java	Thu Nov 11 10:38:33 2004
@@ -65,10 +65,6 @@
 public final class SQLLongint
 	extends NumberDataType
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	/*
 	 * DataValueDescriptor interface
 	 * (mostly implemented in DataType)

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLLongvarchar.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLLongvarchar.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLLongvarchar.java	Thu Nov 11 10:38:33 2004
@@ -41,10 +41,6 @@
 public class SQLLongvarchar
 	extends SQLVarchar
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	/*
 	 * DataValueDescriptor interface.
 	 *

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNClob.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNClob.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNClob.java	Thu Nov 11 10:38:33 2004
@@ -49,10 +49,6 @@
 public class SQLNClob
         extends SQLNationalVarchar
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
         /*
          * DataValueDescriptor interface.
          *

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalChar.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalChar.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalChar.java	Thu Nov 11 10:38:33 2004
@@ -58,10 +58,6 @@
 public class SQLNationalChar
 	extends SQLChar
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 	/*
 	 * DataValueDescriptor interface.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalLongvarchar.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalLongvarchar.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalLongvarchar.java	Thu Nov 11 10:38:33 2004
@@ -48,10 +48,6 @@
 public class SQLNationalLongvarchar
 	extends SQLLongvarchar
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 	/*
 	 * DataValueDescriptor interface.
 	 *

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalVarchar.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalVarchar.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalVarchar.java	Thu Nov 11 10:38:33 2004
@@ -49,10 +49,6 @@
 public class SQLNationalVarchar
 	extends SQLVarchar
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 	public String getTypeName()
 	{

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLReal.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLReal.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLReal.java	Thu Nov 11 10:38:33 2004
@@ -75,10 +75,6 @@
 public final class SQLReal
 	extends NumberDataType
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	/*
 	 * DataValueDescriptor interface

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLRef.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLRef.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLRef.java	Thu Nov 11 10:38:33 2004
@@ -43,10 +43,6 @@
 
 public class SQLRef extends DataType implements RefDataValue
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	protected RowLocation	value;
 
     private static final int BASE_MEMORY_USAGE = ClassSize.estimateBaseFromCatalog( SQLRef.class);

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLSmallint.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLSmallint.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLSmallint.java	Thu Nov 11 10:38:33 2004
@@ -66,10 +66,6 @@
 public final class SQLSmallint
 	extends NumberDataType
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	/*
 	 * DataValueDescriptor interface
 	 * (mostly implemented in DataType)

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTime.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTime.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTime.java	Thu Nov 11 10:38:33 2004
@@ -76,10 +76,6 @@
 public final class SQLTime extends DataType
 						implements DateTimeDataValue
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
 
 	private int		encodedTime;
 	private int		encodedTimeFraction; //currently always 0 since we don't

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTimestamp.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTimestamp.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTimestamp.java	Thu Nov 11 10:38:33 2004
@@ -71,10 +71,6 @@
 public final class SQLTimestamp extends DataType
 						implements DateTimeDataValue
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
 
     static final int MAX_FRACTION_DIGITS = 6; // Only microsecond resolution on conversion to/from strings
     static final int FRACTION_TO_NANO = 1000; // 10**(9 - MAX_FRACTION_DIGITS)

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTinyint.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTinyint.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTinyint.java	Thu Nov 11 10:38:33 2004
@@ -61,10 +61,6 @@
 public final class SQLTinyint
 	extends NumberDataType
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	/*
 	 * constants

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLVarbit.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLVarbit.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLVarbit.java	Thu Nov 11 10:38:33 2004
@@ -52,10 +52,6 @@
  */
 public class SQLVarbit extends SQLBit
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 
 	public String getTypeName()

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLVarchar.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLVarchar.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLVarchar.java	Thu Nov 11 10:38:33 2004
@@ -42,10 +42,6 @@
 public class SQLVarchar
 	extends SQLChar
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	/*
 	 * DataValueDescriptor interface.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/StringDataValue.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/StringDataValue.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/StringDataValue.java	Thu Nov 11 10:38:33 2004
@@ -14,10 +14,6 @@
 
 public interface StringDataValue extends ConcatableDataValue
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	// TRIM() types
 	public static final int BOTH		= 0;
 	public static final int TRAILING	= 1;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/TypeId.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/TypeId.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/TypeId.java	Thu Nov 11 10:38:33 2004
@@ -49,10 +49,6 @@
 
 public final class TypeId implements Formatable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
         /**
          * Various fixed numbers related to datatypes.
          */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/UserDataValue.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/UserDataValue.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/UserDataValue.java	Thu Nov 11 10:38:33 2004
@@ -15,10 +15,6 @@
 public interface UserDataValue extends DataValueDescriptor
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
-	/**
 	 * Set the value of this UserDataValue to the given Object
 	 *
 	 * @param theValue	The value to set this UserDataValue to

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/UserType.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/UserType.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/UserType.java	Thu Nov 11 10:38:33 2004
@@ -62,10 +62,6 @@
 public class UserType extends DataType
 						implements UserDataValue
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	private Object	value;
 
 	/*

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/VariableSizeDataValue.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/VariableSizeDataValue.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/VariableSizeDataValue.java	Thu Nov 11 10:38:33 2004
@@ -23,10 +23,6 @@
  */
 public interface VariableSizeDataValue 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	public static int IGNORE_PRECISION = -1;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/ByteArray.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/ByteArray.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/ByteArray.java	Thu Nov 11 10:38:33 2004
@@ -26,11 +26,6 @@
 */
 public final class ByteArray
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	private byte[] array;
 	private int    offset;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/CheapDateFormatter.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/CheapDateFormatter.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/CheapDateFormatter.java	Thu Nov 11 10:38:33 2004
@@ -16,10 +16,6 @@
  * expensive.
  */
 public class CheapDateFormatter {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 	static final long SECONDS  = 1000L;
 	static final long MINUTES = SECONDS * 60L;
 	static final long HOURS = MINUTES * 60L;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/DoubleProperties.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/DoubleProperties.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/DoubleProperties.java	Thu Nov 11 10:38:33 2004
@@ -25,10 +25,6 @@
 */
 
 public final class DoubleProperties extends Properties {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	private final Properties read;
 	private final Properties write;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/IdUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/IdUtil.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/IdUtil.java	Thu Nov 11 10:38:33 2004
@@ -43,10 +43,6 @@
 public abstract class IdUtil
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	  Delimit the identifier provided.
 	  @return the delimited identifier.
 	  */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/JBitSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/JBitSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/JBitSet.java	Thu Nov 11 10:38:33 2004
@@ -30,10 +30,6 @@
  */
 public final class JBitSet
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	/* The BitSet that we'd like to extend */
 	private final BitSet	bitSet;
 	/* Cache size() of bitSet, since accessed a lot */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/Matchable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/Matchable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/Matchable.java	Thu Nov 11 10:38:33 2004
@@ -15,12 +15,7 @@
 	match a subset of a group of other objects.
 	E.g in a cache.
 */
-public interface Matchable { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
+public interface Matchable {
 
 	/**
 		Return true if the passed in object matches

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/Operator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/Operator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/Operator.java	Thu Nov 11 10:38:33 2004
@@ -15,11 +15,6 @@
 	E.g in a cache.
 */
 public interface Operator {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
 
 	/**
 		Operate on an input object

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/PropertyUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/PropertyUtil.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/PropertyUtil.java	Thu Nov 11 10:38:33 2004
@@ -16,10 +16,6 @@
 import java.io.IOException;
 
 public class PropertyUtil {
-	/**
-		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/iapi/util/ReuseFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/ReuseFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/ReuseFactory.java	Thu Nov 11 10:38:33 2004
@@ -17,10 +17,6 @@
 	All the methods in this class are static.
 */
 public class ReuseFactory {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	/** Private constructor so no instances can be made */
 	private ReuseFactory() {

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/StringUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/StringUtil.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/StringUtil.java	Thu Nov 11 10:38:33 2004
@@ -17,10 +17,6 @@
 public class StringUtil 
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
-	/**
 	 * Used to print out a string for error messages, 
 	 * chops is off at 60 chars for historical reasons.
 	 */

Mime
View raw message