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 57457 - in incubator/derby/code/trunk/java/engine/org/apache/derby/iapi: db error jdbc reference services/cache services/classfile services/compiler services/context services/crypto services/daemon services/diag services/i18n services/info services/io services/loader services/locks services/monitor services/property services/sanity services/stream services/uuid sql sql/compile sql/conn sql/depend sql/dictionary
Date Thu, 11 Nov 2004 18:57:31 GMT
Author: djd
Date: Thu Nov 11 10:57:29 2004
New Revision: 57457

Modified:
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/ConnectionInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/ConsistencyChecker.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/Database.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/DatabaseContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/Factory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/OptimizerTrace.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/PropertyInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/TriggerExecutionContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/error/ExceptionSeverity.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/error/PassThroughException.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/error/PublicAPI.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/error/StandardException.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/AuthenticationService.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement30.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection30.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnectionControl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement30.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredStatement.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredStatementControl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/ConnectionContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/JDBCBoot.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/ResourceAdapter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Attribute.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/ContextId.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/JDBC20Translation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/JDBC30Translation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/MessageId.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Module.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Property.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/SQLState.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheManager.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/Cacheable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheableFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/ClassSize.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/SizedCacheable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/AttributeEntry.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/Attributes.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Double_info.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Float_info.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Index_info.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Integer_info.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Long_info.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Utf8_info.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassEnumeration.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassFormatOutput.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassHolder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInput.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInvestigator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassMember.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ConstantPoolEntry.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/MemberTable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/VMDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/VMOpcode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/ClassBuilder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/JavaFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/LocalField.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/MethodBuilder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/Context.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextManager.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextService.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ErrorStringBuilder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ShutdownException.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/SystemContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherProvider.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonService.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/Serviceable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/DiagnosticUtil.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Diagnosticable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/DiagnosticableGeneric.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Performance.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/BundleFinder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/LocaleFinder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/MessageService.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductGenusNames.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/PropertyNames.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/AccessibleByteArrayOutputStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ApplicationObjectInputStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayInputStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayOutputStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayUtil.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/CompressedNumber.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/CounterOutputStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/DebugByteTeeOutputStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/DynamicByteArrayOutputStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ErrorInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ErrorObjectInput.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FileUtil.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatIdInputStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatIdOutputStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatIdUtil.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/Formatable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableArrayHolder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableBitSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableHashtable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableInstanceGetter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableIntHolder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableLongHolder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableProperties.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/InputStreamUtil.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/Limit.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/LimitInputStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/LimitObjectInput.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/LimitReader.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/NewByteArrayInputStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/NullOutputStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/RegisteredFormatIds.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/SQLExceptionWrapper.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/Storable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StoredFormatIds.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StreamStorable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/TypedFormat.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassFactoryContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassInspector.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedByteCode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedClass.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedMethod.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/InstanceGetter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/JarReader.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/C_LockFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Latch.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Limit.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/LockFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Lockable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/ShExLockable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/ShExQual.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/VirtualLockTable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleControl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleSupportable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/Monitor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/PersistentService.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PersistentSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertySetCallback.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyUtil.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyValidation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/sanity/AssertFailure.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/sanity/SanityManager.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/stream/HeaderPrintWriter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/stream/InfoStreams.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/stream/PrintWriterGetHeader.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/uuid/UUIDFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/Activation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/LanguageFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/LanguageProperties.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ParameterValueSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/PreparedStatement.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ResultColumnDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ResultDescription.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/Row.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/Statement.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/StatementType.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/StatementUtil.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/StorablePreparedStatement.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/AccessPath.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/C_NodeTypes.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/CodeGeneration.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/CompilerContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/CostEstimate.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/ExpressionClassBuilderInterface.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/JoinStrategy.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/NodeFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Optimizable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/OptimizableList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/OptimizablePredicate.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/OptimizablePredicateList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Optimizer.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/OptimizerFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Parser.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/RequiredRowOrdering.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/RowOrdering.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/TypeCompiler.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/TypeCompilerFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Visitable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Visitor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/Authorizer.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/ConnectionUtil.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/StatementContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/DependableList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/Dependency.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/DependencyManager.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/Dependent.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/Provider.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/ProviderInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/ProviderList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/AliasDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/CatalogRowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/CheckConstraintDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptorList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptorList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConsInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptorList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DDUtils.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDescriptorGenerator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionaryContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DefaultDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DependencyDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/FileInfoDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ForeignKeyConstraintDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/GenericDescriptorList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/IndexLister.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/IndexRowGenerator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/KeyConstraintDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ListOfRowLists.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ReferencedKeyConstraintDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/RowList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SchemaDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/StatisticsDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubCheckConstraintDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubConstraintDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubKeyConstraintDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SystemColumn.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TabInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TableDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TriggerDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TupleDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/UniqueSQLObjectDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/UniqueTupleDescriptor.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/db/ConnectionInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/ConnectionInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/ConnectionInfo.java	Thu Nov 11 10:57:29 2004
@@ -33,10 +33,6 @@
  
 public abstract class ConnectionInfo
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 	/** no requirement for a constructor */
 	private ConnectionInfo() {}

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/ConsistencyChecker.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/ConsistencyChecker.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/ConsistencyChecker.java	Thu Nov 11 10:57:29 2004
@@ -63,10 +63,6 @@
  */
 public class ConsistencyChecker
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	/** no requirement for a constructor */
 	private ConsistencyChecker() {

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/Database.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/Database.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/Database.java	Thu Nov 11 10:57:29 2004
@@ -41,10 +41,6 @@
 
 public interface Database extends org.apache.derby.database.Database, LocaleFinder
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	// this interface gets used on a module, so we name it:
 	// Note that doers not point to this class name, but instead to
 	// the public API for this class. This ensures that the name

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/DatabaseContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/DatabaseContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/DatabaseContext.java	Thu Nov 11 10:57:29 2004
@@ -17,10 +17,6 @@
   A context for a database.
   */
 public interface DatabaseContext extends Context {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	public static final String CONTEXT_ID = "Database";
 	public Database getDatabase();
 }

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/Factory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/Factory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/Factory.java	Thu Nov 11 10:57:29 2004
@@ -51,10 +51,6 @@
 
 public class Factory
 {
-	/**
-		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/db/OptimizerTrace.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/OptimizerTrace.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/OptimizerTrace.java	Thu Nov 11 10:57:29 2004
@@ -26,10 +26,6 @@
 public class OptimizerTrace
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
-	/**
 	 * Control whether or not optimizer trace is on.
 	 *
 	 * @param onOrOff    Whether to turn optimizer trace on (true) or off (false).

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/PropertyInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/PropertyInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/PropertyInfo.java	Thu Nov 11 10:57:29 2004
@@ -46,10 +46,6 @@
   */
 public final class PropertyInfo
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
     /**
      * Get the Properties associated with a given table.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/TriggerExecutionContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/TriggerExecutionContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/TriggerExecutionContext.java	Thu Nov 11 10:57:29 2004
@@ -25,10 +25,6 @@
 public interface TriggerExecutionContext
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
-	/**
 	 * Return value from </I>getEventType()</I> for
 	 * an update trigger.
 	 */ 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/error/ExceptionSeverity.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/error/ExceptionSeverity.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/error/ExceptionSeverity.java	Thu Nov 11 10:57:29 2004
@@ -20,10 +20,6 @@
  */
 public interface ExceptionSeverity
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/*
 	 * Use NO_APPLICABLE_SEVERITY for internal errors and unit
 	 * tests that don't need to report or worry about severities.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/error/PassThroughException.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/error/PassThroughException.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/error/PassThroughException.java	Thu Nov 11 10:57:29 2004
@@ -11,10 +11,6 @@
 package org.apache.derby.iapi.error;
 
 public final class PassThroughException extends RuntimeException {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 	private final Exception nested;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/error/PublicAPI.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/error/PublicAPI.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/error/PublicAPI.java	Thu Nov 11 10:57:29 2004
@@ -27,10 +27,6 @@
 public class PublicAPI
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
-	/**
 		Generates a SQLException for signalling that the
 		operation failed due to a database error.
 	 */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/error/StandardException.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/error/StandardException.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/error/StandardException.java	Thu Nov 11 10:57:29 2004
@@ -39,10 +39,6 @@
 
 public class StandardException extends Exception 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	public static final int REPORT_DEFAULT = 0;
 	public static final int REPORT_NEVER = 1;
 	public static final int REPORT_ALWAYS = 2;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/AuthenticationService.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/AuthenticationService.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/AuthenticationService.java	Thu Nov 11 10:57:29 2004
@@ -25,10 +25,6 @@
  */
 public interface AuthenticationService 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	public static final String MODULE =
 								"org.apache.derby.iapi.jdbc.AuthenticationService";

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java	Thu Nov 11 10:57:29 2004
@@ -23,11 +23,6 @@
 public class BrokeredCallableStatement extends BrokeredPreparedStatement
           implements CallableStatement
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
 
 	public BrokeredCallableStatement(BrokeredStatementControl control, int jdbcLevel, String sql) throws SQLException {
 		super(control, jdbcLevel, sql);

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement30.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement30.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement30.java	Thu Nov 11 10:57:29 2004
@@ -23,11 +23,6 @@
  */
 public class BrokeredCallableStatement30 extends BrokeredCallableStatement
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
 
 	public BrokeredCallableStatement30(BrokeredStatementControl control, int jdbcLevel, String sql) throws SQLException {
 		super(control, jdbcLevel, sql);

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection.java	Thu Nov 11 10:57:29 2004
@@ -29,11 +29,6 @@
  */
 public class BrokeredConnection implements Connection
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
 
 	protected final BrokeredConnectionControl control;
 	private boolean isClosed;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection30.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection30.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection30.java	Thu Nov 11 10:57:29 2004
@@ -22,11 +22,6 @@
  */
 public class BrokeredConnection30 extends BrokeredConnection
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
 	
 	// default for Cloudscape
 	private int stateHoldability = java.sql.ResultSet.HOLD_CURSORS_OVER_COMMIT;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnectionControl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnectionControl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnectionControl.java	Thu Nov 11 10:57:29 2004
@@ -22,12 +22,6 @@
 public interface BrokeredConnectionControl
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-
-	String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
-
-	/**
 		Return the real JDBC connection for the brokered connection.
 	*/
 	public Connection	getRealConnection() throws SQLException;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java	Thu Nov 11 10:57:29 2004
@@ -24,11 +24,6 @@
 public class BrokeredPreparedStatement extends BrokeredStatement
 	implements PreparedStatement
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
 
 	/**
 		SQL used to create me.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement30.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement30.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement30.java	Thu Nov 11 10:57:29 2004
@@ -18,11 +18,6 @@
 */
 public class BrokeredPreparedStatement30 extends BrokeredPreparedStatement {
 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
-
 	private final Object generatedKeys;
 	public BrokeredPreparedStatement30(BrokeredStatementControl control, int jdbcLevel, String sql, Object generatedKeys) throws SQLException {
 		super(control, jdbcLevel, sql);

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredStatement.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredStatement.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredStatement.java	Thu Nov 11 10:57:29 2004
@@ -28,11 +28,6 @@
  */
 public class BrokeredStatement implements Statement
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
 
 	/**
 		My control. Use the controlCheck() method to obtain the control

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredStatementControl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredStatementControl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredStatementControl.java	Thu Nov 11 10:57:29 2004
@@ -18,12 +18,6 @@
 public interface BrokeredStatementControl
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-
-	String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
-
-	/**
 		Can cursors be held across commits.
 	*/
 	public void checkHoldCursors(int holdability) throws SQLException;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/ConnectionContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/ConnectionContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/ConnectionContext.java	Thu Nov 11 10:57:29 2004
@@ -24,10 +24,6 @@
  */
 public interface ConnectionContext 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	public static final String CONTEXT_ID = "JDBC_ConnectionContext";
 
 	/**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java	Thu Nov 11 10:57:29 2004
@@ -28,11 +28,6 @@
 
 public class DRDAServerStarter implements ModuleControl, Runnable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-
-    public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
 
     private Object server;
     private Method serverStartMethod;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/JDBCBoot.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/JDBCBoot.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/JDBCBoot.java	Thu Nov 11 10:57:29 2004
@@ -29,12 +29,7 @@
 	Should be used indirectly through JDBCDriver or JDBCServletBoot
 	or any other useful booting mechanism that comes along.
 */
-public class JDBCBoot { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+public class JDBCBoot {
 
 	private Properties bootProperties;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/ResourceAdapter.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/ResourceAdapter.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/ResourceAdapter.java	Thu Nov 11 10:57:29 2004
@@ -350,10 +350,6 @@
 
  */
 public interface ResourceAdapter {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	/**
 		If a run time global transaction exists, the resource adapter will find

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Attribute.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Attribute.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Attribute.java	Thu Nov 11 10:57:29 2004
@@ -31,12 +31,7 @@
 	are public, static and final since they are declared in an interface.
 */
 
-public interface Attribute { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+public interface Attribute {
 
 	/**
 		Not an attribute but the root for the JDBC URL that Cloudscape supports.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/ContextId.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/ContextId.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/ContextId.java	Thu Nov 11 10:57:29 2004
@@ -11,10 +11,6 @@
 package org.apache.derby.iapi.reference;
 
 public interface ContextId {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
 
 
 	String LANG_CONNECTION = "LanguageConnectionContext";

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/JDBC20Translation.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/JDBC20Translation.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/JDBC20Translation.java	Thu Nov 11 10:57:29 2004
@@ -30,12 +30,7 @@
         are public, static and final since they are declared in an interface.
 */
 
-public interface JDBC20Translation { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+public interface JDBC20Translation {
         /*
         ** public statics from 2.0 version of java.sql.ResultSet
         */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/JDBC30Translation.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/JDBC30Translation.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/JDBC30Translation.java	Thu Nov 11 10:57:29 2004
@@ -31,11 +31,6 @@
 */
 
 public interface JDBC30Translation {
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
         /*
         ** public statics from 3.0 version of java.sql.DatabaseMetaData
         */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/MessageId.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/MessageId.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/MessageId.java	Thu Nov 11 10:57:29 2004
@@ -23,12 +23,7 @@
 	M* - Message service
 */
 
-public interface MessageId { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
+public interface MessageId {
 
 	/*
 	** Raw Store log

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Module.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Module.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Module.java	Thu Nov 11 10:57:29 2004
@@ -12,11 +12,6 @@
 
 public interface Module {
 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
-
 	String CacheFactory = "org.apache.derby.iapi.services.cache.CacheFactory";
 	String CipherFactory = "org.apache.derby.iapi.services.crypto.CipherFactory";
 	String ClassFactory = "org.apache.derby.iapi.services.loader.ClassFactory";

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Property.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Property.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Property.java	Thu Nov 11 10:57:29 2004
@@ -33,11 +33,6 @@
 public interface Property { 
 
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyright = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-
-	/**
 		Name of the file that contains system wide properties.
 		Has to be located in ${derby.system.home} if set, otherwise ${user.dir}
 	*/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/SQLState.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/SQLState.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/SQLState.java	Thu Nov 11 10:57:29 2004
@@ -130,11 +130,6 @@
 
 public interface SQLState {
 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
-
 	/*
 	** BasicServices
 	*/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheFactory.java	Thu Nov 11 10:57:29 2004
@@ -14,10 +14,6 @@
 	A factory for handing out caches.
 */
 public interface CacheFactory {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	
 	/**
 		Create a cache that uses the class represented by holderClass as

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheManager.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheManager.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheManager.java	Thu Nov 11 10:57:29 2004
@@ -16,12 +16,7 @@
 import org.apache.derby.iapi.util.Matchable;
 import org.apache.derby.iapi.util.Operator;
 
-public interface CacheManager { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+public interface CacheManager {
 
     /**
      * @return the current maximum size of the cache.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/Cacheable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/Cacheable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/Cacheable.java	Thu Nov 11 10:57:29 2004
@@ -46,10 +46,6 @@
 	@see Class#newInstance
 */
 public interface Cacheable  {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/**
 		Set the identity of the object to represent an item that already exists,

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheableFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheableFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheableFactory.java	Thu Nov 11 10:57:29 2004
@@ -44,10 +44,6 @@
 	@see Class#newInstance
 */
 public interface CacheableFactory  {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 	public Cacheable newCacheable(CacheManager cm);
 }

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/ClassSize.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/ClassSize.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/ClassSize.java	Thu Nov 11 10:57:29 2004
@@ -20,10 +20,6 @@
 
 public class ClassSize
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
     public static final int refSize;
     private static final int objectOverhead = 2; // references, not bytes!
     private static final int booleanSize = 4;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/SizedCacheable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/SizedCacheable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/SizedCacheable.java	Thu Nov 11 10:57:29 2004
@@ -25,11 +25,6 @@
 
 public interface SizedCacheable extends Cacheable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-
-    public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
 
     /**
      * Get the estimated size of the cacheable object.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/AttributeEntry.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/AttributeEntry.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/AttributeEntry.java	Thu Nov 11 10:57:29 2004
@@ -13,10 +13,6 @@
 import java.io.IOException;
 
 class AttributeEntry {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 	private int attribute_name_index;
 	private ClassFormatOutput infoOut;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/Attributes.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/Attributes.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/Attributes.java	Thu Nov 11 10:57:29 2004
@@ -15,10 +15,6 @@
 import java.io.IOException;
 
 class Attributes extends Vector {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 	private int classFileSize;
 
 	Attributes(int count) {

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Double_info.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Double_info.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Double_info.java	Thu Nov 11 10:57:29 2004
@@ -16,10 +16,6 @@
 
 /** Double Constant - page 97 - Section 4.4.5 */
 final class CONSTANT_Double_info extends ConstantPoolEntry {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 	private final double value;
 
 	CONSTANT_Double_info(double value) {

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Float_info.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Float_info.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Float_info.java	Thu Nov 11 10:57:29 2004
@@ -16,10 +16,6 @@
 
 /** Float Constant - page 96 */
 final class CONSTANT_Float_info extends ConstantPoolEntry {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 	private final float value;
 
 	CONSTANT_Float_info(float value) {

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Index_info.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Index_info.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Index_info.java	Thu Nov 11 10:57:29 2004
@@ -30,10 +30,6 @@
 
 */
 final class CONSTANT_Index_info extends ConstantPoolEntry {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 	private int i1;
 	private int i2;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Integer_info.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Integer_info.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Integer_info.java	Thu Nov 11 10:57:29 2004
@@ -15,10 +15,6 @@
 
 /** Integer Constant - page 96 */
 class CONSTANT_Integer_info extends ConstantPoolEntry {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 	private final int value;
 
 	CONSTANT_Integer_info(int value) {

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Long_info.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Long_info.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Long_info.java	Thu Nov 11 10:57:29 2004
@@ -15,10 +15,6 @@
 
 /** Long Constant - page 97 - Section 4.4.5 */
 final class CONSTANT_Long_info extends ConstantPoolEntry {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 	private final long value;
 
 	CONSTANT_Long_info(long value) {

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Utf8_info.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Utf8_info.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Utf8_info.java	Thu Nov 11 10:57:29 2004
@@ -17,10 +17,6 @@
 
 /** Utf8- page 100 - Section 4.4.7 */
 final class CONSTANT_Utf8_info extends ConstantPoolEntry {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 	private final String value;
 	private int asString;
 	private int asCode;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassEnumeration.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassEnumeration.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassEnumeration.java	Thu Nov 11 10:57:29 2004
@@ -25,10 +25,6 @@
 
 
 class ClassEnumeration implements Enumeration {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 	ClassHolder	cpt;
 	Enumeration			inner;
 	CONSTANT_Index_info	position;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassFormatOutput.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassFormatOutput.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassFormatOutput.java	Thu Nov 11 10:57:29 2004
@@ -30,10 +30,6 @@
  */
 
 public final class ClassFormatOutput extends DataOutputStream {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 	public ClassFormatOutput() {
 		this(512);

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassHolder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassHolder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassHolder.java	Thu Nov 11 10:57:29 2004
@@ -37,11 +37,6 @@
 	*/
 
 public class ClassHolder {
-	/**
-		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/services/classfile/ClassInput.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInput.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInput.java	Thu Nov 11 10:57:29 2004
@@ -20,10 +20,6 @@
  */
 
 class ClassInput extends DataInputStream {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 	ClassInput(InputStream in) {
 		super(in);

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInvestigator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInvestigator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInvestigator.java	Thu Nov 11 10:57:29 2004
@@ -31,11 +31,6 @@
 */
 
 public class ClassInvestigator extends ClassHolder {
-	/**
-		IBM Copyright &copy notice.
-	*/
-
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
 
 	public static ClassInvestigator load(InputStream is)
 		throws IOException {

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassMember.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassMember.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassMember.java	Thu Nov 11 10:57:29 2004
@@ -17,10 +17,6 @@
 
 
 public class ClassMember {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 	protected ClassHolder cpt;
 	protected int access_flags;
 	protected int name_index;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ConstantPoolEntry.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ConstantPoolEntry.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ConstantPoolEntry.java	Thu Nov 11 10:57:29 2004
@@ -19,10 +19,6 @@
 /** Constant Pool class - pages 92-99 */
 public abstract class ConstantPoolEntry /*implements PoolEntry*/
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 	
 	protected int tag; // u1 (page 83)
 	protected boolean doubleSlot; // Some entries take up two slots! (see footnote page 98) 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/MemberTable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/MemberTable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/MemberTable.java	Thu Nov 11 10:57:29 2004
@@ -18,10 +18,6 @@
 
 
 class MemberTable {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 	protected Vector entries;
 	private Hashtable hashtable;
 	private MemberTableHash	mutableMTH = null;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/VMDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/VMDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/VMDescriptor.java	Thu Nov 11 10:57:29 2004
@@ -11,10 +11,6 @@
 package org.apache.derby.iapi.services.classfile;
 
 public interface VMDescriptor {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
     char C_VOID = 'V';
     String VOID = "V";
     char C_BOOLEAN = 'Z';

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/VMOpcode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/VMOpcode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/VMOpcode.java	Thu Nov 11 10:57:29 2004
@@ -17,12 +17,7 @@
  * REMIND: might want a debugging version of this,
  * that stored the stack depth and operand expectations.
  */
-public interface VMOpcode { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
+public interface VMOpcode {
     short BAD = -999; // used in mapping arrays to say "don't do that"
     short NOP = 0;
     short ACONST_NULL = 1;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/ClassBuilder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/ClassBuilder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/ClassBuilder.java	Thu Nov 11 10:57:29 2004
@@ -43,12 +43,7 @@
  *
  * @author ames
  */
-public interface ClassBuilder { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+public interface ClassBuilder {
 
 	/**
 	 * add a field to this class. Fields cannot

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/JavaFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/JavaFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/JavaFactory.java	Thu Nov 11 10:57:29 2004
@@ -81,12 +81,7 @@
  *
  * @author ames
  */
-public interface JavaFactory { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+public interface JavaFactory {
 
 	public	final	static	String	JAVA_FACTORY_PROPERTY = "derby.module.JavaCompiler";
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/LocalField.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/LocalField.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/LocalField.java	Thu Nov 11 10:57:29 2004
@@ -14,10 +14,6 @@
 	A field within the generated class.
  */
 public interface LocalField {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/**
 		Return an expression that's the value of this field

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/MethodBuilder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/MethodBuilder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/MethodBuilder.java	Thu Nov 11 10:57:29 2004
@@ -28,10 +28,6 @@
 	invoke methods or create objects described by the callers.
  */
 public interface MethodBuilder {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/**
 	 * Declare the method throws an exception.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/Context.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/Context.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/Context.java	Thu Nov 11 10:57:29 2004
@@ -46,10 +46,6 @@
 public interface Context
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	 * Returns the context manager that has stored this
 	 * context in its stack.
 	 */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextImpl.java	Thu Nov 11 10:57:29 2004
@@ -30,10 +30,6 @@
 public abstract class ContextImpl 
 	implements Context
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	private final String myIdName;
 	private final ContextManager myContextManager;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextManager.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextManager.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextManager.java	Thu Nov 11 10:57:29 2004
@@ -50,10 +50,6 @@
 public class ContextManager
 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 
 	private final Stack holder;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextService.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextService.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextService.java	Thu Nov 11 10:57:29 2004
@@ -25,10 +25,6 @@
 */
 public final class ContextService //OLD extends Hashtable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	private static ContextService factory;
 	private HeaderPrintWriter errorStream;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ErrorStringBuilder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ErrorStringBuilder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ErrorStringBuilder.java	Thu Nov 11 10:57:29 2004
@@ -24,10 +24,6 @@
  */
 public class ErrorStringBuilder 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 	private StringWriter	stringWriter;
 	private PrintWriter		printWriter;
 	private PrintWriterGetHeader	headerGetter;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ShutdownException.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ShutdownException.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ShutdownException.java	Thu Nov 11 10:57:29 2004
@@ -16,10 +16,6 @@
 */
 
 public final class ShutdownException extends RuntimeException {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	public ShutdownException() {
 		super("");

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/SystemContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/SystemContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/SystemContext.java	Thu Nov 11 10:57:29 2004
@@ -20,10 +20,6 @@
 */
 final class SystemContext extends ContextImpl
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 	SystemContext(ContextManager cm) {
 		super(cm, "SystemContext");
 	}

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherFactory.java	Thu Nov 11 10:57:29 2004
@@ -38,10 +38,6 @@
 
 public interface CipherFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
     /** Minimum bootPassword length */
     public static final int MIN_BOOTPASS_LENGTH = 8;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherProvider.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherProvider.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherProvider.java	Thu Nov 11 10:57:29 2004
@@ -36,10 +36,6 @@
 
 public interface CipherProvider
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/**
 		Encrypt data - use only with Cipher that has been initialized with

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonFactory.java	Thu Nov 11 10:57:29 2004
@@ -46,10 +46,6 @@
 public interface DaemonFactory 
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 		Create a new DaemonService with the default daemon timer delay.
 
 		@exception StandardException Standard cloudscape error policy

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonService.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonService.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonService.java	Thu Nov 11 10:57:29 2004
@@ -30,10 +30,6 @@
 
 public interface DaemonService 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	public static int TIMER_DELAY = 10000; // wake up once per TIMER_DELAY milli-second
 
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/Serviceable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/Serviceable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/Serviceable.java	Thu Nov 11 10:57:29 2004
@@ -30,12 +30,7 @@
   can deal with them.
 */
 
-public interface Serviceable { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+public interface Serviceable {
 
 	/**
 		Do whatever it is that you want the daemon to do for you. There may be

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/DiagnosticUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/DiagnosticUtil.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/DiagnosticUtil.java	Thu Nov 11 10:57:29 2004
@@ -32,10 +32,6 @@
 
 public class DiagnosticUtil
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
     /* Constructors for This class: */
     private DiagnosticUtil()
     {

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Diagnosticable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Diagnosticable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Diagnosticable.java	Thu Nov 11 10:57:29 2004
@@ -23,10 +23,6 @@
 
 public interface Diagnosticable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	/*
 	** Methods of Diagnosticable
 	*/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/DiagnosticableGeneric.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/DiagnosticableGeneric.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/DiagnosticableGeneric.java	Thu Nov 11 10:57:29 2004
@@ -23,10 +23,6 @@
 
 public class DiagnosticableGeneric implements Diagnosticable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	/*
 	** Fields of Diagnosticable
 	*/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Performance.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Performance.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Performance.java	Thu Nov 11 10:57:29 2004
@@ -11,10 +11,6 @@
 package org.apache.derby.iapi.services.diag;
 
 public abstract class Performance {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	// If you want to do some performance measurement, check out this
 	// file and change the value of this to `true', then compile

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/BundleFinder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/BundleFinder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/BundleFinder.java	Thu Nov 11 10:57:29 2004
@@ -14,12 +14,7 @@
 
 /**
  */
-public interface BundleFinder { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
+public interface BundleFinder {
 
 	/**
 		Return the bundle to be used. The msgIdf is passed

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/LocaleFinder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/LocaleFinder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/LocaleFinder.java	Thu Nov 11 10:57:29 2004
@@ -19,12 +19,7 @@
 /**
 	A LocaleFinder gets a Locale and things associated with Locales.
  */
-public interface LocaleFinder { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
+public interface LocaleFinder {
 
 	/**
 	 * @exception StandardException		Thrown on error

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/MessageService.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/MessageService.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/MessageService.java	Thu Nov 11 10:57:29 2004
@@ -29,12 +29,7 @@
  *
  * @author ames
  */
-public final class MessageService { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
+public final class MessageService {
 
 	private static final Locale EN = new Locale("en", "US");
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java	Thu Nov 11 10:57:29 2004
@@ -17,10 +17,6 @@
 public abstract class JVMInfo
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
-	/**
 		The JVM's runtime environment.
 		<UL>
 		<LI> 1 - JDK 1.1

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductGenusNames.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductGenusNames.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductGenusNames.java	Thu Nov 11 10:57:29 2004
@@ -33,10 +33,6 @@
   */
 public interface ProductGenusNames
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/**Genus name for dbms products.*/
 	public static String DBMS = "DBMS";

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java	Thu Nov 11 10:57:29 2004
@@ -101,10 +101,6 @@
   */
 public final class ProductVersionHolder implements java.security.PrivilegedAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	//
 	//Used as an invalid value for numbers. This works because all

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/PropertyNames.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/PropertyNames.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/PropertyNames.java	Thu Nov 11 10:57:29 2004
@@ -17,10 +17,6 @@
   */
 public abstract class PropertyNames
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	public final static String
 	PRODUCT_VENDOR_NAME   = "derby.product.vendor",
 	PRODUCT_TECHNOLOGY_NAME = "derby.product.technology.name",

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/AccessibleByteArrayOutputStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/AccessibleByteArrayOutputStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/AccessibleByteArrayOutputStream.java	Thu Nov 11 10:57:29 2004
@@ -25,10 +25,6 @@
    
  */
 public class AccessibleByteArrayOutputStream extends ByteArrayOutputStream {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	public AccessibleByteArrayOutputStream() {
 		super();

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ApplicationObjectInputStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ApplicationObjectInputStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ApplicationObjectInputStream.java	Thu Nov 11 10:57:29 2004
@@ -24,10 +24,6 @@
 class ApplicationObjectInputStream extends ObjectInputStream
     implements ErrorObjectInput
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	protected ClassFactory cf;
 	protected ObjectStreamClass        initialClass;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayInputStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayInputStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayInputStream.java	Thu Nov 11 10:57:29 2004
@@ -29,11 +29,6 @@
 */
 public final class ArrayInputStream extends InputStream implements LimitObjectInput {
 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-
 	private byte[] pageData;
 
 	private int		start;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayOutputStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayOutputStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayOutputStream.java	Thu Nov 11 10:57:29 2004
@@ -15,10 +15,6 @@
 import java.io.OutputStream;
 
 public class ArrayOutputStream extends OutputStream implements Limit {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	private byte[] pageData;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayUtil.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayUtil.java	Thu Nov 11 10:57:29 2004
@@ -25,10 +25,6 @@
  */
 public abstract class ArrayUtil
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	///////////////////////////////////////////////////////////////////
 	//
 	// Methods for Arrays of OBJECTS.  Cannot be used for an

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/CompressedNumber.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/CompressedNumber.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/CompressedNumber.java	Thu Nov 11 10:57:29 2004
@@ -25,10 +25,6 @@
 */
 
 public abstract class CompressedNumber {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	// the maximum number of bytes written out for an int
 	public static final int MAX_INT_STORED_SIZE = 4;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/CounterOutputStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/CounterOutputStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/CounterOutputStream.java	Thu Nov 11 10:57:29 2004
@@ -20,10 +20,6 @@
 */
 
 public class CounterOutputStream extends OutputStream implements Limit {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	protected OutputStream out;
 	private int count;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/DebugByteTeeOutputStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/DebugByteTeeOutputStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/DebugByteTeeOutputStream.java	Thu Nov 11 10:57:29 2004
@@ -14,11 +14,6 @@
 
 
 class DebugByteTeeOutputStream extends FilterOutputStream {
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
 	private AccessibleByteArrayOutputStream tee = new AccessibleByteArrayOutputStream(256);
 
 	DebugByteTeeOutputStream(OutputStream out) {

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/DynamicByteArrayOutputStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/DynamicByteArrayOutputStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/DynamicByteArrayOutputStream.java	Thu Nov 11 10:57:29 2004
@@ -23,10 +23,6 @@
 	and can get a direct reference of the array.
 */
 public class DynamicByteArrayOutputStream extends OutputStream {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	private static int INITIAL_SIZE = 4096;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ErrorInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ErrorInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ErrorInfo.java	Thu Nov 11 10:57:29 2004
@@ -15,10 +15,6 @@
  */
 interface ErrorInfo
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 	String getErrorInfo();
 
     Exception getNestedException();

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ErrorObjectInput.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ErrorObjectInput.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ErrorObjectInput.java	Thu Nov 11 10:57:29 2004
@@ -19,10 +19,6 @@
  */
 public interface ErrorObjectInput extends ObjectInput, ErrorInfo
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	public String getErrorInfo();
 
     public Exception getNestedException();

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FileUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FileUtil.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FileUtil.java	Thu Nov 11 10:57:29 2004
@@ -21,10 +21,6 @@
 	A set of public static methods for dealing with File objects.
 */
 public abstract class FileUtil {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
     private static final int BUFFER_SIZE = 4096*4;
 	/**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatIdInputStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatIdInputStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatIdInputStream.java	Thu Nov 11 10:57:29 2004
@@ -34,10 +34,6 @@
 public final class FormatIdInputStream extends DataInputStream
 	 implements ErrorObjectInput, Resetable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	protected ClassFactory cf;
 	private ErrorInfo errorInfo;
     private Exception myNestedException;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatIdOutputStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatIdOutputStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatIdOutputStream.java	Thu Nov 11 10:57:29 2004
@@ -61,10 +61,6 @@
 public class FormatIdOutputStream
 extends DataOutputStream implements ObjectOutput, ErrorInfo
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/**
 	  Constructor for a FormatIdOutputStream

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatIdUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatIdUtil.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatIdUtil.java	Thu Nov 11 10:57:29 2004
@@ -37,10 +37,6 @@
  */
 public final class FormatIdUtil
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	private FormatIdUtil() {
 	}
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/Formatable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/Formatable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/Formatable.java	Thu Nov 11 10:57:29 2004
@@ -23,9 +23,5 @@
  */
 public interface Formatable
 extends Externalizable, TypedFormat
-{ 
-	/**
-		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/services/io/FormatableArrayHolder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableArrayHolder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableArrayHolder.java	Thu Nov 11 10:57:29 2004
@@ -31,10 +31,6 @@
  */
 public class FormatableArrayHolder implements Formatable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	/********************************************************
 	**
 	**	This class implements Formatable. That means that it

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableBitSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableBitSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableBitSet.java	Thu Nov 11 10:57:29 2004
@@ -25,10 +25,6 @@
 
 public final class FormatableBitSet implements Formatable, Cloneable
 {
-	/**
-		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/services/io/FormatableHashtable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableHashtable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableHashtable.java	Thu Nov 11 10:57:29 2004
@@ -30,10 +30,6 @@
  */
 public class FormatableHashtable extends Hashtable implements Formatable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	/********************************************************
 	**
 	**	This class implements Formatable. That means that it

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableInstanceGetter.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableInstanceGetter.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableInstanceGetter.java	Thu Nov 11 10:57:29 2004
@@ -13,10 +13,6 @@
 import org.apache.derby.iapi.services.loader.InstanceGetter;
 
 public abstract class FormatableInstanceGetter implements InstanceGetter {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 	protected int fmtId;
 

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

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableLongHolder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableLongHolder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableLongHolder.java	Thu Nov 11 10:57:29 2004
@@ -25,10 +25,6 @@
  */
 public class FormatableLongHolder implements Formatable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	// the int
 	private long theLong;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableProperties.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableProperties.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableProperties.java	Thu Nov 11 10:57:29 2004
@@ -29,10 +29,6 @@
  */
 public class FormatableProperties extends Properties implements Formatable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	/********************************************************
 	**
 	**	This class implements Formatable. That means that it

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/InputStreamUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/InputStreamUtil.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/InputStreamUtil.java	Thu Nov 11 10:57:29 2004
@@ -18,10 +18,6 @@
 	a DataInputStream just to get this functionality.
 */
 public final class InputStreamUtil {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/**
 		Read an unsigned byte from an InputStream, throwing an EOFException

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/Limit.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/Limit.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/Limit.java	Thu Nov 11 10:57:29 2004
@@ -16,12 +16,7 @@
 	Methods that allow limits to be placed on an input or output stream to
 	avoid clients reading or writing too much information.
 */
-public interface Limit { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
+public interface Limit {
 
 	/**
 		Set the limit of the data that can be read or written. After this

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/LimitInputStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/LimitInputStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/LimitInputStream.java	Thu Nov 11 10:57:29 2004
@@ -19,10 +19,6 @@
 	can be read from the stream.
 */
 public class LimitInputStream extends FilterInputStream implements Limit {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	protected int remainingBytes;
 	protected boolean limitInPlace;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/LimitObjectInput.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/LimitObjectInput.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/LimitObjectInput.java	Thu Nov 11 10:57:29 2004
@@ -19,9 +19,5 @@
  */
 public interface LimitObjectInput
 	extends ErrorObjectInput, Limit
-{ 
-	/**
-		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/services/io/LimitReader.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/LimitReader.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/LimitReader.java	Thu Nov 11 10:57:29 2004
@@ -19,10 +19,6 @@
 */
 public class LimitReader extends Reader implements Limit 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	protected int remainingBytes;
 	protected boolean limitInPlace;
 	private	Reader	reader;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/NewByteArrayInputStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/NewByteArrayInputStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/NewByteArrayInputStream.java	Thu Nov 11 10:57:29 2004
@@ -19,10 +19,6 @@
 	Java's ByteInputStream has a close() method that does not do anything.
 */
 public final class NewByteArrayInputStream extends InputStream {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	private byte[] data;
 	private int offset;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/NullOutputStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/NullOutputStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/NullOutputStream.java	Thu Nov 11 10:57:29 2004
@@ -17,10 +17,6 @@
 */
 
 public final class NullOutputStream extends OutputStream {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/*
 	** Methods of OutputStream

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/RegisteredFormatIds.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/RegisteredFormatIds.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/RegisteredFormatIds.java	Thu Nov 11 10:57:29 2004
@@ -34,10 +34,6 @@
 */
 
 public interface RegisteredFormatIds {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 /* one byte  format identifiers never used
 String[] OneByte = {

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/SQLExceptionWrapper.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/SQLExceptionWrapper.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/SQLExceptionWrapper.java	Thu Nov 11 10:57:29 2004
@@ -20,10 +20,6 @@
  */
 class SQLExceptionWrapper extends SQLException
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
     private Exception myException;
 
     SQLExceptionWrapper(Exception e)

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/Storable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/Storable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/Storable.java	Thu Nov 11 10:57:29 2004
@@ -21,11 +21,6 @@
 public interface Storable
 extends Formatable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
- 
-    public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/**
 	  Return whether the value is null or not.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StoredFormatIds.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StoredFormatIds.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StoredFormatIds.java	Thu Nov 11 10:57:29 2004
@@ -52,12 +52,7 @@
   file. If you remove support for a one please document that the
   format id is deprecated. Never remove or re-use a format id.
  */
-public interface StoredFormatIds { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+public interface StoredFormatIds {
 
         /** Byte length of a two byt format id. */
         int  TWO_BYTE_FORMAT_ID_BYTE_LENGTH = 2;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StreamStorable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StreamStorable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StreamStorable.java	Thu Nov 11 10:57:29 2004
@@ -21,10 +21,6 @@
 public interface StreamStorable
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	  Return the stream state of the object.
 	  
 	**/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/TypedFormat.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/TypedFormat.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/TypedFormat.java	Thu Nov 11 10:57:29 2004
@@ -25,10 +25,6 @@
 public interface TypedFormat
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	  Get a universally unique identifier for the type of
 	  this object. 
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassFactory.java	Thu Nov 11 10:57:29 2004
@@ -22,12 +22,7 @@
 	and generated classes.
 */
 
-public interface ClassFactory { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
+public interface ClassFactory {
 
 	/**
 		Add a generated class to the class manager's class repository.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassFactoryContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassFactoryContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassFactoryContext.java	Thu Nov 11 10:57:29 2004
@@ -18,10 +18,6 @@
 */
 
 public abstract class ClassFactoryContext extends ContextImpl {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 	public static final String CONTEXT_ID = "ClassFactoryContext";
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassInfo.java	Thu Nov 11 10:57:29 2004
@@ -14,10 +14,6 @@
 import java.lang.reflect.InvocationTargetException;
 
 public class ClassInfo implements InstanceGetter {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	private static final Class[] noParameters = new Class[0];
 	private static final Object[] noArguments = new Object[0];

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassInspector.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassInspector.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassInspector.java	Thu Nov 11 10:57:29 2004
@@ -26,10 +26,6 @@
 */
 public final class ClassInspector
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	private static final String[] primTypeNames =
 		{"boolean", "byte", "char", "short", "int", "long", "float", "double"};
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedByteCode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedByteCode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedByteCode.java	Thu Nov 11 10:57:29 2004
@@ -17,12 +17,7 @@
 	Generated classes must implement this interface.
 
 */
-public interface GeneratedByteCode { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
+public interface GeneratedByteCode {
 
 	/**
 		Initialize the generated class from a context.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedClass.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedClass.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedClass.java	Thu Nov 11 10:57:29 2004
@@ -18,12 +18,7 @@
 	(Similar to java.lang.Class).
 */
 
-public interface GeneratedClass { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
+public interface GeneratedClass {
 
 	/**
 		Return the name of the generated class.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedMethod.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedMethod.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedMethod.java	Thu Nov 11 10:57:29 2004
@@ -18,12 +18,7 @@
 	@see GeneratedClass
 */
 
-public interface GeneratedMethod { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
+public interface GeneratedMethod {
 
 
 	/**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/InstanceGetter.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/InstanceGetter.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/InstanceGetter.java	Thu Nov 11 10:57:29 2004
@@ -12,12 +12,7 @@
 
 import java.lang.reflect.InvocationTargetException;
 
-public interface InstanceGetter { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
+public interface InstanceGetter {
 
 	/**
 		Create an instance of a class.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/JarReader.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/JarReader.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/JarReader.java	Thu Nov 11 10:57:29 2004
@@ -17,10 +17,6 @@
 */
 
 public interface JarReader {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 	/**
 		Load the contents of a Jarfile. The return is either

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/C_LockFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/C_LockFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/C_LockFactory.java	Thu Nov 11 10:57:29 2004
@@ -14,10 +14,6 @@
 	Constants for the LockFactory
 */
 public interface C_LockFactory {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	/**
 		Timeout value that indicates wait for the lock or latch forever.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Latch.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Latch.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Latch.java	Thu Nov 11 10:57:29 2004
@@ -14,10 +14,6 @@
 	A Latch represents a latch held in the lock manager.
 */
 public interface Latch {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/**	
 		Get the compatability space the latch is held in.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Limit.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Limit.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Limit.java	Thu Nov 11 10:57:29 2004
@@ -21,12 +21,7 @@
 
 	@see LockFactory#setLimit
 */
-public interface Limit { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
+public interface Limit {
 
 	/**
 		Called by the lock factory when a limit has been reached.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/LockFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/LockFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/LockFactory.java	Thu Nov 11 10:57:29 2004
@@ -24,12 +24,7 @@
 
 
 */
-public interface LockFactory extends PropertySetCallback { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+public interface LockFactory extends PropertySetCallback {
 
 	/**
 		Lock an object within a compatability space

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Lockable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Lockable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Lockable.java	Thu Nov 11 10:57:29 2004
@@ -68,11 +68,6 @@
 */
 
 public interface Lockable {
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
     
 	/**
 		Note the fact the object is locked. Performs required actions

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/ShExLockable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/ShExLockable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/ShExLockable.java	Thu Nov 11 10:57:29 2004
@@ -20,10 +20,6 @@
 
 public class ShExLockable implements Lockable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	public ShExLockable()
 	{		

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/ShExQual.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/ShExQual.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/ShExQual.java	Thu Nov 11 10:57:29 2004
@@ -15,10 +15,6 @@
  */
 public class ShExQual
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	private int	lockState;
 
 	private ShExQual(int lockState)

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/VirtualLockTable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/VirtualLockTable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/VirtualLockTable.java	Thu Nov 11 10:57:29 2004
@@ -22,10 +22,6 @@
  */
 
 public interface VirtualLockTable {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	// flags for Lockable.lockAttributes
 	public static final int LATCH = 1;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleControl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleControl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleControl.java	Thu Nov 11 10:57:29 2004
@@ -17,12 +17,7 @@
 	ModuleControl is <B>optionally</B> implemented by a module's factory class.
 */
 
-public interface ModuleControl { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+public interface ModuleControl {
 
 	/**
 		Boot this module with the given properties. Creates a module instance

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleFactory.java	Thu Nov 11 10:57:29 2004
@@ -28,10 +28,6 @@
 
 public interface ModuleFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
     /**
      * Find the module in the system with the given module protocol,

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleSupportable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleSupportable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleSupportable.java	Thu Nov 11 10:57:29 2004
@@ -17,12 +17,7 @@
 	before it is selected as an implementation.
 */
 
-public interface ModuleSupportable { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+public interface ModuleSupportable {
 
 	/**
 		See if this implementation can support any attributes that are listed in properties.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/Monitor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/Monitor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/Monitor.java	Thu Nov 11 10:57:29 2004
@@ -233,11 +233,6 @@
 */
 public class Monitor {
 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-
 	public static final String SERVICE_TYPE_DIRECTORY = "serviceDirectory";
 
 	public static final Object syncMe = new Object();

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/PersistentService.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/PersistentService.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/PersistentService.java	Thu Nov 11 10:57:29 2004
@@ -49,11 +49,6 @@
 public interface PersistentService {
 
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-
-	/**
 		Service stored in a directory.
 	*/
 	public static final String DIRECTORY = "directory";

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PersistentSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PersistentSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PersistentSet.java	Thu Nov 11 10:57:29 2004
@@ -18,10 +18,6 @@
 
 public interface PersistentSet
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
     /**
      * Gets a value for a stored property. The returned value will be:
 	 *

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyFactory.java	Thu Nov 11 10:57:29 2004
@@ -41,10 +41,6 @@
 
 public interface PropertyFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
     /**************************************************************************
      * methods that are Property related.
      **************************************************************************

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertySetCallback.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertySetCallback.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertySetCallback.java	Thu Nov 11 10:57:29 2004
@@ -15,12 +15,7 @@
 import java.io.Serializable;
 import java.util.Dictionary;
 
-public interface PropertySetCallback { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+public interface PropertySetCallback {
 
 	/**
 		Initialize the properties for this callback.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyUtil.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyUtil.java	Thu Nov 11 10:57:29 2004
@@ -51,10 +51,6 @@
 
 */
 public class PropertyUtil {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	// List of properties that are stored in the service.properties file
 	public static final String[] servicePropertyList = {

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyValidation.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyValidation.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyValidation.java	Thu Nov 11 10:57:29 2004
@@ -28,10 +28,6 @@
 
 public class PropertyValidation implements PropertyFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 	private Vector  notifyOnSet;
 
     /* Constructors for This class: */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/sanity/AssertFailure.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/sanity/AssertFailure.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/sanity/AssertFailure.java	Thu Nov 11 10:57:29 2004
@@ -23,10 +23,6 @@
  **/
 public class AssertFailure extends RuntimeException
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	private Throwable nestedException;
 
 	/**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/sanity/SanityManager.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/sanity/SanityManager.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/sanity/SanityManager.java	Thu Nov 11 10:57:29 2004
@@ -41,13 +41,7 @@
  * <p>
  * @see org.apache.derby.iapi.services.sanity.AssertFailure
  */
-public class SanityManager { 
-
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+public class SanityManager {
 	/**
 	 * The build tool may be configured to alter
 	 * this source file to reset the static final variables

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/stream/HeaderPrintWriter.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/stream/HeaderPrintWriter.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/stream/HeaderPrintWriter.java	Thu Nov 11 10:57:29 2004
@@ -22,10 +22,6 @@
 public interface HeaderPrintWriter
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	 * Puts out some setup info for
 	 * the current write and the write(s) that will be put out next.
 	 * It ends with a \n\r.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/stream/InfoStreams.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/stream/InfoStreams.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/stream/InfoStreams.java	Thu Nov 11 10:57:29 2004
@@ -23,12 +23,7 @@
  * @see HeaderPrintWriter
  * @author ames
  */
-public interface InfoStreams { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+public interface InfoStreams {
 
 	/**
 	 Return the default stream. If the default stream could not be set up as requested then

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/stream/PrintWriterGetHeader.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/stream/PrintWriterGetHeader.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/stream/PrintWriterGetHeader.java	Thu Nov 11 10:57:29 2004
@@ -21,10 +21,6 @@
 public interface PrintWriterGetHeader
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	 *	getHeader
 	 *
 	 *  @return	The header for an output line. 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/uuid/UUIDFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/uuid/UUIDFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/uuid/UUIDFactory.java	Thu Nov 11 10:57:29 2004
@@ -43,10 +43,6 @@
 public interface UUIDFactory 
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	  Create a new UUID.  The resulting object is guaranteed
 	  to be unique "across space and time".
 	  @return		The UUID.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/Activation.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/Activation.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/Activation.java	Thu Nov 11 10:57:29 2004
@@ -63,10 +63,6 @@
 public interface Activation
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	 * Resets the activation to the "pre-execution" state -
 	 * that is, the state where it can be used to begin a new execution.
 	 * Frees local buffers, stops scans, resets counters to zero, sets

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/LanguageFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/LanguageFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/LanguageFactory.java	Thu Nov 11 10:57:29 2004
@@ -24,10 +24,6 @@
 public interface LanguageFactory
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 		Used to locate this factory by the Monitor basic service.
 		There needs to be a language factory per database.
 	 */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/LanguageProperties.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/LanguageProperties.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/LanguageProperties.java	Thu Nov 11 10:57:29 2004
@@ -16,10 +16,6 @@
  */
 public interface LanguageProperties
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	/*
 	** BulkFetch
 	**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ParameterValueSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ParameterValueSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ParameterValueSet.java	Thu Nov 11 10:57:29 2004
@@ -27,10 +27,6 @@
  */
 public interface ParameterValueSet
 {
-	/**
-		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/sql/PreparedStatement.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/PreparedStatement.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/PreparedStatement.java	Thu Nov 11 10:57:29 2004
@@ -30,10 +30,6 @@
 public interface PreparedStatement
 	extends Dependent, Provider
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/**
 	 * Checks whether this PreparedStatement is up to date.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ResultColumnDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ResultColumnDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ResultColumnDescriptor.java	Thu Nov 11 10:57:29 2004
@@ -21,10 +21,6 @@
 public interface ResultColumnDescriptor
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	 * Returns a DataTypeDescriptor for the column. This DataTypeDescriptor
 	 * will not represent an actual value, it will only represent the type
 	 * that all values in the column will have.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ResultDescription.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ResultDescription.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ResultDescription.java	Thu Nov 11 10:57:29 2004
@@ -20,10 +20,6 @@
 public interface ResultDescription
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	 * Returns an identifier that tells what type of statement has been
 	 * executed. This can be used to determine what other methods to call
 	 * to get the results back from a statement. For example, a SELECT

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ResultSet.java	Thu Nov 11 10:57:29 2004
@@ -45,10 +45,6 @@
 
 public interface ResultSet
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/* Get time only spent in this ResultSet */
 	public static final int CURRENT_RESULTSET_ONLY = 0;
 	/* Get time spent in this ResultSet and below */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/Row.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/Row.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/Row.java	Thu Nov 11 10:57:29 2004
@@ -30,10 +30,6 @@
 
 public interface Row
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	public int nColumns();
 
 	/**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/Statement.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/Statement.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/Statement.java	Thu Nov 11 10:57:29 2004
@@ -34,10 +34,6 @@
  */
 public interface Statement
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/**
 	 * Generates an execution plan without executing it.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/StatementType.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/StatementType.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/StatementType.java	Thu Nov 11 10:57:29 2004
@@ -17,10 +17,6 @@
  */
 public interface StatementType
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	public static final int UNKNOWN	= 0;
 	public static final int INSERT	= 1;
 	public static final int BULK_INSERT_REPLACE = 2;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/StatementUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/StatementUtil.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/StatementUtil.java	Thu Nov 11 10:57:29 2004
@@ -21,10 +21,6 @@
  */
 public class StatementUtil
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 	private StatementUtil(){};	// Do not instantiate
 
 	public static String typeName(int typeNumber)

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/StorablePreparedStatement.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/StorablePreparedStatement.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/StorablePreparedStatement.java	Thu Nov 11 10:57:29 2004
@@ -22,10 +22,6 @@
  */
 public interface StorablePreparedStatement extends ExecPreparedStatement
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	/**
 	 * Load up the class from the saved bytes.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/AccessPath.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/AccessPath.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/AccessPath.java	Thu Nov 11 10:57:29 2004
@@ -22,10 +22,6 @@
 
 public interface AccessPath {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
-	/**
 	 * Set the conglomerate descriptor for this access path.
 	 *
 	 * @param cd	A ConglomerateDescriptor

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/C_NodeTypes.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/C_NodeTypes.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/C_NodeTypes.java	Thu Nov 11 10:57:29 2004
@@ -19,10 +19,6 @@
  */
 public interface C_NodeTypes
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	/** Node types, for use with getNode methods */
 	static final int TEST_CONSTRAINT_NODE = 1;
 	static final int CURRENT_ROW_LOCATION_NODE = 2;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/CodeGeneration.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/CodeGeneration.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/CodeGeneration.java	Thu Nov 11 10:57:29 2004
@@ -16,9 +16,5 @@
  */
 public interface CodeGeneration
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	String GENERATED_PACKAGE_PREFIX = "org.apache.derby.exe.";
 }

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/CompilerContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/CompilerContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/CompilerContext.java	Thu Nov 11 10:57:29 2004
@@ -50,10 +50,6 @@
  */
 public interface CompilerContext extends Context
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/////////////////////////////////////////////////////////////////////////////////////
 	//
 	//	CONSTANTS

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/CostEstimate.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/CostEstimate.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/CostEstimate.java	Thu Nov 11 10:57:29 2004
@@ -23,10 +23,6 @@
 public interface CostEstimate extends StoreCostResult
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	 * Set the cost for this cost estimate.
 	 */
 	void setCost(double cost, double rowCount, double singleScanRowCount);

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/ExpressionClassBuilderInterface.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/ExpressionClassBuilderInterface.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/ExpressionClassBuilderInterface.java	Thu Nov 11 10:57:29 2004
@@ -18,8 +18,4 @@
  */
 public interface ExpressionClassBuilderInterface
 {
-	/**
-		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/sql/compile/JoinStrategy.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/JoinStrategy.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/JoinStrategy.java	Thu Nov 11 10:57:29 2004
@@ -29,10 +29,6 @@
 
 public interface JoinStrategy {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	 * Is this join strategy feasible under the circumstances?
 	 *
 	 * @param innerTable	The inner table of the join

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/NodeFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/NodeFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/NodeFactory.java	Thu Nov 11 10:57:29 2004
@@ -33,10 +33,6 @@
 public abstract class NodeFactory
 {
 	/**
-		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.
 	 */
 	public static final String MODULE = "org.apache.derby.iapi.sql.compile.NodeFactory";

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Optimizable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Optimizable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Optimizable.java	Thu Nov 11 10:57:29 2004
@@ -25,10 +25,6 @@
  */
 
 public interface Optimizable {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/**
 	 * Choose the next access path to evaluate for this Optimizable.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/OptimizableList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/OptimizableList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/OptimizableList.java	Thu Nov 11 10:57:29 2004
@@ -20,10 +20,6 @@
  */
 
 public interface OptimizableList {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/**
 	 *  Return the number of Optimizables in the list.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/OptimizablePredicate.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/OptimizablePredicate.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/OptimizablePredicate.java	Thu Nov 11 10:57:29 2004
@@ -23,10 +23,6 @@
 public interface OptimizablePredicate
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	 * Get the map of referenced tables for this OptimizablePredicate.
 	 *
 	 * @return JBitSet	Referenced table map.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/OptimizablePredicateList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/OptimizablePredicateList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/OptimizablePredicateList.java	Thu Nov 11 10:57:29 2004
@@ -26,10 +26,6 @@
 public interface OptimizablePredicateList 
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	 *  Return the number of OptimizablePredicates in the list.
 	 *
 	 *  @return integer		The number of OptimizablePredicates in the list.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Optimizer.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Optimizer.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Optimizer.java	Thu Nov 11 10:57:29 2004
@@ -28,10 +28,6 @@
 
 public interface Optimizer {
 	/**
-		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.compile.Optimizer";

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/OptimizerFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/OptimizerFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/OptimizerFactory.java	Thu Nov 11 10:57:29 2004
@@ -24,12 +24,7 @@
 	There is expected to be only one of these configured per database.
  */
 
-public interface OptimizerFactory { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+public interface OptimizerFactory {
 	/**
 		Module name for the monitor's module locating system.
 	 */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Parser.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Parser.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Parser.java	Thu Nov 11 10:57:29 2004
@@ -33,10 +33,6 @@
 
 public interface Parser
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/**
 	 * Parses the given statement and returns a query tree. The query tree

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/RequiredRowOrdering.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/RequiredRowOrdering.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/RequiredRowOrdering.java	Thu Nov 11 10:57:29 2004
@@ -23,10 +23,6 @@
  */
 public interface RequiredRowOrdering
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	static final int SORT_REQUIRED = 1;
 	static final int ELIMINATE_DUPS = 2;
 	static final int NOTHING_REQUIRED = 3;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/RowOrdering.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/RowOrdering.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/RowOrdering.java	Thu Nov 11 10:57:29 2004
@@ -18,10 +18,6 @@
  */
 public interface RowOrdering
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	static final int	ASCENDING = 1;
 	static final int	DESCENDING = 2;
 	static final int	DONTCARE = 3;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/TypeCompiler.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/TypeCompiler.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/TypeCompiler.java	Thu Nov 11 10:57:29 2004
@@ -31,10 +31,6 @@
 public interface TypeCompiler
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
-	/**
 	 * Various fixed numbers related to datatypes.
 	 */
 	// Need to leave space for '-'

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/TypeCompilerFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/TypeCompilerFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/TypeCompilerFactory.java	Thu Nov 11 10:57:29 2004
@@ -20,10 +20,6 @@
 
 public interface TypeCompilerFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	public static final String MODULE = "org.apache.derby.iapi.sql.compile.TypeCompilerFactory";
 
 	/**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Visitable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Visitable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Visitable.java	Thu Nov 11 10:57:29 2004
@@ -21,10 +21,6 @@
 public interface Visitable
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	 * Accept a visitor, and call v.visit()
 	 * on child nodes as necessary.  
 	 * 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Visitor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Visitor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Visitor.java	Thu Nov 11 10:57:29 2004
@@ -21,10 +21,6 @@
 public interface Visitor
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	 * This is the default visit operation on a 
 	 * QueryTreeNode.  It just returns the node.  This
 	 * will typically suffice as the default visit 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/Authorizer.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/Authorizer.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/Authorizer.java	Thu Nov 11 10:57:29 2004
@@ -21,10 +21,6 @@
   */
 public interface Authorizer
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	/** SQL write (insert,update,delete) operation */
 	public static final int SQL_WRITE_OP = 0;
 	/** SQL SELECT  operation */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/ConnectionUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/ConnectionUtil.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/ConnectionUtil.java	Thu Nov 11 10:57:29 2004
@@ -19,10 +19,6 @@
 import java.sql.SQLException;
 
 public class ConnectionUtil {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	/**
 		Get the current LanguageConnectionContext.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionContext.java	Thu Nov 11 10:57:29 2004
@@ -59,11 +59,6 @@
 public interface LanguageConnectionContext extends Context {
 
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-
-	/**
 	 * this is the ID we expect these contexts
 	 * to be stored into a context manager under.
 	 */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionFactory.java	Thu Nov 11 10:57:29 2004
@@ -65,10 +65,6 @@
  */
 public interface LanguageConnectionFactory {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 		Used to locate this factory by the Monitor basic service.
 		There needs to be a language factory per database.
 	 */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/StatementContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/StatementContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/StatementContext.java	Thu Nov 11 10:57:29 2004
@@ -32,11 +32,6 @@
 public interface StatementContext extends Context {
 
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-
-	/**
 	 * Mark this context as being in use.
 	 *
 	 *	@param	parentInTrigger	true if the parent started in the context of a trigger

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/DependableList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/DependableList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/DependableList.java	Thu Nov 11 10:57:29 2004
@@ -40,10 +40,6 @@
  */
 public class DependableList implements Formatable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/********************************************************
 	**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/Dependency.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/Dependency.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/Dependency.java	Thu Nov 11 10:57:29 2004
@@ -22,12 +22,7 @@
 	It needs to be notified if the schema object changes, so that
 	it can recompile against the new information.
  */
-public interface Dependency { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+public interface Dependency {
 
 	/**
 		return the provider's key for this dependency.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/DependencyManager.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/DependencyManager.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/DependencyManager.java	Thu Nov 11 10:57:29 2004
@@ -253,10 +253,6 @@
  */
 
 public interface DependencyManager {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/* NOTE - every value in this group (actions) must have a matching
 	 * String in the implementation of getActionString().

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/Dependent.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/Dependent.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/Dependent.java	Thu Nov 11 10:57:29 2004
@@ -25,10 +25,6 @@
  */
 public interface Dependent  extends Dependable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/**
 		Check that all of the dependent's dependencies are valid.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/Provider.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/Provider.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/Provider.java	Thu Nov 11 10:57:29 2004
@@ -25,9 +25,5 @@
  */
 public interface Provider extends Dependable
 {
-	/**
-		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/sql/depend/ProviderInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/ProviderInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/ProviderInfo.java	Thu Nov 11 10:57:29 2004
@@ -24,10 +24,6 @@
 public interface ProviderInfo extends Formatable
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	 * Get the DependableFinder.
 	 */
 	DependableFinder getDependableFinder();

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/ProviderList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/ProviderList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/ProviderList.java	Thu Nov 11 10:57:29 2004
@@ -23,10 +23,6 @@
 public class ProviderList extends Hashtable
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
-	/**
 	 * Add a Provider to the list.
 	 *
 	 * @param prov	The Provider to add to the list.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/AliasDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/AliasDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/AliasDescriptor.java	Thu Nov 11 10:57:29 2004
@@ -45,10 +45,6 @@
 	extends TupleDescriptor
 	implements UniqueTupleDescriptor, Provider
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	private UUID		aliasID;
 	private String		aliasName;
 	private UUID		schemaID;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/CatalogRowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/CatalogRowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/CatalogRowFactory.java	Thu Nov 11 10:57:29 2004
@@ -40,10 +40,6 @@
 
 public abstract	class CatalogRowFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	///////////////////////////////////////////////////////////////////////////
 	//
 	//	STATE

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/CheckConstraintDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/CheckConstraintDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/CheckConstraintDescriptor.java	Thu Nov 11 10:57:29 2004
@@ -21,10 +21,6 @@
  */
 public class CheckConstraintDescriptor extends ConstraintDescriptor
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	ReferencedColumns	referencedColumns;
 	String						constraintText;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptor.java	Thu Nov 11 10:57:29 2004
@@ -45,10 +45,6 @@
 
 public class ColumnDescriptor extends TupleDescriptor
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	// implementation
 	DefaultInfo			columnDefaultInfo;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptorList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptorList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptorList.java	Thu Nov 11 10:57:29 2004
@@ -28,10 +28,6 @@
 public class ColumnDescriptorList extends ArrayList
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	 * Add the column.  Currently, the table id is ignored.
 	 *
 	 * @param tableId the table id (ignored)

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java	Thu Nov 11 10:57:29 2004
@@ -40,10 +40,6 @@
 public class ConglomerateDescriptor extends TupleDescriptor
 	implements UniqueTupleDescriptor, Provider
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	// Implementation
 	long	conglomerateNumber;
 	String	name;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptorList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptorList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptorList.java	Thu Nov 11 10:57:29 2004
@@ -23,10 +23,6 @@
 
 public class ConglomerateDescriptorList extends ArrayList
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
 
 	/**
 	 * Get a conglomerate descriptor by its number

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConsInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConsInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConsInfo.java	Thu Nov 11 10:57:29 2004
@@ -25,10 +25,6 @@
 public interface ConsInfo	extends	Formatable
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
-	/**
 	  *	This ConsInfo describes columns in a referenced table. What is
 	  *	the schema that the referenced table lives in?
 	  *

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptor.java	Thu Nov 11 10:57:29 2004
@@ -43,10 +43,6 @@
 	extends TupleDescriptor
 	implements UniqueTupleDescriptor, Provider, Dependent
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	// used to indicate what type of constraints we 
 	// are interested in
 	public static final int ENABLED		= 1;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptorList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptorList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptorList.java	Thu Nov 11 10:57:29 2004
@@ -30,10 +30,6 @@
 
 public class ConstraintDescriptorList extends ArrayList
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	private boolean scanned;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DDUtils.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DDUtils.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DDUtils.java	Thu Nov 11 10:57:29 2004
@@ -28,10 +28,6 @@
 
 public	class	DDUtils
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 	/*
 	** For a foreign key, this is used to locate the referenced

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDescriptorGenerator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDescriptorGenerator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDescriptorGenerator.java	Thu Nov 11 10:57:29 2004
@@ -45,10 +45,6 @@
 
 public class DataDescriptorGenerator 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	private 	UUIDFactory uuidf;
 
     protected	final DataDictionary	dataDictionary; // the data dictionary that this generator operates on

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java	Thu Nov 11 10:57:29 2004
@@ -52,10 +52,6 @@
 
 public interface DataDictionary
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	String MODULE = "org.apache.derby.iapi.sql.dictionary.DataDictionary";
 
 	/** Special version indicating the database must be upgraded to or created at the current engine level */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionaryContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionaryContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionaryContext.java	Thu Nov 11 10:57:29 2004
@@ -22,10 +22,6 @@
 
 public interface DataDictionaryContext extends Context
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	// this is the ID we expect data dictionary contexts
 	// to be stored into a context manager under.
 	public static final String CONTEXT_ID = "DataDictionaryContext";

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DefaultDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DefaultDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DefaultDescriptor.java	Thu Nov 11 10:57:29 2004
@@ -38,10 +38,6 @@
 	extends TupleDescriptor
 	implements UniqueTupleDescriptor, Provider, Dependent
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	/** public interface to this class 
 		<ol>
 		<li>public void setDefaultUUID(UUID defaultUUID);

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DependencyDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DependencyDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DependencyDescriptor.java	Thu Nov 11 10:57:29 2004
@@ -34,10 +34,6 @@
 public class DependencyDescriptor extends TupleDescriptor 
 	implements UniqueTupleDescriptor
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/** public interface for this class is:
 		<ol>
 		<li>public DependableFinder getDependentFinder();</li>

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/FileInfoDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/FileInfoDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/FileInfoDescriptor.java	Thu Nov 11 10:57:29 2004
@@ -27,10 +27,6 @@
 public class  FileInfoDescriptor extends TupleDescriptor 
 	implements Provider, UniqueSQLObjectDescriptor
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	/** A type tho indicate the file is a jar file **/
 	public static final int JAR_FILE_TYPE = 0;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ForeignKeyConstraintDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ForeignKeyConstraintDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ForeignKeyConstraintDescriptor.java	Thu Nov 11 10:57:29 2004
@@ -33,10 +33,6 @@
 public class ForeignKeyConstraintDescriptor extends KeyConstraintDescriptor
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	   interface to this descriptor
 	   <ol>
 	   <li>public ReferencedKeyConstraintDescriptor getReferencedConstraint()

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/GenericDescriptorList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/GenericDescriptorList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/GenericDescriptorList.java	Thu Nov 11 10:57:29 2004
@@ -29,10 +29,6 @@
 
 public class GenericDescriptorList extends ArrayList
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	private boolean scanned;
 
 	/**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/IndexLister.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/IndexLister.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/IndexLister.java	Thu Nov 11 10:57:29 2004
@@ -40,10 +40,6 @@
  */
 public class IndexLister
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	////////////////////////////////////////////////////////////////////////
 	//
 	//	STATE

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/IndexRowGenerator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/IndexRowGenerator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/IndexRowGenerator.java	Thu Nov 11 10:57:29 2004
@@ -45,10 +45,6 @@
  */
 public class IndexRowGenerator implements IndexDescriptor, Formatable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	IndexDescriptor	id;
 	private ExecutionFactory ef;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/KeyConstraintDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/KeyConstraintDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/KeyConstraintDescriptor.java	Thu Nov 11 10:57:29 2004
@@ -25,10 +25,6 @@
 
 public abstract class KeyConstraintDescriptor extends ConstraintDescriptor
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/** interface to this class:
 		<ol>
 		<li>public UUID getIndexId();</li>

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ListOfRowLists.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ListOfRowLists.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ListOfRowLists.java	Thu Nov 11 10:57:29 2004
@@ -25,10 +25,6 @@
 
 public interface ListOfRowLists
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/**
 	 * Add another system table's RowList to this list of lists.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ReferencedKeyConstraintDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ReferencedKeyConstraintDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ReferencedKeyConstraintDescriptor.java	Thu Nov 11 10:57:29 2004
@@ -26,10 +26,6 @@
 public class ReferencedKeyConstraintDescriptor extends KeyConstraintDescriptor
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	   public interface to this descriptor:
 	   <ol>
 	   <li>public boolean hasSelfReferencingFK(ConstraintDescriptorList cdl, int type) 

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

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java	Thu Nov 11 10:57:29 2004
@@ -85,10 +85,6 @@
 	implements UniqueSQLObjectDescriptor, Dependent, Provider
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	 * Statement types.  
 	 * <UL>
 	 * <LI> SPS_TYPE_TRIGGER	- trigger (<B>NOT IMPLEMENTED</B>) </LI>

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SchemaDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SchemaDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SchemaDescriptor.java	Thu Nov 11 10:57:29 2004
@@ -28,10 +28,6 @@
 public class SchemaDescriptor extends TupleDescriptor 
 	implements UniqueTupleDescriptor, Provider
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	
 	/*
 	** When we boot, we put the system tables in

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/StatisticsDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/StatisticsDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/StatisticsDescriptor.java	Thu Nov 11 10:57:29 2004
@@ -22,10 +22,6 @@
  */
 public class StatisticsDescriptor extends TupleDescriptor
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
 	private UUID statID; 		// my UUID 
 	private UUID statRefID;  	// UUID of object for which I'm a statistic 
 	private UUID statTableID;  	// UUID of table for which I'm a stat 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubCheckConstraintDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubCheckConstraintDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubCheckConstraintDescriptor.java	Thu Nov 11 10:57:29 2004
@@ -27,10 +27,6 @@
 
 public class SubCheckConstraintDescriptor extends SubConstraintDescriptor
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	/** public interface to this class:
 		<ol>
 		<li>public String getConstraintText();</li>

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubConstraintDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubConstraintDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubConstraintDescriptor.java	Thu Nov 11 10:57:29 2004
@@ -27,10 +27,6 @@
 public abstract class SubConstraintDescriptor extends TupleDescriptor
 	implements UniqueTupleDescriptor
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/**
 	   public interface for this class:

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubKeyConstraintDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubKeyConstraintDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubKeyConstraintDescriptor.java	Thu Nov 11 10:57:29 2004
@@ -26,10 +26,6 @@
 
 public class SubKeyConstraintDescriptor extends SubConstraintDescriptor
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/** Interface for SubKeyConstraintDescriptor is 
 		<ol>
 		<li>public UUID getIndexId();</li>

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SystemColumn.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SystemColumn.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SystemColumn.java	Thu Nov 11 10:57:29 2004
@@ -25,10 +25,6 @@
 public interface SystemColumn
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	 * Gets the name of this column.
 	 *
 	 * @return	The column name.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TabInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TabInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TabInfo.java	Thu Nov 11 10:57:29 2004
@@ -31,10 +31,6 @@
 public interface TabInfo
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	 * ROWNOTDUPLICATE is out of range for a row
 	 * number.  If a return code does not equal 
 	 * this value, then it refers to the row

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TableDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TableDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TableDescriptor.java	Thu Nov 11 10:57:29 2004
@@ -87,10 +87,6 @@
 public class TableDescriptor extends TupleDescriptor
 	implements UniqueSQLObjectDescriptor, Provider
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	public static final int BASE_TABLE_TYPE = 0;
 	public static final int SYSTEM_TABLE_TYPE = 1;
 	public static final int VIEW_TYPE = 2;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TriggerDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TriggerDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TriggerDescriptor.java	Thu Nov 11 10:57:29 2004
@@ -80,10 +80,6 @@
 public class TriggerDescriptor extends TupleDescriptor
 	implements UniqueSQLObjectDescriptor, Provider, Dependent, Formatable 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	// field that we want users to be able to know about
 	public static final int SYSTRIGGERS_STATE_FIELD = 8;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TupleDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TupleDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TupleDescriptor.java	Thu Nov 11 10:57:29 2004
@@ -32,10 +32,6 @@
 
 public class TupleDescriptor
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	//////////////////////////////////////////////////////////////////
 	//
 	//	CONSTANTS

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/UniqueSQLObjectDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/UniqueSQLObjectDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/UniqueSQLObjectDescriptor.java	Thu Nov 11 10:57:29 2004
@@ -28,11 +28,7 @@
  * @author jamie
  */
 public interface UniqueSQLObjectDescriptor extends UniqueTupleDescriptor
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+{
 	/**
 	 * Get the name of this object.  E.g. for a table descriptor,
 	 * this will be the table name.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/UniqueTupleDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/UniqueTupleDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/UniqueTupleDescriptor.java	Thu Nov 11 10:57:29 2004
@@ -19,11 +19,7 @@
  * @author jamie
  */
 public interface UniqueTupleDescriptor
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
+{
 	/**
 	 * Return the UUID for this Descriptor
 	 *

Mime
View raw message