Author: djd
Date: Thu Nov 11 12:18:12 2004
New Revision: 57468

Modified:
   incubator/derby/code/trunk/java/engine/org/apache/derby/authentication/UserAuthenticator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/AliasInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/DefaultInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/Dependable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/DependableFinder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/IndexDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/ReferencedColumns.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/Statistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/TriggerNewTransitionRows.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/TriggerOldTransitionRows.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/TypeDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/UUID.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/BaseTypeIdImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/DecimalTypeIdImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/DefaultInfoImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/IndexDescriptorImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/MethodAliasInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/ReferencedColumnsDescriptorImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/RoutineAliasInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/StatisticsImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypeDescriptorImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypesImplInstanceGetter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/UserDefinedTypeIdImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/database/Database.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/database/UserUtility.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorLogReader.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorMessages.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/diag/LockTable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/diag/SpaceTable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/diag/StatementCache.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/diag/StatementDuration.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/diag/TransactionTable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/io/StorageFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/io/StorageFile.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/io/StorageRandomAccessFile.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/io/WritableStorageFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver169.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver20.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver30.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedXAConnection.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDriver.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSource.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/ReferenceableDataSource.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/ResourceAdapterImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/XAStatementControl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/XATransactionState.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/osgi/EmbeddedActivator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/vti/DeferModification.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/vti/IFastPath.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/vti/IQualifyable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/vti/Pushable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/vti/UpdatableVTITemplate.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/vti/VTICosting.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/vti/VTIEnvironment.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/vti/VTIMetaDataTemplate.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/vti/VTITemplate.java
Log:
Remove IBM's binary copyright in remaining java files under java/engine/org/apache/derby

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/authentication/UserAuthenticator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/authentication/UserAuthenticator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/authentication/UserAuthenticator.java	Thu Nov 11 12:18:12 2004
@@ -39,10 +39,6 @@
 
 public interface UserAuthenticator
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	
 	/**
 	 * Authenticate a user's credentials.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/AliasInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/AliasInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/AliasInfo.java	Thu Nov 11 12:18:12 2004
@@ -25,10 +25,6 @@
 public interface AliasInfo
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
-	/**
 	 * Public statics for the various alias types as both char and String.
 	 */
 	public static final char ALIAS_TYPE_PROCEDURE_AS_CHAR		= 'P';

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/DefaultInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/DefaultInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/DefaultInfo.java	Thu Nov 11 12:18:12 2004
@@ -18,10 +18,6 @@
 public interface DefaultInfo
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
-	/**
 	 * Get the text of a default.
 	 *
 	 * @return The text of the default.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/Dependable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/Dependable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/Dependable.java	Thu Nov 11 12:18:12 2004
@@ -29,10 +29,6 @@
   */
 public interface Dependable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/*
 	  *	Universe of known Dependables. 
 	  */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/DependableFinder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/DependableFinder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/DependableFinder.java	Thu Nov 11 12:18:12 2004
@@ -30,10 +30,6 @@
 public interface DependableFinder
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	  *	Get the in-memory object associated with the passed-in object ID.
 	  *
 	  *	@param	dependableObjectID the ID of a Dependable. Used to locate that Dependable.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.java	Thu Nov 11 12:18:12 2004
@@ -71,10 +71,6 @@
 
 public class GetProcedureColumns extends org.apache.derby.vti.VTITemplate 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 	private boolean isProcedure;
 	// state for procedures.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/IndexDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/IndexDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/IndexDescriptor.java	Thu Nov 11 12:18:12 2004
@@ -23,10 +23,6 @@
 public interface IndexDescriptor
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	 * Returns true if the index is unique.
 	 */
 	boolean			isUnique();

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/ReferencedColumns.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/ReferencedColumns.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/ReferencedColumns.java	Thu Nov 11 12:18:12 2004
@@ -21,10 +21,6 @@
 public interface ReferencedColumns
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	 * Returns an array of 1-based column positions in the table that the
 	 * check constraint is on.  
 	 *

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/Statistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/Statistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/Statistics.java	Thu Nov 11 12:18:12 2004
@@ -23,10 +23,6 @@
 public interface Statistics
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
-	/**
 	 * @return the selectivity for a set of predicates.
 	 */
 	double selectivity(Object[] predicates);

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java	Thu Nov 11 12:18:12 2004
@@ -46,11 +46,6 @@
 	ftp://ftp.software.ibm.com/ps/products/db2/info/vr8/pdf/letter/db2l2e80.pdf
 */
 public class SystemProcedures  {
-	/**
-		IBM Copyright &copy notice.
-	*/
-
-    public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
 
 
 	private final static int SQL_BEST_ROWID = 1;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/TriggerNewTransitionRows.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/TriggerNewTransitionRows.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/TriggerNewTransitionRows.java	Thu Nov 11 12:18:12 2004
@@ -35,10 +35,6 @@
  */
 public class TriggerNewTransitionRows extends org.apache.derby.vti.VTITemplate 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	private ResultSet resultSet;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/TriggerOldTransitionRows.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/TriggerOldTransitionRows.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/TriggerOldTransitionRows.java	Thu Nov 11 12:18:12 2004
@@ -36,10 +36,6 @@
  */
 public class TriggerOldTransitionRows extends org.apache.derby.vti.VTITemplate
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	private ResultSet resultSet;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/TypeDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/TypeDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/TypeDescriptor.java	Thu Nov 11 12:18:12 2004
@@ -21,10 +21,6 @@
 
 public interface TypeDescriptor
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	///////////////////////////////////////////////////////////////////////
 	//
 	//	CONSTANTS

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/UUID.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/UUID.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/UUID.java	Thu Nov 11 12:18:12 2004
@@ -25,10 +25,6 @@
 public interface UUID extends java.io.Externalizable
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	  UUID_BYTE_LENGTH
 
 	  The number of bytes in the array toByteArray returns.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/BaseTypeIdImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/BaseTypeIdImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/BaseTypeIdImpl.java	Thu Nov 11 12:18:12 2004
@@ -44,11 +44,6 @@
  */
 public class BaseTypeIdImpl implements Formatable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
     /********************************************************
     **

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/DecimalTypeIdImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/DecimalTypeIdImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/DecimalTypeIdImpl.java	Thu Nov 11 12:18:12 2004
@@ -17,10 +17,6 @@
 
 public class DecimalTypeIdImpl extends BaseTypeIdImpl
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 	/* this class is needed because writeexternal for this class stores
 	   extra information; when the object is sent over the wire the niladic
 	   constructor is first called and then we call the readExternal method. 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/DefaultInfoImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/DefaultInfoImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/DefaultInfoImpl.java	Thu Nov 11 12:18:12 2004
@@ -27,10 +27,6 @@
 
 public class DefaultInfoImpl implements DefaultInfo, 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/catalog/types/IndexDescriptorImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/IndexDescriptorImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/IndexDescriptorImpl.java	Thu Nov 11 12:18:12 2004
@@ -27,10 +27,6 @@
 /** @see IndexRowGenerator */
 public class IndexDescriptorImpl implements IndexDescriptor, Formatable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	/********************************************************
 	**
 	**	This class implements Formatable. That means that it

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/MethodAliasInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/MethodAliasInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/MethodAliasInfo.java	Thu Nov 11 12:18:12 2004
@@ -26,10 +26,6 @@
 public class MethodAliasInfo
 implements AliasInfo, 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/catalog/types/ReferencedColumnsDescriptorImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/ReferencedColumnsDescriptorImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/ReferencedColumnsDescriptorImpl.java	Thu Nov 11 12:18:12 2004
@@ -22,10 +22,6 @@
 public class ReferencedColumnsDescriptorImpl
 	implements ReferencedColumns, Formatable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	/********************************************************
 	**
 	**	This class implements Formatable. That means that it

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/RoutineAliasInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/RoutineAliasInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/RoutineAliasInfo.java	Thu Nov 11 12:18:12 2004
@@ -29,11 +29,6 @@
  */
 public class RoutineAliasInfo extends MethodAliasInfo
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
 
 	private static final String[] SQL_CONTROL = {"MODIFIES SQL DATA", "READS SQL DATA", "CONTAINS SQL", "NO SQL"};
 	public static final short MODIFIES_SQL_DATA = 0;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/StatisticsImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/StatisticsImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/StatisticsImpl.java	Thu Nov 11 12:18:12 2004
@@ -22,10 +22,6 @@
 
 public class StatisticsImpl	implements Statistics, Formatable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
 	/* total count of rows for which this statistic was created-- this
 	   is not the same as the total number of rows in the conglomerate
 	   currently, but a snapshot; i.e the  number of rows when this

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

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypesImplInstanceGetter.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypesImplInstanceGetter.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypesImplInstanceGetter.java	Thu Nov 11 12:18:12 2004
@@ -14,10 +14,6 @@
 import org.apache.derby.iapi.services.io.FormatableInstanceGetter;
 
 public class TypesImplInstanceGetter 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/catalog/types/UserDefinedTypeIdImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/UserDefinedTypeIdImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/UserDefinedTypeIdImpl.java	Thu Nov 11 12:18:12 2004
@@ -19,10 +19,6 @@
 
 public class UserDefinedTypeIdImpl extends BaseTypeIdImpl
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	/********************************************************
 	**
 	**	This class implements Formatable. That means that it

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/database/Database.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/database/Database.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/database/Database.java	Thu Nov 11 12:18:12 2004
@@ -41,10 +41,6 @@
  */
 public interface Database
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/**
 	 * Tells whether the Database is configured as read-only, or the

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/database/UserUtility.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/database/UserUtility.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/database/UserUtility.java	Thu Nov 11 12:18:12 2004
@@ -34,10 +34,6 @@
   */
 public abstract class UserUtility
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	/** Enumeration value for read access permission ("READ_ACCESS_PERMISSION"). */
 	public final static String READ_ACCESS_PERMISSION = "READ_ACCESS_PERMISSION";
 	/** Enumeration value for full access permission ("FULL_ACCESS_PERMISSION"). */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorLogReader.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorLogReader.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorLogReader.java	Thu Nov 11 12:18:12 2004
@@ -67,10 +67,6 @@
  */
 public class ErrorLogReader extends VTITemplate
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 	/*
 	** private 
 	*/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorMessages.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorMessages.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorMessages.java	Thu Nov 11 12:18:12 2004
@@ -53,11 +53,6 @@
  * 
  */
 public class ErrorMessages extends VTITemplate implements VTICosting, java.security.PrivilegedAction  {
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 	
 	/* The name of the file containing all the SQLSTate codes.
 	 * The class gets the SQLState code from the messages

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/diag/LockTable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/diag/LockTable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/diag/LockTable.java	Thu Nov 11 12:18:12 2004
@@ -74,12 +74,7 @@
 	</UL>
 
  */
-public class LockTable extends VTITemplate implements VTICosting  { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+public class LockTable extends VTITemplate implements VTICosting  {
 
 	/** return only latches */
 	public static final int LATCH = VirtualLockTable.LATCH;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/diag/SpaceTable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/diag/SpaceTable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/diag/SpaceTable.java	Thu Nov 11 12:18:12 2004
@@ -95,12 +95,7 @@
     where s.SCHEMAID = t.SCHEMAID;
     </PRE>
 */
-public class SpaceTable extends VTITemplate implements VTICosting { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
+public class SpaceTable extends VTITemplate implements VTICosting {
 
 	private ConglomInfo[] conglomTable;
 	boolean initialized;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/diag/StatementCache.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/diag/StatementCache.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/diag/StatementCache.java	Thu Nov 11 12:18:12 2004
@@ -60,11 +60,6 @@
 
 */
 public final class StatementCache extends VTITemplate {
-	/**
-		IBM Copyright &copy notice.
-	*/
-
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
 
 	private int position = -1;
 	private Vector data;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/diag/StatementDuration.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/diag/StatementDuration.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/diag/StatementDuration.java	Thu Nov 11 12:18:12 2004
@@ -63,10 +63,6 @@
  */
 public class StatementDuration extends VTITemplate
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 	/*
 	** private 
 	*/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/diag/TransactionTable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/diag/TransactionTable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/diag/TransactionTable.java	Thu Nov 11 12:18:12 2004
@@ -74,12 +74,7 @@
 	statement currently being executed in the database.</LI>
 	</UL>
 */
-public class TransactionTable extends VTITemplate implements VTICosting { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+public class TransactionTable extends VTITemplate implements VTICosting {
 
 	private TransactionInfo[] transactionTable;
 	boolean initialized;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/io/StorageFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/io/StorageFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/io/StorageFactory.java	Thu Nov 11 12:18:12 2004
@@ -65,10 +65,6 @@
  */
 public interface StorageFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
 
     /**
      * Classes implementing the StorageFactory interface must have a null

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/io/StorageFile.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/io/StorageFile.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/io/StorageFile.java	Thu Nov 11 12:18:12 2004
@@ -35,10 +35,6 @@
  */
 public interface StorageFile
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
 
 	//constant values related to exclusive lock mechanism
 	public static final int NO_FILE_LOCK_SUPPORT              = 0;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/io/StorageRandomAccessFile.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/io/StorageRandomAccessFile.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/io/StorageRandomAccessFile.java	Thu Nov 11 12:18:12 2004
@@ -33,10 +33,6 @@
  */
 public interface StorageRandomAccessFile extends DataInput, DataOutput
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
 
     /**
      * Closes this file.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/io/WritableStorageFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/io/WritableStorageFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/io/WritableStorageFactory.java	Thu Nov 11 12:18:12 2004
@@ -24,10 +24,6 @@
  */
 public interface WritableStorageFactory extends StorageFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
 
 
     /**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver169.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver169.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver169.java	Thu Nov 11 12:18:12 2004
@@ -54,12 +54,7 @@
 	@author djd
 */
 
-public abstract class Driver169 implements ModuleControl { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+public abstract class Driver169 implements ModuleControl {
 
 	protected boolean active;
 	private ContextService contextServiceFactory;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver20.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver20.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver20.java	Thu Nov 11 12:18:12 2004
@@ -45,11 +45,6 @@
 
 public class Driver20 extends Driver169 implements Driver {
 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-
 	private static final String[] BOOLEAN_CHOICES = {"false", "true"};
 
 	private Class  antiGCDriverManager;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver30.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver30.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver30.java	Thu Nov 11 12:18:12 2004
@@ -36,11 +36,6 @@
 public class Driver30 extends Driver20 {
 
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
-
-	/**
  	 * Get a new nested connection.
 	 *
 	 * @param conn	The EmbedConnection.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java	Thu Nov 11 12:18:12 2004
@@ -46,10 +46,6 @@
  */
 class EmbedPooledConnection implements javax.sql.PooledConnection, BrokeredConnectionControl
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
 
 	private Vector eventListener; // who wants to know I am closed or error
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedXAConnection.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedXAConnection.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedXAConnection.java	Thu Nov 11 12:18:12 2004
@@ -47,10 +47,6 @@
 		implements XAConnection, XAResource
 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
 
 
 	final ResourceAdapter ra;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java	Thu Nov 11 12:18:12 2004
@@ -39,10 +39,6 @@
 public class EmbeddedConnectionPoolDataSource extends EmbeddedDataSource
 		implements	javax.sql.ConnectionPoolDataSource
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
 
 	private static final long serialVersionUID = 7852784308039674160L;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java	Thu Nov 11 12:18:12 2004
@@ -173,11 +173,6 @@
 public class EmbeddedDataSource extends ReferenceableDataSource implements
 				javax.sql.DataSource
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
 
 	private static final long serialVersionUID = -4945135214995641181L;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDriver.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDriver.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDriver.java	Thu Nov 11 12:18:12 2004
@@ -74,10 +74,6 @@
 */
 
 public class EmbeddedDriver implements Driver {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	static {
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSource.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSource.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSource.java	Thu Nov 11 12:18:12 2004
@@ -59,10 +59,6 @@
 public class EmbeddedXADataSource extends EmbeddedDataSource implements
 				javax.sql.XADataSource
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
 
 	private static final long serialVersionUID = -5715798975598379738L;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/ReferenceableDataSource.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/ReferenceableDataSource.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/ReferenceableDataSource.java	Thu Nov 11 12:18:12 2004
@@ -56,10 +56,6 @@
 				java.io.Serializable,
 				ObjectFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
 
 
 	private static final long serialVersionUID = 1872877359127597176L;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/ResourceAdapterImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/ResourceAdapterImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/ResourceAdapterImpl.java	Thu Nov 11 12:18:12 2004
@@ -34,10 +34,6 @@
 public class ResourceAdapterImpl
 		implements ResourceAdapter, ModuleControl
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	private boolean active;
 
 	// the real resource manager 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/XAStatementControl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/XAStatementControl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/XAStatementControl.java	Thu Nov 11 12:18:12 2004
@@ -27,10 +27,6 @@
 	a wrapper statement.
 */
 final class XAStatementControl implements BrokeredStatementControl {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
 
 	/**
 	*/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/XATransactionState.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/XATransactionState.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/XATransactionState.java	Thu Nov 11 12:18:12 2004
@@ -26,11 +26,6 @@
 */
 public final class XATransactionState extends ContextImpl {
 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
-
 	/** Rollback-only due to deadlock */
 	final static int TRO_DEADLOCK				= -2;
 	/** Rollback-only due to end(TMFAIL) */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/osgi/EmbeddedActivator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/osgi/EmbeddedActivator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/osgi/EmbeddedActivator.java	Thu Nov 11 12:18:12 2004
@@ -18,11 +18,6 @@
 
 public class EmbeddedActivator implements BundleActivator {
 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
-
 	public void start(BundleContext context) {
 		new org.apache.derby.jdbc.EmbeddedDriver();
 	}

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/vti/DeferModification.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/vti/DeferModification.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/vti/DeferModification.java	Thu Nov 11 12:18:12 2004
@@ -67,11 +67,6 @@
 public interface DeferModification
 {
 
-    /**
-       IBM Copyright &copy notice.
-    */
-    public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
-
     public static final int INSERT_STATEMENT = 1;
     public static final int UPDATE_STATEMENT = 2;
     public static final int DELETE_STATEMENT = 3;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/vti/IFastPath.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/vti/IFastPath.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/vti/IFastPath.java	Thu Nov 11 12:18:12 2004
@@ -22,11 +22,6 @@
 	query engine without a conversion through a JDBC ResultSet.
 */
 public interface IFastPath {
-	/**
-		IBM Copyright &copy notice.
-	*/
-
-    public static String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
 
 	/**
 		Indicates nextRow() has completed its scan.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/vti/IQualifyable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/vti/IQualifyable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/vti/IQualifyable.java	Thu Nov 11 12:18:12 2004
@@ -14,10 +14,6 @@
 import org.apache.derby.iapi.services.io.Storable;
 
 public interface IQualifyable {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
 
 	// public boolean handleQualifier(int relOp, int 
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/vti/Pushable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/vti/Pushable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/vti/Pushable.java	Thu Nov 11 12:18:12 2004
@@ -24,11 +24,6 @@
 */
 public interface Pushable {
 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
-
 
 	/**
 		Indicates the columns that must be returned by a read-write VTI's ResultSet.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/vti/UpdatableVTITemplate.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/vti/UpdatableVTITemplate.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/vti/UpdatableVTITemplate.java	Thu Nov 11 12:18:12 2004
@@ -51,10 +51,6 @@
  */
 public abstract class UpdatableVTITemplate implements PreparedStatement 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
     //
     // java.sql.Statement calls, passed through to our preparedStatement.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/vti/VTICosting.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/vti/VTICosting.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/vti/VTICosting.java	Thu Nov 11 12:18:12 2004
@@ -34,10 +34,6 @@
 public interface VTICosting
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
-	/**
 	 * A useful constant: the default estimated number of rows returned by a VTI.
 	 */
 	public static final double defaultEstimatedRowCount		= 10000d;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/vti/VTIEnvironment.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/vti/VTIEnvironment.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/vti/VTIEnvironment.java	Thu Nov 11 12:18:12 2004
@@ -22,11 +22,6 @@
   */
 public interface VTIEnvironment
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	/**
 		Return true if this instance of the VTI has been created for compilation,

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/vti/VTIMetaDataTemplate.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/vti/VTIMetaDataTemplate.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/vti/VTIMetaDataTemplate.java	Thu Nov 11 12:18:12 2004
@@ -39,12 +39,7 @@
 	developing in a Java 2 environment.
  */
 
-public abstract class VTIMetaDataTemplate implements ResultSetMetaData { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
+public abstract class VTIMetaDataTemplate implements ResultSetMetaData {
 
     /**
      * Is the column automatically numbered, and thus read-only?

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/vti/VTITemplate.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/vti/VTITemplate.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/vti/VTITemplate.java	Thu Nov 11 12:18:12 2004
@@ -49,12 +49,7 @@
 	Classes that implement a JDBC 2.0 conformant java.sql.ResultSet can be used
 	as virtual tables.
  */
-public abstract class VTITemplate implements ResultSet { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
+public abstract class VTITemplate implements ResultSet {
 
     //
     // java.sql.ResultSet calls, passed through to our result set.